REGRESSION(r107518): DeviceOrientationController doesn't remove registered DOMWindows

https://bugs.webkit.org/show_bug.cgi?id=78683

Patch by Hajime Morrita <morrita@chromium.org> on 2012-02-15
Reviewed by Kentaro Hara.

A copy-n-paste disaster. This change fixed it by calling correct methods.

No new tests. Needs browser side mocking for testing this.
A Chromium automated test covers this.

* page/DOMWindow.cpp:
(WebCore::DOMWindow::removeAllEventListeners):
* page/Page.cpp:
(WebCore::Page::provideSupplement):
(WebCore::Page::requireSupplement):
* page/Page.h: Fix typo.
(Page):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index dbc9e0e..fb5c8b0 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2012-02-15  Hajime Morrita  <morrita@chromium.org>
+
+        REGRESSION(r107518): DeviceOrientationController doesn't remove registered DOMWindows
+        https://bugs.webkit.org/show_bug.cgi?id=78683
+
+        Reviewed by Kentaro Hara.
+        
+        A copy-n-paste disaster. This change fixed it by calling correct methods.
+
+        No new tests. Needs browser side mocking for testing this.
+        A Chromium automated test covers this.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::removeAllEventListeners):
+        * page/Page.cpp:
+        (WebCore::Page::provideSupplement):
+        (WebCore::Page::requireSupplement):
+        * page/Page.h: Fix typo.
+        (Page):
+
 2012-02-15  Roland Steiner  <rolandsteiner@chromium.org>
 
         Unreviewed, quick build fix for 107792

diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 21c7b09..5413bdb 100644 (file)
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1648,9 +1648,9 @@ void DOMWindow::removeAllEventListeners()
 
 #if ENABLE(DEVICE_ORIENTATION)
     if (DeviceMotionController* controller = DeviceMotionController::from(frame()))
-        controller->addListener(this);
+        controller->removeAllListeners(this);
     if (DeviceOrientationController* controller = DeviceOrientationController::from(frame()))
-        controller->addListener(this);
+        controller->removeAllListeners(this);
 #endif
 
     removeAllUnloadEventListeners(this);

diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index 3905619..2c35b26 100644 (file)
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -1087,13 +1087,13 @@ void Page::addRelevantRepaintedObject(RenderObject* object, const IntRect& objec
 
 void Page::provideSupplement(const AtomicString& name, PassOwnPtr<PageSupplement> supplement)
 {
-    ASSERT(!m_suppliments.get(name.impl()));
-    m_suppliments.set(name.impl(), supplement);
+    ASSERT(!m_supplements.get(name.impl()));
+    m_supplements.set(name.impl(), supplement);
 }
 
 PageSupplement* Page::requireSupplement(const AtomicString& name)
 {
-    return m_suppliments.get(name.impl());
+    return m_supplements.get(name.impl());
 }
 
 Page::PageClients::PageClients()

diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
index 781ff05..77f074f 100644 (file)
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
@@ -352,7 +352,7 @@ namespace WebCore {
         void initGroup();
 
         typedef HashMap<AtomicStringImpl*, OwnPtr<PageSupplement> > PageSupplementMap;
-        PageSupplementMap m_suppliments;
+        PageSupplementMap m_supplements;
 
 #if ASSERT_DISABLED
         void checkFrameCountConsistency() const { }