Title: [106306] trunk/Source/WebCore
- Revision
- 106306
- Author
- [email protected]
- Date
- 2012-01-30 17:23:11 -0800 (Mon, 30 Jan 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106305 => 106306)
--- trunk/Source/WebCore/ChangeLog 2012-01-31 01:10:53 UTC (rev 106305)
+++ trunk/Source/WebCore/ChangeLog 2012-01-31 01:23:11 UTC (rev 106306)
@@ -1,3 +1,20 @@
+2012-01-27 James Robinson <[email protected]>
+
+ [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 <[email protected]>
<rdar://problem/10707072>
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (106305 => 106306)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-01-31 01:10:53 UTC (rev 106305)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-01-31 01:23:11 UTC (rev 106306)
@@ -163,10 +163,6 @@
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())
return nullptr;
@@ -191,8 +187,10 @@
if (!m_context->makeContextCurrent())
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();
m_capabilities.contextHasCachedFrontBuffer = extensions->supports("GL_CHROMIUM_front_buffer_cached");
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (106305 => 106306)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-01-31 01:10:53 UTC (rev 106305)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-01-31 01:23:11 UTC (rev 106306)
@@ -355,14 +355,6 @@
OwnPtr<LayerRendererChromium> layerRenderer;
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();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
