diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebCore/dom/DeviceMotionController.h | |
parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz |
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.
Diffstat (limited to 'Source/WebCore/dom/DeviceMotionController.h')
-rw-r--r-- | Source/WebCore/dom/DeviceMotionController.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebCore/dom/DeviceMotionController.h b/Source/WebCore/dom/DeviceMotionController.h index 996c98861..1c1f6fcba 100644 --- a/Source/WebCore/dom/DeviceMotionController.h +++ b/Source/WebCore/dom/DeviceMotionController.h @@ -27,7 +27,7 @@ #define DeviceMotionController_h #include "DOMWindow.h" -#include "PageSupplement.h" +#include "Page.h" #include "Timer.h" #include <wtf/HashCountedSet.h> @@ -36,7 +36,7 @@ namespace WebCore { class DeviceMotionData; class DeviceMotionClient; -class DeviceMotionController : public PageSupplement { +class DeviceMotionController : public Supplement<Page> { public: ~DeviceMotionController(); @@ -54,8 +54,7 @@ public: bool isActive() { return !m_listeners.isEmpty(); } static const AtomicString& supplementName(); - static DeviceMotionController* from(Frame* frame) { return static_cast<DeviceMotionController*>(PageSupplement::from(frame, supplementName())); } - static DeviceMotionController* from(Page* page) { return static_cast<DeviceMotionController*>(PageSupplement::from(page, supplementName())); } + static DeviceMotionController* from(Page* page) { return static_cast<DeviceMotionController*>(Supplement<Page>::from(page, supplementName())); } static bool isActiveAt(Page*); private: |