Changeset 57961 in webkit

Timestamp:

Apr 21, 2010 3:09:48 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Simon Fraser.

[Qt] Fix or remove the runtime flag for accelerated compositing.

This adds a way for a chrome client to disallow layers from becoming composited,
even if the settings enable accelerated compositing. This is necessary for platforms
where different views can be applied with the same settings to the same page.

We enable an API through ChromeClient to ask the chrome-client whether or not
it can render composited layers, which is taken into account when the compositor
decides whether or not to start compositing.

​https://bugs.webkit.org/show_bug.cgi?id=37313

Pages under LayoutTests/compositing now work under QWebView, even when
QWebSettings::AcceleratedCompositingEnabled is on.

• page/ChromeClient.h: (WebCore::ChromeClient::allowsAcceleratedCompositing):
• platform/qt/QWebPageClient.h: (QWebPageClient::allowsAcceleratedCompositing):
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::canBeComposited):

2010-04-21 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Simon Fraser.

[Qt] Fix or remove the runtime flag for accelerated compositing.
​https://bugs.webkit.org/show_bug.cgi?id=37313

This lets the QWebPageClient "veto" the settings value for accelerated compositing.
In this case we allow accelerated compositing only on QGraphicsWebView.

• Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::allowsAcceleratedCompositing):
• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::allowsAcceleratedCompositing):
• WebCoreSupport/ChromeClientQt.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (1 diff)
• WebCore/platform/qt/QWebPageClient.h (modified) (1 diff)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• WebKit/qt/Api/qgraphicswebview.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebview.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Simon Fraser.
+
+        [Qt] Fix or remove the runtime flag for accelerated compositing.
+
+        This adds a way for a chrome client to disallow layers from becoming composited,
+        even if the settings enable accelerated compositing. This is necessary for platforms
+        where different views can be applied with the same settings to the same page.
+
+        We enable an API through ChromeClient to ask the chrome-client whether or not
+        it can render composited layers, which is taken into account when the compositor
+        decides whether or not to start compositing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37313
+
+        Pages under LayoutTests/compositing now work under QWebView, even when
+        QWebSettings::AcceleratedCompositingEnabled is on.
+
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::allowsAcceleratedCompositing):
+        * platform/qt/QWebPageClient.h:
+        (QWebPageClient::allowsAcceleratedCompositing):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::canBeComposited):
+
 2010-04-21  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/page/ChromeClient.h

@@ -215 +215 @@
         // to do an eager layout before the drawing.
         virtual void scheduleCompositingLayerSync() = 0;
+        // Returns whether or not the client can render the composited layer,
+        // regardless of the settings.
+        virtual bool allowsAcceleratedCompositing() const { return true; }
 #endif
 

trunk/WebCore/platform/qt/QWebPageClient.h

@@ -56 +56 @@
     // we wait for the next update and sync the layers then.
     virtual void markForSync(bool scheduleSync = false) {}
+    virtual bool allowsAcceleratedCompositing() const { return false; }
 #endif
 

trunk/WebCore/rendering/RenderLayerCompositor.cpp

@@ -135 +135 @@
     }
 
+    // We allow the chrome to override the settings, in case the page is rendered
+    // on a chrome that doesn't allow accelerated compositing.
+    if (hasAcceleratedCompositing) {
+        Frame* frame = m_renderView->frameView()->frame();
+        Page* page = frame ? frame->page() : 0;
+        if (page)
+            hasAcceleratedCompositing = page->chrome()->client()->allowsAcceleratedCompositing();
+    }
+
     if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter)
         setCompositingLayersNeedRebuild();

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -123 +123 @@
     virtual void markForSync(bool scheduleSync);
     void updateCompositingScrollPosition();
+
+    // QGraphicsWebView can render composited layers
+    virtual bool allowsAcceleratedCompositing() const { return true; }
 #endif
 

trunk/WebKit/qt/Api/qwebview.cpp

@@ -416 +416 @@
         connect(d->page, SIGNAL(destroyed()),
                 this, SLOT(_q_pageDestroyed()));
-#if USE(ACCELERATED_COMPOSITING)
-        d->page->d->page->settings()->setAcceleratedCompositingEnabled(false);
-#endif
     }
     setAttribute(Qt::WA_OpaquePaintEvent, d->page);

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Simon Fraser.
+
+        [Qt] Fix or remove the runtime flag for accelerated compositing.
+        https://bugs.webkit.org/show_bug.cgi?id=37313
+
+        This lets the QWebPageClient "veto" the settings value for accelerated compositing.
+        In this case we allow accelerated compositing only on QGraphicsWebView.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::allowsAcceleratedCompositing):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::allowsAcceleratedCompositing):
+        * WebCoreSupport/ChromeClientQt.h:
+
 2010-04-20  Adam Barth  <abarth@webkit.org>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -555 +555 @@
         platformPageClient()->markForSync(true);
 }
+
+bool ChromeClientQt::allowsAcceleratedCompositing() const
+{
+    return (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing());
+}
+
 #endif
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h

@@ -142 +142 @@
         virtual void setNeedsOneShotDrawingSynchronization();
         virtual void scheduleCompositingLayerSync();
+        virtual bool allowsAcceleratedCompositing() const;
 #endif