diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 21:31:44 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 21:31:44 +0000 |
| commit | bec08429286ff70c2ce5514ba44c8058fc058a27 (patch) | |
| tree | d3f04253d5ba58348f533386fa352203e1650b41 /skia | |
| parent | 2fccd420c7523d8379367cc1c8a3fc962b4babe1 (diff) | |
| download | chromium_src-bec08429286ff70c2ce5514ba44c8058fc058a27.zip chromium_src-bec08429286ff70c2ce5514ba44c8058fc058a27.tar.gz chromium_src-bec08429286ff70c2ce5514ba44c8058fc058a27.tar.bz2 | |
Add flag for drawing layers to screen with Ganesh
The --force-direct-layer-drawing flag causes any layer that could be
drawn direct to the backbuffer to be drawn to the backbuffer using
Ganesh. This flag also requires both the --enable-threaded-compositing
flag and the --enable-impl-side-painting flag to have any effect.
This patch also turns on testing for PictureDrawQuad using Ganesh in the
cc pixeltests.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/13863015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/analysis_canvas.cc | 5 | ||||
| -rw-r--r-- | skia/ext/analysis_canvas_unittest.cc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc index cf13127..d494ad7 100644 --- a/skia/ext/analysis_canvas.cc +++ b/skia/ext/analysis_canvas.cc @@ -71,13 +71,12 @@ AnalysisDevice::AnalysisDevice(const SkBitmap& bm) : INHERITED(bm) , isForcedNotSolid_(false) , isForcedNotTransparent_(false) - , isSolidColor_(false) - , isTransparent_(false) + , isSolidColor_(true) + , isTransparent_(true) , hasText_(false) { } AnalysisDevice::~AnalysisDevice() { - } bool AnalysisDevice::getColorIfSolid(SkColor* color) const { diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc index d271a9e..3efcafc 100644 --- a/skia/ext/analysis_canvas_unittest.cc +++ b/skia/ext/analysis_canvas_unittest.cc @@ -25,9 +25,10 @@ TEST(AnalysisCanvasTest, EmptyCanvas) { emptyBitmap.setConfig(SkBitmap::kNo_Config, 255, 255); skia::AnalysisDevice device(emptyBitmap); skia::AnalysisCanvas canvas(&device); - + SkColor color; - EXPECT_FALSE(canvas.getColorIfSolid(&color)); + EXPECT_TRUE(canvas.getColorIfSolid(&color)); + EXPECT_EQ(color, SkColorSetARGB(0, 0, 0, 0)); } TEST(AnalysisCanvasTest, ClearCanvas) { |