Title: [112096] trunk/Source/WebKit2
- Revision
- 112096
- Author
- [email protected]
- Date
- 2012-03-26 07:54:55 -0700 (Mon, 26 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (112095 => 112096)
--- trunk/Source/WebKit2/ChangeLog 2012-03-26 14:49:18 UTC (rev 112095)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-26 14:54:55 UTC (rev 112096)
@@ -1,3 +1,16 @@
+2012-03-26 Jocelyn Turcotte <[email protected]>
+
+ [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 <[email protected]>
[WK2][Qt] Fix compilation without QtWidgets
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (112095 => 112096)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-03-26 14:49:18 UTC (rev 112095)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-03-26 14:54:55 UTC (rev 112096)
@@ -430,6 +430,13 @@
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) {
computeTransformedVisibleRect();
@@ -574,14 +581,6 @@
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();
m_previousBackingStore.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
