Changeset 106306 in webkit

Timestamp:

Jan 30, 2012 5:23:11 PM (12 years ago)

Author:

jamesr@google.com

Message:

[chromium] Remove unnecessary retry logic in LayerRendererChromium initialization for accelerated painting
​https://bugs.webkit.org/show_bug.cgi?id=77247

Reviewed by Kenneth Russell.

The accelerate painting setting is done differently from other capability-dependent settings for no good reason,
requiring that we retry initialization with different settings. For all other settings we set the capabilities
bit to true if the setting is requested and if the required capabilities exist on the underlying context.

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::create):
(WebCore::LayerRendererChromium::initialize):

• platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:

(WebCore::CCLayerTreeHostImpl::initializeLayerRenderer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (2 diffs)
• platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-27  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove unnecessary retry logic in LayerRendererChromium initialization for accelerated painting
+        https://bugs.webkit.org/show_bug.cgi?id=77247
+
+        Reviewed by Kenneth Russell.
+
+        The accelerate painting setting is done differently from other capability-dependent settings for no good reason,
+        requiring that we retry initialization with different settings. For all other settings we set the capabilities
+        bit to true if the setting is requested and if the required capabilities exist on the underlying context.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::create):
+        (WebCore::LayerRendererChromium::initialize):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::initializeLayerRenderer):
+
 2012-01-30  Brady Eidson  <beidson@apple.com>
 

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

@@ -164 +164 @@
 PassOwnPtr<LayerRendererChromium> LayerRendererChromium::create(CCLayerTreeHostImpl* owner, PassRefPtr<GraphicsContext3D> context)
 {
-#if USE(SKIA)
-    if (owner->settings().acceleratePainting && !contextSupportsAcceleratedPainting(context.get()))
-        return nullptr;
-#endif
     OwnPtr<LayerRendererChromium> layerRenderer(adoptPtr(new LayerRendererChromium(owner, context)));
     if (!layerRenderer->initialize())
@@ -192 +188 @@
         return false;
 
-    if (settings().acceleratePainting)
+#if USE(SKIA)
+    if (settings().acceleratePainting && contextSupportsAcceleratedPainting(m_context.get()))
         m_capabilities.usingAcceleratedPainting = true;
+#endif
 
     WebCore::Extensions3D* extensions = m_context->getExtensions();

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

@@ -356 +356 @@
     layerRenderer = LayerRendererChromium::create(this, context);
 
-    // If creation failed, and we had asked for accelerated painting, disable accelerated painting
-    // and try creating the renderer again.
-    if (!layerRenderer && m_settings.acceleratePainting) {
-        m_settings.acceleratePainting = false;
-
-        layerRenderer = LayerRendererChromium::create(this, context);
-    }
-
     if (m_layerRenderer)
         m_layerRenderer->close();