Changeset 127672 in webkit

Timestamp:

Sep 5, 2012 6:16:45 PM (12 years ago)

Author:

jamesr@google.com

Message:

[chromium] Move static WebCompositor functions to WebCompositorSupport
​https://bugs.webkit.org/show_bug.cgi?id=95785

Reviewed by Darin Fisher.

The statics on WebCompositor need to be moved to WebCompositorSupport so the embedder can inject an
implementation for these via PlatformSupport. This adds the interface for the statics to WebCompositorSupport.
After an implementation of these lands on the chromium side, I'll switch all callers over to use these and
remove the WebCompositor interface from the API.

• chromium/public/WebCompositorSupport.h:

(WebCompositorSupport):
(WebKit::WebCompositorSupport::initialize):
(WebKit::WebCompositorSupport::threadingEnabled):
(WebKit::WebCompositorSupport::shutdown):
(WebKit::WebCompositorSupport::setPerTilePaintingEnabled):
(WebKit::WebCompositorSupport::setPartialSwapEnabled):
(WebKit::WebCompositorSupport::setAcceleratedAnimationEnabled):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebCompositor.h (modified) (1 diff)
• Platform/chromium/public/WebCompositorSupport.h (modified) (2 diffs)
• WebCore/platform/chromium/support/WebCompositorImpl.cpp (modified) (2 diffs)
• WebCore/platform/chromium/support/WebCompositorImpl.h (modified) (1 diff)
• WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (3 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-09-05  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Move static WebCompositor functions to WebCompositorSupport
+        https://bugs.webkit.org/show_bug.cgi?id=95785
+
+        Reviewed by Darin Fisher.
+
+        The statics on WebCompositor need to be moved to WebCompositorSupport so the embedder can inject an
+        implementation for these via PlatformSupport. This adds the interface for the statics to WebCompositorSupport.
+        After an implementation of these lands on the chromium side, I'll switch all callers over to use these and
+        remove the WebCompositor interface from the API.
+
+        * chromium/public/WebCompositorSupport.h:
+        (WebCompositorSupport):
+        (WebKit::WebCompositorSupport::initialize):
+        (WebKit::WebCompositorSupport::threadingEnabled):
+        (WebKit::WebCompositorSupport::shutdown):
+        (WebKit::WebCompositorSupport::setPerTilePaintingEnabled):
+        (WebKit::WebCompositorSupport::setPartialSwapEnabled):
+        (WebKit::WebCompositorSupport::setAcceleratedAnimationEnabled):
+
 2012-09-05  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/Platform/chromium/public/WebCompositor.h

@@ -45 +45 @@
 
     // Returns whether the compositor was initialized with threading enabled.
-    WEBKIT_EXPORT static bool threadingEnabled();
+    WEBKIT_EXPORT static bool isThreadingEnabled();
 
     // Shuts down the compositor. This must be called when all compositor data

trunk/Source/Platform/chromium/public/WebCompositorSupport.h

@@ -47 +47 @@
 class WebScrollbarThemeGeometry;
 class WebSolidColorLayer;
+class WebThread;
 class WebTransformAnimationCurve;
 class WebVideoFrameProvider;
@@ -53 +54 @@
 class WebCompositorSupport {
 public:
+    // Initializes the compositor. Threaded compositing is enabled by passing in
+    // a non-null WebThread. No compositor classes or methods should be used
+    // prior to calling initialize.
+    virtual void initialize(WebThread*) { }
+
+    // Returns whether the compositor was initialized with threading enabled.
+    virtual bool isThreadingEnabled() { return false; }
+
+    // Shuts down the compositor. This must be called when all compositor data
+    // types have been deleted. No compositor classes or methods should be used
+    // after shutdown.
+    virtual void shutdown() { }
+
+    // These may only be called before initialize.
+    virtual void setPerTilePaintingEnabled(bool) { }
+    virtual void setPartialSwapEnabled(bool) { }
+    virtual void setAcceleratedAnimationEnabled(bool) { }
+
     // May return 0 if initialization fails.
     virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }

trunk/Source/WebCore/platform/chromium/support/WebCompositorImpl.cpp

@@ -48 +48 @@
 }
 
-bool WebCompositor::threadingEnabled()
+bool WebCompositor::isThreadingEnabled()
 {
-    return WebCompositorImpl::threadingEnabled();
+    return WebCompositorImpl::isThreadingEnabled();
 }
 
@@ -91 +91 @@
 }
 
-bool WebCompositorImpl::threadingEnabled()
+bool WebCompositorImpl::isThreadingEnabled()
 {
     return s_implThread;

trunk/Source/WebCore/platform/chromium/support/WebCompositorImpl.h

@@ -50 +50 @@
     friend class WebCompositor;
     static void initialize(WebThread* implThread);
-    static bool threadingEnabled();
+    static bool isThreadingEnabled();
     static void shutdown();
 

trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp

@@ -52 +52 @@
     // on GPU resource monitoring and other factors to chose between single
     // and double buffering.
-    , m_useDoubleBuffering(WebKit::WebCompositor::threadingEnabled() && deferralMode == NonDeferred)
+    , m_useDoubleBuffering(WebKit::WebCompositor::isThreadingEnabled() && deferralMode == NonDeferred)
     , m_frontBufferTexture(0)
     , m_backBufferTexture(textureId)
@@ -83 +83 @@
 
     m_layer->setTextureId(textureId);
-    m_layer->setRateLimitContext(!WebKit::WebCompositor::threadingEnabled() || m_useDoubleBuffering);
+    m_layer->setRateLimitContext(!WebKit::WebCompositor::isThreadingEnabled() || m_useDoubleBuffering);
     GraphicsLayerChromium::registerContentsLayer(m_layer->layer());
 }

trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp

@@ -85 +85 @@
     , m_colorBuffer(0)
     , m_frontColorBuffer(0)
-    , m_separateFrontTexture(m_preserveDrawingBuffer == Preserve || WebKit::WebCompositor::threadingEnabled())
+    , m_separateFrontTexture(m_preserveDrawingBuffer == Preserve || WebKit::WebCompositor::isThreadingEnabled())
     , m_depthStencilBuffer(0)
     , m_depthBuffer(0)

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1819 +1819 @@
 {
 #if USE(ACCELERATED_COMPOSITING)
-    if (WebCompositor::threadingEnabled())
+    if (WebCompositor::isThreadingEnabled())
         m_layerTreeView->setNeedsRedraw();
     else {
@@ -3735 +3735 @@
 {
     if (isAcceleratedCompositingActive()) {
-        if (WebCompositor::threadingEnabled()) {
+        if (WebCompositor::isThreadingEnabled()) {
             ASSERT(m_layerTreeView);
             m_layerTreeView->setNeedsAnimate();
@@ -3968 +3968 @@
 void WebViewImpl::scheduleComposite()
 {
-    ASSERT(!WebCompositor::threadingEnabled());
+    ASSERT(!WebCompositor::isThreadingEnabled());
     m_client->scheduleComposite();
 }