Title: [115515] trunk/Source/WebKit2
- Revision
- 115515
- Author
- [email protected]
- Date
- 2012-04-27 16:48:57 -0700 (Fri, 27 Apr 2012)
Log Message
[Qt][WK2] Don't call syncRemoteContents from WebLayerTreeRenderer::paintToCurrentGLContext
https://bugs.webkit.org/show_bug.cgi?id=85088
Reviewed by Noam Rosenthal.
Remove the call to syncRemoteContents from WebLayerTreeRenderer::paintToCurrentGLContext,
since it was moved to QQuickWebPage::updatePaintNode.
To make sure that we always sync before painting, this patch also calls page->update()
when the viewport changes.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::_q_contentViewportChanged):
* UIProcess/WebLayerTreeRenderer.cpp:
(WebKit::WebLayerTreeRenderer::paintToCurrentGLContext):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115514 => 115515)
--- trunk/Source/WebKit2/ChangeLog 2012-04-27 23:31:58 UTC (rev 115514)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-27 23:48:57 UTC (rev 115515)
@@ -1,3 +1,20 @@
+2012-04-27 Yael Aharon <[email protected]>
+
+ [Qt][WK2] Don't call syncRemoteContents from WebLayerTreeRenderer::paintToCurrentGLContext
+ https://bugs.webkit.org/show_bug.cgi?id=85088
+
+ Reviewed by Noam Rosenthal.
+
+ Remove the call to syncRemoteContents from WebLayerTreeRenderer::paintToCurrentGLContext,
+ since it was moved to QQuickWebPage::updatePaintNode.
+ To make sure that we always sync before painting, this patch also calls page->update()
+ when the viewport changes.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewFlickablePrivate::_q_contentViewportChanged):
+ * UIProcess/WebLayerTreeRenderer.cpp:
+ (WebKit::WebLayerTreeRenderer::paintToCurrentGLContext):
+
2012-04-27 Gavin Peters <[email protected]>
Add new ENABLE_LINK_PRERENDER define to control the Prerendering API
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (115514 => 115515)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-04-27 23:31:58 UTC (rev 115514)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-04-27 23:48:57 UTC (rev 115515)
@@ -781,6 +781,9 @@
float scale = pageView->contentsScale();
drawingArea->setVisibleContentsRect(visibleRect, scale, trajectoryVector);
+
+ // Ensure that updatePaintNode is always called before painting.
+ pageView->update();
}
void QQuickWebViewFlickablePrivate::_q_suspend()
Modified: trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp (115514 => 115515)
--- trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp 2012-04-27 23:31:58 UTC (rev 115514)
+++ trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp 2012-04-27 23:48:57 UTC (rev 115515)
@@ -109,7 +109,6 @@
m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
ASSERT(m_textureMapper->accelerationMode() == TextureMapper::OpenGLMode);
- syncRemoteContent();
adjustPositionForFixedLayers();
GraphicsLayer* currentRootLayer = rootLayer();
if (!currentRootLayer)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
