Changeset 112096 in webkit

Timestamp:

Mar 26, 2012 7:54:55 AM (12 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] Make sure that purged directly composited images are re-created before a layer's sync.
​https://bugs.webkit.org/show_bug.cgi?id=81771

Reviewed by Noam Rosenthal.

This fixes a regression in tst_qquickwebview introduced by r111567.

• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:

(WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
(WebCore::WebGraphicsLayer::updateContentBuffers):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-26  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] Make sure that purged directly composited images are re-created before a layer's sync.
+        https://bugs.webkit.org/show_bug.cgi?id=81771
+
+        Reviewed by Noam Rosenthal.
+
+        This fixes a regression in tst_qquickwebview introduced by r111567.
+
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
+        (WebCore::WebGraphicsLayer::updateContentBuffers):
+
 2012-03-26  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp

@@ -431 +431 @@
 void WebGraphicsLayer::syncCompositingStateForThisLayerOnly()
 {
+    // The remote image might have been released by purgeBackingStores.
+    if (m_image) {
+        if (!m_layerInfo.imageBackingStoreID) {
+            m_layerInfo.imageBackingStoreID = m_webGraphicsLayerClient->adoptImageBackingStore(m_image.get());
+            m_layerInfo.imageIsUpdated = true;
+        }
+    }
 
     if (m_modified) {
@@ -575 +582 @@
 void WebGraphicsLayer::updateContentBuffers()
 {
-    // The remote image might have been released by purgeBackingStores.
-    if (m_image) {
-        if (!m_layerInfo.imageBackingStoreID) {
-            m_layerInfo.imageBackingStoreID = m_webGraphicsLayerClient->adoptImageBackingStore(m_image.get());
-            m_layerInfo.imageIsUpdated = true;
-        }
-    }
-
     if (!drawsContent()) {
         m_mainBackingStore.clear();