Changeset 109135 in webkit

Timestamp:

Feb 28, 2012, 12:06:14 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] x86 build fix after cleaning up WebPage.cpp
​https://bugs.webkit.org/show_bug.cgi?id=79814

Patch by Jacky Jiang <​zhajiang@rim.com> on 2012-02-28
Reviewed by Antonio Gomes.

x86 build fix, keep WebPage::destroyWebPageCompositor() method where it
was which was outside of USE(ACCELERATED_COMPOSITING).

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::destroyWebPageCompositor):
(WebKit):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -2782 +2782 @@
 }
 
+void WebPage::destroyWebPageCompositor()
+{
+#if USE(ACCELERATED_COMPOSITING)
+    // Destroy the layer renderer in a sync command before we destroy the backing store,
+    // to flush any pending compositing messages on the compositing thread.
+    // The backing store is indirectly deleted by the 'detachFromParent' call below.
+    d->syncDestroyCompositorOnCompositingThread();
+#endif
+}
+
 void WebPage::destroy()
 {
@@ -5337 +5347 @@
 }
 
-void WebPage::destroyWebPageCompositor()
-{
-#if USE(ACCELERATED_COMPOSITING)
-    // Destroy the layer renderer in a sync command before we destroy the backing store,
-    // to flush any pending compositing messages on the compositing thread.
-    // The backing store is indirectly deleted by the 'detachFromParent' call below.
-    d->syncDestroyCompositorOnCompositingThread();
-#endif
-}
-
 void WebPagePrivate::destroyLayerResources()
 {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-02-28  Jacky Jiang  <zhajiang@rim.com>
+
+        [BlackBerry] x86 build fix after cleaning up WebPage.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=79814
+
+        Reviewed by Antonio Gomes.
+
+        x86 build fix, keep WebPage::destroyWebPageCompositor() method where it
+        was which was outside of USE(ACCELERATED_COMPOSITING).
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::destroyWebPageCompositor):
+        (WebKit):
+
 2012-02-28  Mike Fenton  <mifenton@rim.com>