Diff
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp (109032 => 109033)
--- branches/chromium/1025/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp 2012-02-27 23:40:52 UTC (rev 109032)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp 2012-02-27 23:48:52 UTC (rev 109033)
@@ -91,7 +91,6 @@
PlatformCanvas::Painter::TextOption textOption =
borderTexels ? PlatformCanvas::Painter::GrayscaleText : PlatformCanvas::Painter::SubpixelText;
PlatformCanvas::Painter canvasPainter(&m_canvas, textOption);
- canvasPainter.skiaContext()->setTrackOpaqueRegion(!layerIsOpaque);
paintContents(*canvasPainter.context(), contentRect, contentsScale);
if (!layerIsOpaque)
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp (109032 => 109033)
--- branches/chromium/1025/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp 2012-02-27 23:40:52 UTC (rev 109032)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp 2012-02-27 23:48:52 UTC (rev 109033)
@@ -54,7 +54,6 @@
SkCanvas* canvas = m_picture.beginRecording(contentRect.width(), contentRect.height());
PlatformContextSkia platformContext(canvas);
platformContext.setDeferred(true);
- platformContext.setTrackOpaqueRegion(!m_layerIsOpaque);
GraphicsContext graphicsContext(&platformContext);
paintContents(graphicsContext, contentRect, contentsScale);
m_picture.endRecording();
Modified: branches/chromium/1025/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (109032 => 109033)
--- branches/chromium/1025/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-02-27 23:40:52 UTC (rev 109032)
+++ branches/chromium/1025/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-02-27 23:48:52 UTC (rev 109033)
@@ -264,8 +264,6 @@
CCRenderPassList passes;
calculateRenderPasses(passes);
- optimizeRenderPasses(passes);
-
m_layerRenderer->beginDrawingFrame();
for (size_t i = 0; i < passes.size(); ++i)
m_layerRenderer->drawRenderPass(passes[i].get());
Modified: branches/chromium/1025/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (109032 => 109033)
--- branches/chromium/1025/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-02-27 23:40:52 UTC (rev 109032)
+++ branches/chromium/1025/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-02-27 23:48:52 UTC (rev 109033)
@@ -522,6 +522,16 @@
runTest(true); \
}
+#define DISABLED_SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
+ TEST_F(TEST_FIXTURE_NAME, DISABLED_runSingleThread) \
+ { \
+ runTest(false); \
+ } \
+ TEST_F(TEST_FIXTURE_NAME, DISABLED_runMultiThread) \
+ { \
+ runTest(true); \
+ }
+
SINGLE_AND_MULTI_THREAD_TEST_F(CCLayerTreeHostTestShortlived1)
// Shortlived layerTreeHosts shouldn't die with a commit in flight.
Modified: branches/chromium/1025/Source/WebKit/chromium/tests/LayerTextureUpdaterTest.cpp (109032 => 109033)
--- branches/chromium/1025/Source/WebKit/chromium/tests/LayerTextureUpdaterTest.cpp 2012-02-27 23:40:52 UTC (rev 109032)
+++ branches/chromium/1025/Source/WebKit/chromium/tests/LayerTextureUpdaterTest.cpp 2012-02-27 23:48:52 UTC (rev 109033)
@@ -85,7 +85,7 @@
EXPECT_EQ(a.y(), b.y()); \
EXPECT_EQ(a.maxY(), b.maxY());
-TEST(LayerTextureUpdaterTest, testOpaqueRectPresentAfterOpaquePaint)
+TEST(LayerTextureUpdaterTest, DISABLED_testOpaqueRectPresentAfterOpaquePaint)
{
PaintFillOpaque fillOpaque;
RefPtr<LayerTextureUpdater> updater;
@@ -111,7 +111,7 @@
EXPECT_EQ_RECT(IntRect(0, 0, 400, 400), opaqueRect);
}
-TEST(LayerTextureUpdaterTest, testOpaqueRectNotPresentAfterNonOpaquePaint)
+TEST(LayerTextureUpdaterTest, DISABLED_testOpaqueRectNotPresentAfterNonOpaquePaint)
{
PaintFillAlpha fillAlpha;
RefPtr<LayerTextureUpdater> updater;
