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

This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.

1 files changed, 3 insertions, 5 deletions

diff --git a/Source/WebCore/dom/DeviceOrientationController.h b/Source/WebCore/dom/DeviceOrientationController.h
index d8efaca39..707cd5cb6 100644
--- a/Source/WebCore/dom/DeviceOrientationController.h
+++ b/Source/WebCore/dom/DeviceOrientationController.h
@@ -27,7 +27,7 @@
 #define DeviceOrientationController_h
 
 #include "DOMWindow.h"
-#include "PageSupplement.h"
+#include "Page.h"
 #include "Timer.h"
 
 #include <wtf/HashCountedSet.h>
@@ -36,9 +36,8 @@ namespace WebCore {
 
 class DeviceOrientation;
 class DeviceOrientationClient;
-class Page;
 
-class DeviceOrientationController : public PageSupplement {
+class DeviceOrientationController : public Supplement<Page> {
 public:
     ~DeviceOrientationController();
 
@@ -58,8 +57,7 @@ public:
     DeviceOrientationClient* client() const { return m_client; }
 
     static const AtomicString& supplementName();
-    static DeviceOrientationController* from(Frame* frame) { return static_cast<DeviceOrientationController*>(PageSupplement::from(frame, supplementName())); }
-    static DeviceOrientationController* from(Page* page) { return static_cast<DeviceOrientationController*>(PageSupplement::from(page, supplementName())); }
+    static DeviceOrientationController* from(Page* page) { return static_cast<DeviceOrientationController*>(Supplement<Page>::from(page, supplementName())); }
     static bool isActiveAt(Page*);
 
 private: