Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 13939005: cc: Add strict layer property change checking and handle bounds changes during paint. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add PaintProperties Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/layers/picture_layer.cc ('k') | cc/layers/tiled_layer.cc » ('j') | cc/trees/layer_tree_host_common.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/scrollbar_layer.h" 5 #include "cc/layers/scrollbar_layer.h"
6 6
7 #include "cc/animation/scrollbar_animation_controller.h" 7 #include "cc/animation/scrollbar_animation_controller.h"
8 #include "cc/layers/append_quads_data.h" 8 #include "cc/layers/append_quads_data.h"
9 #include "cc/layers/scrollbar_layer_impl.h" 9 #include "cc/layers/scrollbar_layer_impl.h"
10 #include "cc/quads/solid_color_draw_quad.h" 10 #include "cc/quads/solid_color_draw_quad.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 FakeScrollbarThemePainter::Create(false) 132 FakeScrollbarThemePainter::Create(false)
133 .PassAs<ScrollbarThemePainter>(), 133 .PassAs<ScrollbarThemePainter>(),
134 FakeWebScrollbarThemeGeometry::Create(true), 134 FakeWebScrollbarThemeGeometry::Create(true),
135 layer_tree_root->id()); 135 layer_tree_root->id());
136 layer_tree_root->AddChild(content_layer); 136 layer_tree_root->AddChild(content_layer);
137 layer_tree_root->AddChild(scrollbar_layer); 137 layer_tree_root->AddChild(scrollbar_layer);
138 138
139 layer_tree_root->SetScrollOffset(gfx::Vector2d(10, 20)); 139 layer_tree_root->SetScrollOffset(gfx::Vector2d(10, 20));
140 layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(30, 50)); 140 layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(30, 50));
141 layer_tree_root->SetBounds(gfx::Size(100, 200)); 141 layer_tree_root->SetBounds(gfx::Size(100, 200));
142 layer_tree_root->SavePaintProperties();
142 content_layer->SetBounds(gfx::Size(100, 200)); 143 content_layer->SetBounds(gfx::Size(100, 200));
144 content_layer->SavePaintProperties();
143 145
144 scoped_ptr<LayerImpl> layer_impl_tree_root = 146 scoped_ptr<LayerImpl> layer_impl_tree_root =
145 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 147 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
146 scoped_ptr<LayerImpl>(), 148 scoped_ptr<LayerImpl>(),
147 host_impl.active_tree()); 149 host_impl.active_tree());
148 TreeSynchronizer::PushProperties(layer_tree_root.get(), 150 TreeSynchronizer::PushProperties(layer_tree_root.get(),
149 layer_impl_tree_root.get()); 151 layer_impl_tree_root.get());
150 152
151 ScrollbarLayerImpl* cc_scrollbar_layer = 153 ScrollbarLayerImpl* cc_scrollbar_layer =
152 static_cast<ScrollbarLayerImpl*>(layer_impl_tree_root->children()[1]); 154 static_cast<ScrollbarLayerImpl*>(layer_impl_tree_root->children()[1]);
153 155
154 EXPECT_EQ(10.f, cc_scrollbar_layer->CurrentPos()); 156 EXPECT_EQ(10.f, cc_scrollbar_layer->CurrentPos());
155 EXPECT_EQ(100, cc_scrollbar_layer->TotalSize()); 157 EXPECT_EQ(100, cc_scrollbar_layer->TotalSize());
156 EXPECT_EQ(30, cc_scrollbar_layer->Maximum()); 158 EXPECT_EQ(30, cc_scrollbar_layer->Maximum());
157 159
158 layer_tree_root->SetScrollOffset(gfx::Vector2d(100, 200)); 160 layer_tree_root->SetScrollOffset(gfx::Vector2d(100, 200));
159 layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(300, 500)); 161 layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(300, 500));
160 layer_tree_root->SetBounds(gfx::Size(1000, 2000)); 162 layer_tree_root->SetBounds(gfx::Size(1000, 2000));
163 layer_tree_root->SavePaintProperties();
161 content_layer->SetBounds(gfx::Size(1000, 2000)); 164 content_layer->SetBounds(gfx::Size(1000, 2000));
165 content_layer->SavePaintProperties();
162 166
163 ScrollbarAnimationController* scrollbar_controller = 167 ScrollbarAnimationController* scrollbar_controller =
164 layer_impl_tree_root->scrollbar_animation_controller(); 168 layer_impl_tree_root->scrollbar_animation_controller();
165 layer_impl_tree_root = 169 layer_impl_tree_root =
166 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 170 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
167 layer_impl_tree_root.Pass(), 171 layer_impl_tree_root.Pass(),
168 host_impl.active_tree()); 172 host_impl.active_tree());
169 TreeSynchronizer::PushProperties(layer_tree_root.get(), 173 TreeSynchronizer::PushProperties(layer_tree_root.get(),
170 layer_impl_tree_root.get()); 174 layer_impl_tree_root.get());
171 EXPECT_EQ(scrollbar_controller, 175 EXPECT_EQ(scrollbar_controller,
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 FakeWebScrollbarThemeGeometry::Create(true), 442 FakeWebScrollbarThemeGeometry::Create(true),
439 Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID); 443 Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID);
440 444
441 layer_tree_root->AddChild(content_layer); 445 layer_tree_root->AddChild(content_layer);
442 layer_tree_root->AddChild(scrollbar_layer_horizontal); 446 layer_tree_root->AddChild(scrollbar_layer_horizontal);
443 layer_tree_root->AddChild(scrollbar_layer_vertical); 447 layer_tree_root->AddChild(scrollbar_layer_vertical);
444 448
445 layer_tree_root->SetScrollOffset(gfx::Vector2d(10, 20)); 449 layer_tree_root->SetScrollOffset(gfx::Vector2d(10, 20));
446 layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(30, 50)); 450 layer_tree_root->SetMaxScrollOffset(gfx::Vector2d(30, 50));
447 layer_tree_root->SetBounds(gfx::Size(100, 200)); 451 layer_tree_root->SetBounds(gfx::Size(100, 200));
452 layer_tree_root->SavePaintProperties();
448 content_layer->SetBounds(gfx::Size(100, 200)); 453 content_layer->SetBounds(gfx::Size(100, 200));
454 content_layer->SavePaintProperties();
449 455
450 scoped_ptr<LayerImpl> layer_impl_tree_root = 456 scoped_ptr<LayerImpl> layer_impl_tree_root =
451 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), 457 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
452 scoped_ptr<LayerImpl>(), 458 scoped_ptr<LayerImpl>(),
453 host_impl.active_tree()); 459 host_impl.active_tree());
454 TreeSynchronizer::PushProperties(layer_tree_root.get(), 460 TreeSynchronizer::PushProperties(layer_tree_root.get(),
455 layer_impl_tree_root.get()); 461 layer_impl_tree_root.get());
456 462
457 ScrollbarLayerImpl* pinch_zoom_horizontal = 463 ScrollbarLayerImpl* pinch_zoom_horizontal =
458 static_cast<ScrollbarLayerImpl*>(layer_impl_tree_root->children()[1]); 464 static_cast<ScrollbarLayerImpl*>(layer_impl_tree_root->children()[1]);
(...skipping 17 matching lines...) Expand all
476 EXPECT_EQ(10.f, pinch_zoom_horizontal->CurrentPos()); 482 EXPECT_EQ(10.f, pinch_zoom_horizontal->CurrentPos());
477 EXPECT_EQ(100, pinch_zoom_horizontal->TotalSize()); 483 EXPECT_EQ(100, pinch_zoom_horizontal->TotalSize());
478 EXPECT_EQ(30, pinch_zoom_horizontal->Maximum()); 484 EXPECT_EQ(30, pinch_zoom_horizontal->Maximum());
479 EXPECT_EQ(20.f, pinch_zoom_vertical->CurrentPos()); 485 EXPECT_EQ(20.f, pinch_zoom_vertical->CurrentPos());
480 EXPECT_EQ(200, pinch_zoom_vertical->TotalSize()); 486 EXPECT_EQ(200, pinch_zoom_vertical->TotalSize());
481 EXPECT_EQ(50, pinch_zoom_vertical->Maximum()); 487 EXPECT_EQ(50, pinch_zoom_vertical->Maximum());
482 } 488 }
483 489
484 } // namespace 490 } // namespace
485 } // namespace cc 491 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer.cc ('k') | cc/layers/tiled_layer.cc » ('j') | cc/trees/layer_tree_host_common.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698