Changeset 122056 in webkit

Timestamp:

Jul 7, 2012 3:26:33 PM (12 years ago)

Author:

staikos@webkit.org

Message:

Detach animation clients properly if we clear the web page pointer.
​https://bugs.webkit.org/show_bug.cgi?id=90730

Reviewed by Adam Treat.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::destroyCompositor):

• Api/WebPageCompositor.cpp:

(BlackBerry::WebKit::WebPageCompositorPrivate::WebPageCompositorPrivate):
(BlackBerry::WebKit::WebPageCompositorPrivate::~WebPageCompositorPrivate):
(WebKit):
(BlackBerry::WebKit::WebPageCompositorPrivate::detach):
(BlackBerry::WebKit::WebPageCompositorPrivate::setPage):

• Api/WebPageCompositor_p.h:

(WebPageCompositorPrivate):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• Api/WebPageCompositor.cpp (modified) (2 diffs)
• Api/WebPageCompositor_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -6177 +6177 @@
     // m_compositor is a RefPtr, so it may live on beyond this point.
     // Disconnect the compositor from us
-    m_compositor->setPage(0);
+    m_compositor->detach();
     m_compositor.clear();
     m_ownedContext.clear();

trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp

@@ -48 +48 @@
     , m_drawsRootLayer(false)
 {
+    ASSERT(m_webPage);
     setOneShot(true); // one-shot animation client
 }
@@ -53 +54 @@
 WebPageCompositorPrivate::~WebPageCompositorPrivate()
 {
-    Platform::AnimationFrameRateController::instance()->removeClient(this);
+    detach();
+}
+
+void WebPageCompositorPrivate::detach()
+{
+    if (m_webPage)
+        Platform::AnimationFrameRateController::instance()->removeClient(this);
+    m_webPage = 0;
+}
+
+void WebPageCompositorPrivate::setPage(WebPagePrivate *p)
+{
+    if (p == m_webPage)
+        return;
+    ASSERT(p);
+    ASSERT(m_webPage); // if this is null, we have a bug and we need to re-add.
+    m_webPage = p;
 }
 

trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h

@@ -91 +91 @@
 
     WebPagePrivate* page() const { return m_webPage; }
-    void setPage(WebPagePrivate* page) { m_webPage = page; }
+    void setPage(WebPagePrivate* page);
+    void detach();
     WebPageCompositorClient* client() const { return m_client; }
     void compositorDestroyed();

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-07-07  George Staikos  <staikos@webkit.org>
+
+        Detach animation clients properly if we clear the web page pointer.
+        https://bugs.webkit.org/show_bug.cgi?id=90730
+
+        Reviewed by Adam Treat.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::destroyCompositor):
+        * Api/WebPageCompositor.cpp:
+        (BlackBerry::WebKit::WebPageCompositorPrivate::WebPageCompositorPrivate):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::~WebPageCompositorPrivate):
+        (WebKit):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::detach):
+        (BlackBerry::WebKit::WebPageCompositorPrivate::setPage):
+        * Api/WebPageCompositor_p.h:
+        (WebPageCompositorPrivate):
+
 2012-07-06  Max Feil  <mfeil@rim.com>