Title: [131904] trunk
- Revision
- 131904
- Author
- [email protected]
- Date
- 2012-10-19 08:38:13 -0700 (Fri, 19 Oct 2012)
Log Message
[Qt][WTR] renderToOffscreenBuffer should not be set if the real render loop is active
https://bugs.webkit.org/show_bug.cgi?id=99831
Reviewed by Jocelyn Turcotte.
Source/WebKit2:
Update the comment about renderToOffscreenBuffer to better describe its role.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::setNeedsDisplay):
Tools:
Do not set renderToOffscreenBuffer if we have called setRenderWithoutShowing.
We do not need it in this case and these things are actually conflicting.
* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
(WTR::WrapperWindow::handleStatusChanged):
(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::windowShapshotEnabled): Added a comment
describing why this workaround is needed.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (131903 => 131904)
--- trunk/Source/WebKit2/ChangeLog 2012-10-19 15:32:38 UTC (rev 131903)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-19 15:38:13 UTC (rev 131904)
@@ -1,3 +1,15 @@
+2012-10-19 Balazs Kelemen <[email protected]>
+
+ [Qt][WTR] renderToOffscreenBuffer should not be set if the real render loop is active
+ https://bugs.webkit.org/show_bug.cgi?id=99831
+
+ Reviewed by Jocelyn Turcotte.
+
+ Update the comment about renderToOffscreenBuffer to better describe its role.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewPrivate::setNeedsDisplay):
+
2012-10-19 Yael Aharon <[email protected]>
[EFL][WK2] Rename EflViewportHandler to PageViewportControllerClientEfl
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (131903 => 131904)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-10-19 15:32:38 UTC (rev 131903)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-10-19 15:38:13 UTC (rev 131904)
@@ -440,7 +440,8 @@
{
Q_Q(QQuickWebView);
if (renderToOffscreenBuffer()) {
- // TODO: we can maintain a real image here and use it for pixel tests. Right now this is used only for running the rendering code-path while running tests.
+ // This is used only to mantain the rendering synchronisation between the UI and
+ // the web process when running tests even if the render loop is not active.
QImage dummyImage(1, 1, QImage::Format_ARGB32);
QPainter painter(&dummyImage);
q->page()->d->paint(&painter);
Modified: trunk/Tools/ChangeLog (131903 => 131904)
--- trunk/Tools/ChangeLog 2012-10-19 15:32:38 UTC (rev 131903)
+++ trunk/Tools/ChangeLog 2012-10-19 15:38:13 UTC (rev 131904)
@@ -1,3 +1,19 @@
+2012-10-19 Balazs Kelemen <[email protected]>
+
+ [Qt][WTR] renderToOffscreenBuffer should not be set if the real render loop is active
+ https://bugs.webkit.org/show_bug.cgi?id=99831
+
+ Reviewed by Jocelyn Turcotte.
+
+ Do not set renderToOffscreenBuffer if we have called setRenderWithoutShowing.
+ We do not need it in this case and these things are actually conflicting.
+
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+ (WTR::WrapperWindow::handleStatusChanged):
+ (WTR::PlatformWebView::PlatformWebView):
+ (WTR::PlatformWebView::windowShapshotEnabled): Added a comment
+ describing why this workaround is needed.
+
2012-10-19 Zan Dobersek <[email protected]>
[WK2][GTK] Fullscreen tests timing out in bots
Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (131903 => 131904)
--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-10-19 15:32:38 UTC (rev 131903)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-10-19 15:38:13 UTC (rev 131904)
@@ -66,6 +66,9 @@
setSurfaceType(OpenGLSurface);
create();
QQuickWindowPrivate::get(this)->setRenderWithoutShowing(true);
+ } else {
+ QQuickWebViewExperimental experimental(m_view);
+ experimental.setRenderToOffscreenBuffer(true);
}
QWindowSystemInterface::handleWindowActivated(this);
@@ -82,8 +85,6 @@
, m_windowIsKey(true)
, m_modalEventLoop(0)
{
- QQuickWebViewExperimental experimental(m_view);
- experimental.setRenderToOffscreenBuffer(true);
m_view->setAllowAnyHTTPSCertificateForLocalHost(true);
m_view->componentComplete();
}
@@ -164,6 +165,8 @@
bool PlatformWebView::windowShapshotEnabled()
{
+ // We need a way to disable UI side rendering for tests because it is
+ // too slow without appropriate hardware.
static bool result;
static bool hasChecked = false;
if (!hasChecked)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
