Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 46 insertions, 34 deletions

diff --git a/Source/WebKit/chromium/public/WebDeviceOrientation.h b/Source/WebKit/chromium/public/WebDeviceOrientation.h
index 282dc7157..b26649e1c 100644
--- a/Source/WebKit/chromium/public/WebDeviceOrientation.h
+++ b/Source/WebKit/chromium/public/WebDeviceOrientation.h
@@ -35,51 +35,63 @@ namespace WebKit {
 
 class WebDeviceOrientation {
 public:
-    WebDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma, bool canProvideAbsolute = false, bool absolute = false)
-        : m_isNull(false),
-          m_canProvideAlpha(canProvideAlpha),
-          m_alpha(alpha),
-          m_canProvideBeta(canProvideBeta),
-          m_beta(beta),
-          m_canProvideGamma(canProvideGamma),
-          m_gamma(gamma),
-          m_canProvideAbsolute(canProvideAbsolute),
-          m_absolute(absolute)
+    WebDeviceOrientation()
+        : m_isNull(true)
+        , m_canProvideAlpha(false)
+        , m_alpha(0)
+        , m_canProvideBeta(false)
+        , m_beta(0)
+        , m_canProvideGamma(false)
+        , m_gamma(0)
+        , m_canProvideAbsolute(false)
+        , m_absolute(false)
     {
     }
 
     static WebDeviceOrientation nullOrientation() { return WebDeviceOrientation(); }
 
-    bool isNull() { return m_isNull; }
-    bool canProvideAlpha() { return m_canProvideAlpha; }
-    double alpha() { return m_alpha; }
-    bool canProvideBeta() { return m_canProvideBeta; }
-    double beta() { return m_beta; }
-    bool canProvideGamma() { return m_canProvideGamma; }
-    double gamma() { return m_gamma; }
-    bool canProvideAbsolute() {return m_canProvideAbsolute; }
-    bool absolute() { return m_absolute; }
+    void setNull(bool isNull) { m_isNull = isNull; }
+    bool isNull() const { return m_isNull; }
+
+    void setAlpha(double alpha)
+    {
+        m_canProvideAlpha = true;
+        m_alpha = alpha;
+    }
+    bool canProvideAlpha() const { return m_canProvideAlpha; }
+    double alpha() const { return m_alpha; }
+
+    void setBeta(double beta)
+    {
+        m_canProvideBeta = true;
+        m_beta = beta;
+    }
+    bool canProvideBeta() const { return m_canProvideBeta; }
+    double beta() const { return m_beta; }
+
+    void setGamma(double gamma)
+    {
+        m_canProvideGamma = true;
+        m_gamma = gamma;
+    }
+    bool canProvideGamma() const { return m_canProvideGamma; }
+    double gamma() const { return m_gamma; }
+
+    void setAbsolute(bool absolute)
+    {
+        m_canProvideAbsolute = true;
+        m_absolute = absolute;
+    }
+    bool canProvideAbsolute() const {return m_canProvideAbsolute; }
+    bool absolute() const { return m_absolute; }
 
 #if WEBKIT_IMPLEMENTATION
-    WebDeviceOrientation(const WTF::PassRefPtr<WebCore::DeviceOrientation>&);
-    WebDeviceOrientation& operator=(const WTF::PassRefPtr<WebCore::DeviceOrientation>&);
+    WebDeviceOrientation(const WebCore::DeviceOrientation*);
+    WebDeviceOrientation& operator=(const WebCore::DeviceOrientation*);
     operator WTF::PassRefPtr<WebCore::DeviceOrientation>() const;
 #endif
 
 private:
-    WebDeviceOrientation()
-        : m_isNull(true),
-          m_canProvideAlpha(false),
-          m_alpha(0),
-          m_canProvideBeta(false),
-          m_beta(0),
-          m_canProvideGamma(false),
-          m_gamma(0),
-          m_canProvideAbsolute(false),
-          m_absolute(false)
-    {
-    }
-
     bool m_isNull;
     bool m_canProvideAlpha;
     double m_alpha;