diff options
author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 08:30:34 +0000 |
---|---|---|
committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 08:30:34 +0000 |
commit | eb8b32eeb3518b71da5b23369fd96d6424db8731 (patch) | |
tree | ac6ee158093b21e0bcd18ebd7fef0930944a6b80 /cc/test/layer_tree_pixel_test.cc | |
parent | d232baf1938667833c31c58ff8ba243e25a90d02 (diff) | |
download | chromium_src-eb8b32eeb3518b71da5b23369fd96d6424db8731.zip chromium_src-eb8b32eeb3518b71da5b23369fd96d6424db8731.tar.gz chromium_src-eb8b32eeb3518b71da5b23369fd96d6424db8731.tar.bz2 |
Remove solid_color_scrollbars CC LayerTreeSetting.
This setting is no longer needed because Blink theming determines the
scrollbar type instead. This deletes it and cleans up two residual
abuses of it:
1. In LayerTreeHostImpl::UnscaledScrollableViewportSize() it was used
to determine whether we should use the container layer size or the device
viewport size as the scrolling viewport size. A more logical way of
inferring this is by checking whether the container layer clips or
not (it currently does on all platforms except Android).
2. In LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted() it
was used to force creating the PrioritizedResourceManager if painted
scrollbars might exist. Painted scrollbars have now transitioned to
the UIResource mechanism so this hack is unnecessary. This change
exposed about 20 unit tests that try to use ContentLayers in
impl-side-painting mode.
NOTRY=true
BUG=309239
Review URL: https://codereview.chromium.org/30313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
-rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 94fce72..70e6223 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -25,7 +25,8 @@ namespace cc { LayerTreePixelTest::LayerTreePixelTest() : pixel_comparator_(new ExactPixelComparator(true)), test_type_(GL_WITH_DEFAULT), - pending_texture_mailbox_callbacks_(0) {} + pending_texture_mailbox_callbacks_(0), + impl_side_painting_(true) {} LayerTreePixelTest::~LayerTreePixelTest() {} @@ -145,12 +146,12 @@ scoped_refptr<SolidColorLayer> LayerTreePixelTest:: border_width, rect.height() - border_width * 2), border_color); - scoped_refptr<SolidColorLayer> border_right = CreateSolidColorLayer( - gfx::Rect(rect.width() - border_width, - border_width, - border_width, - rect.height() - border_width * 2), - border_color); + scoped_refptr<SolidColorLayer> border_right = + CreateSolidColorLayer(gfx::Rect(rect.width() - border_width, + border_width, + border_width, + rect.height() - border_width * 2), + border_color); scoped_refptr<SolidColorLayer> border_bottom = CreateSolidColorLayer( gfx::Rect(0, rect.height() - border_width, rect.width(), border_width), border_color); @@ -188,7 +189,7 @@ void LayerTreePixelTest::RunPixelTest( content_root_ = content_root; readback_target_ = NULL; ref_file_ = file_name; - RunTest(true, false, true); + RunTest(true, false, impl_side_painting_); } void LayerTreePixelTest::RunPixelTestWithReadbackTarget( @@ -200,7 +201,7 @@ void LayerTreePixelTest::RunPixelTestWithReadbackTarget( content_root_ = content_root; readback_target_ = target; ref_file_ = file_name; - RunTest(true, false, true); + RunTest(true, false, impl_side_painting_); } void LayerTreePixelTest::SetupTree() { |