Changeset 105517 in webkit

Timestamp:

Jan 20, 2012 8:24:29 AM (12 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] Trigger forcing accelerated compositing from the UI process side.
​https://bugs.webkit.org/show_bug.cgi?id=76296

Reviewed by Noam Rosenthal.

Some messages can be sent from the web view to the LayerTreeHost before
accelerated compositing is entered on the web process and signaled back.
By letting the UI process decide if AC has to be forced, we can create
the LayerTreeHostProxy earlier to send messages to the web process while
AC is being entered there.

This patch also fixes the flow of DidRenderFrame and RenderNextFrame messages
by setting the m_waitingForUIProcess flag properly and only send the
RenderNextFrame once the painting thread on the UI process is ready to paint.

This fixes the first visible content rect message not being received when
loading pages from the disk.

• Shared/WebPreferencesStore.h:
• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::initialize):

• UIProcess/DrawingAreaProxyImpl.cpp:

(WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):

• UIProcess/qt/LayerTreeHostProxyQt.cpp:

(WebKit::LayerTreeHostProxy::flushLayerChanges):
(WebKit::LayerTreeHostProxy::didRenderFrame):

• WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::DrawingAreaImpl):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

• WebProcess/WebPage/qt/LayerTreeHostQt.cpp:

(WebKit::LayerTreeHostQt::performScheduledLayerFlush):

• WebProcess/WebPage/qt/WebPageQt.cpp:

(WebKit::WebPage::platformInitialize):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPreferencesStore.h (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.cpp (modified) (2 diffs)
• UIProcess/qt/LayerTreeHostProxyQt.cpp (modified) (2 diffs)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/qt/LayerTreeHostQt.cpp (modified) (2 diffs)
• WebProcess/WebPage/qt/WebPageQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-20  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] Trigger forcing accelerated compositing from the UI process side.
+        https://bugs.webkit.org/show_bug.cgi?id=76296
+
+        Reviewed by Noam Rosenthal.
+
+        Some messages can be sent from the web view to the LayerTreeHost before
+        accelerated compositing is entered on the web process and signaled back.
+        By letting the UI process decide if AC has to be forced, we can create
+        the LayerTreeHostProxy earlier to send messages to the web process while
+        AC is being entered there.
+
+        This patch also fixes the flow of DidRenderFrame and RenderNextFrame messages
+        by setting the m_waitingForUIProcess flag properly and only send the
+        RenderNextFrame once the painting thread on the UI process is ready to paint.
+
+        This fixes the first visible content rect message not being received when
+        loading pages from the disk.
+
+        * Shared/WebPreferencesStore.h:
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::initialize):
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
+        * UIProcess/qt/LayerTreeHostProxyQt.cpp:
+        (WebKit::LayerTreeHostProxy::flushLayerChanges):
+        (WebKit::LayerTreeHostProxy::didRenderFrame):
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+        (WebKit::LayerTreeHostQt::performScheduledLayerFlush):
+        * WebProcess/WebPage/qt/WebPageQt.cpp:
+        (WebKit::WebPage::platformInitialize):
+
 2012-01-20  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -67 +67 @@
     macro(NeedsSiteSpecificQuirks, needsSiteSpecificQuirks, Bool, bool, false) \
     macro(AcceleratedCompositingEnabled, acceleratedCompositingEnabled, Bool, bool, true) \
+    macro(ForceCompositingMode, forceCompositingMode, Bool, bool, false) \
     macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, false) \
     macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, true) \

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -106 +106 @@
     setUseTraditionalDesktopBehaviour(false);
     webPageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
+    webPageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
 
     pageClient.initialize(q_ptr, pageViewPrivate->eventHandler.data(), &undoController);

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

@@ -31 +31 @@
 #include "LayerTreeContext.h"
 #include "UpdateInfo.h"
+#include "WebPageGroup.h"
 #include "WebPageProxy.h"
+#include "WebPreferences.h"
 #include "WebProcessProxy.h"
 #include <WebCore/Region.h>
@@ -57 +59 @@
     , m_discardBackingStoreTimer(RunLoop::current(), this, &DrawingAreaProxyImpl::discardBackingStore)
 {
+#if USE(TEXTURE_MAPPER)
+    // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
+    if (webPageProxy->pageGroup()->preferences()->forceCompositingMode())
+        m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this));
+#endif
 }
 

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

@@ -432 +432 @@
 {
     m_rootLayer->syncCompositingState(FloatRect());
+    // The pending tiles state is on its way for the screen, tell the web process to render the next one.
+    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
 }
 
@@ -572 +574 @@
 void LayerTreeHostProxy::didRenderFrame()
 {
-    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
     pushUpdateToQueue(FlushLayerChangesMessage::create());
     updateViewport();

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -69 +69 @@
     , m_exitCompositingTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
 {
-    if (webPage->corePage()->settings()->acceleratedDrawingEnabled())
+    if (webPage->corePage()->settings()->acceleratedDrawingEnabled() || webPage->corePage()->settings()->forceCompositingMode())
         m_alwaysUseCompositing = true;
         

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1841 +1841 @@
 
     settings->setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+    settings->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
     settings->setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
     settings->setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()) && LayerTreeHost::supportsAcceleratedCompositing());

trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp

@@ -241 +241 @@
 void LayerTreeHostQt::performScheduledLayerFlush()
 {
-    m_webPage->layoutIfNeeded();
-
-    if (!m_isValid)
-        return;
-
 #if USE(TILED_BACKING_STORE)
     if (m_isSuspended || m_waitingForUIProcess)
         return;
 #endif
+
+    m_webPage->layoutIfNeeded();
+
+    if (!m_isValid)
+        return;
 
     m_shouldSyncFrame = false;
@@ -262 +262 @@
 
     m_webPage->send(Messages::LayerTreeHostProxy::DidRenderFrame());
+    m_waitingForUIProcess = true;
 
     if (!m_notifyAfterScheduledLayerFlush)

trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

@@ -91 +91 @@
 void WebPage::platformInitialize()
 {
-    Settings* settings = m_page->settings();
-
-    // If accelerated compositing is enabled, we want to be in force-compositing mode, so that we don't switch between composited/non-composited state.
-    settings->setForceCompositingMode(true);
 }