Title: [125941] branches/chromium/1229/Source
- Revision
- 125941
- Author
- [email protected]
- Date
- 2012-08-17 15:04:53 -0700 (Fri, 17 Aug 2012)
Log Message
Merge 125799 - [chromium] Impl scrolling crashes when the renderer's initialization failed
https://bugs.webkit.org/show_bug.cgi?id=94232
Reviewed by James Robinson.
Source/WebCore:
CCLayerTreeHostImpl::calculateRenderSurfaceLayerList should not be
called when there is no renderer present or it will crash.
Chromium bug: crbug.com/125482
Tests: CCLayerTreeHostImplTest.scrollWithoutRenderer
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::calculateRenderSurfaceLayerList):
(WebCore::CCLayerTreeHostImpl::ensureRenderSurfaceLayerList):
Source/WebKit/chromium:
Also updated the finishAllRenderingAfterContextLost to properly fail
renderer initialization.
* tests/CCLayerTreeHostImplTest.cpp:
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10829399
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (125940 => 125941)
--- branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-08-17 21:59:08 UTC (rev 125940)
+++ branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-08-17 22:04:53 UTC (rev 125941)
@@ -251,6 +251,7 @@
{
ASSERT(renderSurfaceLayerList.isEmpty());
ASSERT(m_rootLayerImpl);
+ ASSERT(m_layerRenderer); // For maxTextureSize.
{
TRACE_EVENT0("cc", "CCLayerTreeHostImpl::calcDrawEtc");
@@ -824,6 +825,8 @@
{
if (!m_rootLayerImpl)
return false;
+ if (!m_layerRenderer)
+ return false;
// We need both a non-empty render surface layer list and a root render
// surface to be able to iterate over the visible layers.
Modified: branches/chromium/1229/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (125940 => 125941)
--- branches/chromium/1229/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-08-17 21:59:08 UTC (rev 125940)
+++ branches/chromium/1229/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-08-17 22:04:53 UTC (rev 125941)
@@ -187,6 +187,11 @@
CCScopedSettings m_scopedSettings;
};
+class FakeWebGraphicsContext3DMakeCurrentFails : public FakeWebGraphicsContext3D {
+public:
+ virtual bool makeContextCurrent() { return false; }
+};
+
TEST_F(CCLayerTreeHostImplTest, scrollDeltaNoLayers)
{
ASSERT_FALSE(m_hostImpl->rootLayer());
@@ -273,6 +278,21 @@
EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollIgnored);
}
+TEST_F(CCLayerTreeHostImplTest, scrollWithoutRenderer)
+{
+ CCLayerTreeSettings settings;
+ m_hostImpl = CCLayerTreeHostImpl::create(settings, this);
+
+ // Initialization will fail here.
+ m_hostImpl->initializeLayerRenderer(FakeWebCompositorOutputSurface::create(adoptPtr(new FakeWebGraphicsContext3DMakeCurrentFails)), UnthrottledUploader);
+ m_hostImpl->setViewportSize(IntSize(10, 10), IntSize(10, 10));
+
+ setupScrollAndContentsLayers(IntSize(100, 100));
+
+ // We should not crash when trying to scroll after the renderer initialization fails.
+ EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollIgnored);
+}
+
TEST_F(CCLayerTreeHostImplTest, replaceTreeWhileScrolling)
{
const int scrollLayerId = 1;
@@ -2111,13 +2131,11 @@
EXPECT_TRUE(layer2->didLoseContextCalled());
}
-class FakeWebGraphicsContext3DMakeCurrentFails : public FakeWebGraphicsContext3D {
-public:
- virtual bool makeContextCurrent() { return false; }
-};
-
TEST_F(CCLayerTreeHostImplTest, finishAllRenderingAfterContextLost)
{
+ CCLayerTreeSettings settings;
+ m_hostImpl = CCLayerTreeHostImpl::create(settings, this);
+
// The context initialization will fail, but we should still be able to call finishAllRendering() without any ill effects.
m_hostImpl->initializeLayerRenderer(CCGraphicsContext::create3D(adoptPtr(new FakeWebGraphicsContext3DMakeCurrentFails)), UnthrottledUploader);
m_hostImpl->finishAllRendering();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
