Title: [107799] trunk/Source/WebCore
- Revision
- 107799
- Author
- [email protected]
- Date
- 2012-02-15 03:37:25 -0800 (Wed, 15 Feb 2012)
Log Message
REGRESSION(r107518): DeviceOrientationController doesn't remove registered DOMWindows
https://bugs.webkit.org/show_bug.cgi?id=78683
Patch by Hajime Morrita <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107798 => 107799)
--- trunk/Source/WebCore/ChangeLog 2012-02-15 11:28:40 UTC (rev 107798)
+++ trunk/Source/WebCore/ChangeLog 2012-02-15 11:37:25 UTC (rev 107799)
@@ -1,3 +1,23 @@
+2012-02-15 Hajime Morrita <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, quick build fix for 107792
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (107798 => 107799)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2012-02-15 11:28:40 UTC (rev 107798)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2012-02-15 11:37:25 UTC (rev 107799)
@@ -1648,9 +1648,9 @@
#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);
Modified: trunk/Source/WebCore/page/Page.cpp (107798 => 107799)
--- trunk/Source/WebCore/page/Page.cpp 2012-02-15 11:28:40 UTC (rev 107798)
+++ trunk/Source/WebCore/page/Page.cpp 2012-02-15 11:37:25 UTC (rev 107799)
@@ -1087,13 +1087,13 @@
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()
Modified: trunk/Source/WebCore/page/Page.h (107798 => 107799)
--- trunk/Source/WebCore/page/Page.h 2012-02-15 11:28:40 UTC (rev 107798)
+++ trunk/Source/WebCore/page/Page.h 2012-02-15 11:37:25 UTC (rev 107799)
@@ -352,7 +352,7 @@
void initGroup();
typedef HashMap<AtomicStringImpl*, OwnPtr<PageSupplement> > PageSupplementMap;
- PageSupplementMap m_suppliments;
+ PageSupplementMap m_supplements;
#if ASSERT_DISABLED
void checkFrameCountConsistency() const { }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
