diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/page/DOMWindow.cpp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | WebCore/page/DOMWindow.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 526e824..71ad7cb 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -42,6 +42,7 @@ #include "DOMTimer.h" #include "Database.h" #include "DatabaseCallback.h" +#include "DeviceMotionController.h" #include "DeviceOrientationController.h" #include "PageTransitionEvent.h" #include "Document.h" @@ -1451,6 +1452,8 @@ bool DOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr<Event else if (eventType == eventNames().beforeunloadEvent && allowsBeforeUnloadListeners(this)) addBeforeUnloadEventListener(this); #if ENABLE(DEVICE_ORIENTATION) + else if (eventType == eventNames().devicemotionEvent && frame() && frame()->page() && frame()->page()->deviceMotionController()) + frame()->page()->deviceMotionController()->addListener(this); else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page() && frame()->page()->deviceOrientationController()) frame()->page()->deviceOrientationController()->addListener(this); #endif @@ -1468,6 +1471,8 @@ bool DOMWindow::removeEventListener(const AtomicString& eventType, EventListener else if (eventType == eventNames().beforeunloadEvent && allowsBeforeUnloadListeners(this)) removeBeforeUnloadEventListener(this); #if ENABLE(DEVICE_ORIENTATION) + else if (eventType == eventNames().devicemotionEvent && frame() && frame()->page() && frame()->page()->deviceMotionController()) + frame()->page()->deviceMotionController()->removeListener(this); else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page() && frame()->page()->deviceOrientationController()) frame()->page()->deviceOrientationController()->removeListener(this); #endif @@ -1546,6 +1551,8 @@ void DOMWindow::removeAllEventListeners() EventTarget::removeAllEventListeners(); #if ENABLE(DEVICE_ORIENTATION) + if (frame() && frame()->page() && frame()->page()->deviceMotionController()) + frame()->page()->deviceMotionController()->removeAllListeners(this); if (frame() && frame()->page() && frame()->page()->deviceOrientationController()) frame()->page()->deviceOrientationController()->removeAllListeners(this); #endif |