Commit 07551559 authored by danakj's avatar danakj Committed by Commit bot

cc: Make low res tilings off by default in LayerTreeSettings.

This will disable low res tilings on all platforms but android, since
RenderWidgetCompositor only sets this to true on android.

R=vmpstr
BUG=410610

Review URL: https://codereview.chromium.org/563723004

Cr-Commit-Position: refs/heads/master@{#294449}
parent d80f2526
...@@ -46,13 +46,18 @@ class MockCanvas : public SkCanvas { ...@@ -46,13 +46,18 @@ class MockCanvas : public SkCanvas {
std::vector<SkRect> rects_; std::vector<SkRect> rects_;
}; };
class NoLowResTilingsSettings : public ImplSidePaintingSettings {};
class LowResTilingsSettings : public ImplSidePaintingSettings {
public:
LowResTilingsSettings() { create_low_res_tiling = true; }
};
class PictureLayerImplTest : public testing::Test { class PictureLayerImplTest : public testing::Test {
public: public:
PictureLayerImplTest() PictureLayerImplTest()
: proxy_(base::MessageLoopProxy::current()), : proxy_(base::MessageLoopProxy::current()),
host_impl_(ImplSidePaintingSettings(), host_impl_(LowResTilingsSettings(), &proxy_, &shared_bitmap_manager_),
&proxy_,
&shared_bitmap_manager_),
id_(7), id_(7),
pending_layer_(NULL), pending_layer_(NULL),
old_pending_layer_(NULL), old_pending_layer_(NULL),
...@@ -2992,11 +2997,6 @@ TEST_F(PictureLayerImplTest, SharedActiveHighResReadyNotEnoughToActivate) { ...@@ -2992,11 +2997,6 @@ TEST_F(PictureLayerImplTest, SharedActiveHighResReadyNotEnoughToActivate) {
EXPECT_TRUE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw()); EXPECT_TRUE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
} }
class NoLowResTilingsSettings : public ImplSidePaintingSettings {
public:
NoLowResTilingsSettings() { create_low_res_tiling = false; }
};
class NoLowResPictureLayerImplTest : public PictureLayerImplTest { class NoLowResPictureLayerImplTest : public PictureLayerImplTest {
public: public:
NoLowResPictureLayerImplTest() NoLowResPictureLayerImplTest()
...@@ -3582,7 +3582,7 @@ TEST_F(PictureLayerImplTestWithDelegatingRenderer, ...@@ -3582,7 +3582,7 @@ TEST_F(PictureLayerImplTestWithDelegatingRenderer,
render_pass->quad_list.back()->material); render_pass->quad_list.back()->material);
} }
class OcclusionTrackingSettings : public ImplSidePaintingSettings { class OcclusionTrackingSettings : public LowResTilingsSettings {
public: public:
OcclusionTrackingSettings() { use_occlusion_for_tile_prioritization = true; } OcclusionTrackingSettings() { use_occlusion_for_tile_prioritization = true; }
}; };
......
...@@ -482,6 +482,11 @@ INSTANTIATE_TEST_CASE_P(TileManagerTests, ...@@ -482,6 +482,11 @@ INSTANTIATE_TEST_CASE_P(TileManagerTests,
TileManagerTest, TileManagerTest,
::testing::Values(true, false)); ::testing::Values(true, false));
class LowResTilingsSettings : public ImplSidePaintingSettings {
public:
LowResTilingsSettings() { create_low_res_tiling = true; }
};
class TileManagerTilePriorityQueueTest : public testing::Test { class TileManagerTilePriorityQueueTest : public testing::Test {
public: public:
TileManagerTilePriorityQueueTest() TileManagerTilePriorityQueueTest()
...@@ -490,9 +495,7 @@ class TileManagerTilePriorityQueueTest : public testing::Test { ...@@ -490,9 +495,7 @@ class TileManagerTilePriorityQueueTest : public testing::Test {
ready_to_activate_(false), ready_to_activate_(false),
id_(7), id_(7),
proxy_(base::MessageLoopProxy::current()), proxy_(base::MessageLoopProxy::current()),
host_impl_(ImplSidePaintingSettings(), host_impl_(LowResTilingsSettings(), &proxy_, &shared_bitmap_manager_) {}
&proxy_,
&shared_bitmap_manager_) {}
void SetTreePriority(TreePriority tree_priority) { void SetTreePriority(TreePriority tree_priority) {
GlobalStateThatImpactsTilePriority state; GlobalStateThatImpactsTilePriority state;
......
...@@ -30,7 +30,7 @@ LayerTreeSettings::LayerTreeSettings() ...@@ -30,7 +30,7 @@ LayerTreeSettings::LayerTreeSettings()
gpu_rasterization_enabled(false), gpu_rasterization_enabled(false),
gpu_rasterization_forced(false), gpu_rasterization_forced(false),
recording_mode(RecordNormally), recording_mode(RecordNormally),
create_low_res_tiling(true), create_low_res_tiling(false),
scrollbar_animator(NoAnimator), scrollbar_animator(NoAnimator),
scrollbar_fade_delay_ms(0), scrollbar_fade_delay_ms(0),
scrollbar_fade_duration_ms(0), scrollbar_fade_duration_ms(0),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment