summaryrefslogtreecommitdiffstats
path: root/cc/layers
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-08 11:35:02 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-08 11:35:02 +0000
commitb74241eb696798b77f8056019835f3bde707918f (patch)
treea61e8b05de318fd9db253f3f76a197ace8e58ff3 /cc/layers
parentf7471e89f419b101cffed451308f5f229f3ef3ae (diff)
downloadchromium_src-b74241eb696798b77f8056019835f3bde707918f.zip
chromium_src-b74241eb696798b77f8056019835f3bde707918f.tar.gz
chromium_src-b74241eb696798b77f8056019835f3bde707918f.tar.bz2
Remove --background-color-instead-of-checkerboard flag.
This is now unused on all platforms. R=aelias BUG=350142 Review URL: https://codereview.chromium.org/189433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
-rw-r--r--cc/layers/layer.h2
-rw-r--r--cc/layers/layer_impl.cc5
-rw-r--r--cc/layers/layer_impl.h4
-rw-r--r--cc/layers/layer_unittest.cc6
-rw-r--r--cc/layers/picture_layer_impl.cc2
5 files changed, 9 insertions, 10 deletions
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 97d3753..312ae97 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -298,7 +298,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
}
void SetDrawCheckerboardForMissingTiles(bool checkerboard);
- bool DrawCheckerboardForMissingTiles() const {
+ bool draw_checkerboard_for_missing_tiles() const {
return draw_checkerboard_for_missing_tiles_;
}
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 46fa012..dc5d85b 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -464,11 +464,6 @@ InputHandler::ScrollStatus LayerImpl::TryScroll(
return InputHandler::ScrollStarted;
}
-bool LayerImpl::DrawCheckerboardForMissingTiles() const {
- return draw_checkerboard_for_missing_tiles_ &&
- !layer_tree_impl()->settings().background_color_instead_of_checkerboard;
-}
-
gfx::Rect LayerImpl::LayerRectToContentRect(
const gfx::RectF& layer_rect) const {
gfx::RectF content_rect =
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index e1fcfc1..856151e 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -425,7 +425,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
void SetDrawCheckerboardForMissingTiles(bool checkerboard) {
draw_checkerboard_for_missing_tiles_ = checkerboard;
}
- bool DrawCheckerboardForMissingTiles() const;
+ bool draw_checkerboard_for_missing_tiles() const {
+ return draw_checkerboard_for_missing_tiles_;
+ }
InputHandler::ScrollStatus TryScroll(
const gfx::PointF& screen_space_point,
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 7242bae..e439e8d 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -564,8 +564,10 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDoubleSided(false));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTouchEventHandlerRegion(
gfx::Rect(10, 10)));
- EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDrawCheckerboardForMissingTiles(
- !test_layer->DrawCheckerboardForMissingTiles()));
+ EXPECT_SET_NEEDS_COMMIT(
+ 1,
+ test_layer->SetDrawCheckerboardForMissingTiles(
+ !test_layer->draw_checkerboard_for_missing_tiles()));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetForceRenderSurface(true));
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHideLayerAndSubtree(true));
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index f2c3c3e..b8a4ff7 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -222,7 +222,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
gfx::Rect geometry_rect = iter.geometry_rect();
gfx::Rect visible_geometry_rect = geometry_rect;
if (!*iter || !iter->IsReadyToDraw()) {
- if (DrawCheckerboardForMissingTiles()) {
+ if (draw_checkerboard_for_missing_tiles()) {
// TODO(enne): Figure out how to show debug "invalidated checker" color
scoped_ptr<CheckerboardDrawQuad> quad = CheckerboardDrawQuad::Create();
SkColor color = DebugColors::DefaultCheckerboardColor();