Changeset 104720 in webkit

Timestamp:

Jan 11, 2012 10:06:57 AM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Qt][WK2] Directly-composited images sometimes appear with a wrong geometry
​https://bugs.webkit.org/show_bug.cgi?id=75882

Reviewed by Simon Hausmann.

When assigning a directly composited image to a TextureMapperNode in WebKit2, we take
contentsRect() onto account. However, contentsRect() might be changed after the image
is already assigned.
We have to reassign the image when contentsRect() changes. This is a pretty cheap
operation, since the image is already converted to a texture and we simply change the
geometric values.

• UIProcess/qt/LayerTreeHostProxyQt.cpp:

(WebKit::LayerTreeHostProxy::syncLayerParameters):

• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:

(WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-11  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt][WK2] Directly-composited images sometimes appear with a wrong geometry
+        https://bugs.webkit.org/show_bug.cgi?id=75882
+
+        Reviewed by Simon Hausmann.
+
+        When assigning a directly composited image to a TextureMapperNode in WebKit2, we take
+        contentsRect() onto account. However, contentsRect() might be changed after the image
+        is already assigned.
+        We have to reassign the image when contentsRect() changes. This is a pretty cheap
+        operation, since the image is already converted to a texture and we simply change the
+        geometric values.
+
+        * UIProcess/qt/LayerTreeHostProxyQt.cpp:
+        (WebKit::LayerTreeHostProxy::syncLayerParameters):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
+
 2012-01-11  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp

@@ -246 +246 @@
     LayerMap::iterator it = m_layers.find(id);
     GraphicsLayer* layer = it->second;
+    bool needsToUpdateImageTiles = layerInfo.imageIsUpdated || layerInfo.contentsRect != layer->contentsRect();
 
     layer->setName(layerInfo.name);
@@ -262 +263 @@
     layer->setDrawsContent(layerInfo.drawsContent);
 
-    if (layerInfo.imageIsUpdated)
+    if (needsToUpdateImageTiles)
         assignImageToLayer(layer, layerInfo.imageBackingStoreID);
 

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

@@ -416 +416 @@
     m_layerInfo.contentsOpaque = contentsOpaque();
     m_layerInfo.contentsRect = contentsRect();
-
-    // In the shadow layer tree we create in the UI process, layers with directly composited images are always considered to draw content.
-    // Otherwise, we'd have to check whether an layer with drawsContent==false has a directly composited image multiple times.
-    m_layerInfo.drawsContent = drawsContent() || m_image;
+    m_layerInfo.drawsContent = drawsContent();
     m_layerInfo.mask = toWebLayerID(maskLayer());
     m_layerInfo.masksToBounds = masksToBounds();