Title: [109135] trunk/Source/WebKit/blackberry
- Revision
- 109135
- Author
- [email protected]
- Date
- 2012-02-28 12:06:14 -0800 (Tue, 28 Feb 2012)
Log Message
[BlackBerry] x86 build fix after cleaning up WebPage.cpp
https://bugs.webkit.org/show_bug.cgi?id=79814
Patch by Jacky Jiang <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (109134 => 109135)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-02-28 19:55:39 UTC (rev 109134)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-02-28 20:06:14 UTC (rev 109135)
@@ -2781,6 +2781,16 @@
m_shouldReflowBlock = false;
}
+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()
{
// TODO: need to verify if this call needs to be made before calling
@@ -5336,16 +5346,6 @@
&WebPagePrivate::destroyCompositor, this));
}
-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()
{
m_compositor->releaseLayerResources();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (109134 => 109135)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-02-28 19:55:39 UTC (rev 109134)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-02-28 20:06:14 UTC (rev 109135)
@@ -1,3 +1,17 @@
+2012-02-28 Jacky Jiang <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Remove unused focusedNodeChange notifications from the Chrome client.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
