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

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

Issue 1639363002: Move have_wheel_event_handlers to WebLayerTreeView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests Created 4 years, 10 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/layer.h" 5 #include "cc/layers/layer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "cc/animation/animation_host.h" 10 #include "cc/animation/animation_host.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 EXPECT_EQ(src->clip_tree_index_, dest->clip_tree_index_); 127 EXPECT_EQ(src->clip_tree_index_, dest->clip_tree_index_);
128 EXPECT_EQ(src->offset_to_transform_parent_, 128 EXPECT_EQ(src->offset_to_transform_parent_,
129 dest->offset_to_transform_parent_); 129 dest->offset_to_transform_parent_);
130 EXPECT_EQ(src->double_sided_, dest->double_sided_); 130 EXPECT_EQ(src->double_sided_, dest->double_sided_);
131 EXPECT_EQ(src->draws_content_, dest->draws_content_); 131 EXPECT_EQ(src->draws_content_, dest->draws_content_);
132 EXPECT_EQ(src->hide_layer_and_subtree_, dest->hide_layer_and_subtree_); 132 EXPECT_EQ(src->hide_layer_and_subtree_, dest->hide_layer_and_subtree_);
133 EXPECT_EQ(src->has_render_surface_, dest->has_render_surface_); 133 EXPECT_EQ(src->has_render_surface_, dest->has_render_surface_);
134 EXPECT_EQ(src->masks_to_bounds_, dest->masks_to_bounds_); 134 EXPECT_EQ(src->masks_to_bounds_, dest->masks_to_bounds_);
135 EXPECT_EQ(src->main_thread_scrolling_reasons_, 135 EXPECT_EQ(src->main_thread_scrolling_reasons_,
136 dest->main_thread_scrolling_reasons_); 136 dest->main_thread_scrolling_reasons_);
137 EXPECT_EQ(src->have_wheel_event_handlers_,
138 dest->have_wheel_event_handlers_);
139 EXPECT_EQ(src->have_scroll_event_handlers_, 137 EXPECT_EQ(src->have_scroll_event_handlers_,
140 dest->have_scroll_event_handlers_); 138 dest->have_scroll_event_handlers_);
141 EXPECT_EQ(src->non_fast_scrollable_region_, 139 EXPECT_EQ(src->non_fast_scrollable_region_,
142 dest->non_fast_scrollable_region_); 140 dest->non_fast_scrollable_region_);
143 EXPECT_EQ(src->touch_event_handler_region_, 141 EXPECT_EQ(src->touch_event_handler_region_,
144 dest->touch_event_handler_region_); 142 dest->touch_event_handler_region_);
145 EXPECT_EQ(src->scroll_blocks_on_, dest->scroll_blocks_on_); 143 EXPECT_EQ(src->scroll_blocks_on_, dest->scroll_blocks_on_);
146 EXPECT_EQ(src->contents_opaque_, dest->contents_opaque_); 144 EXPECT_EQ(src->contents_opaque_, dest->contents_opaque_);
147 EXPECT_EQ(src->opacity_, dest->opacity_); 145 EXPECT_EQ(src->opacity_, dest->opacity_);
148 EXPECT_EQ(src->blend_mode_, dest->blend_mode_); 146 EXPECT_EQ(src->blend_mode_, dest->blend_mode_);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 layer->effect_tree_index_ = -1; 243 layer->effect_tree_index_ = -1;
246 layer->clip_tree_index_ = 71; 244 layer->clip_tree_index_ = 71;
247 layer->offset_to_transform_parent_ = gfx::Vector2dF(3.14f, 1.618f); 245 layer->offset_to_transform_parent_ = gfx::Vector2dF(3.14f, 1.618f);
248 layer->double_sided_ = true; 246 layer->double_sided_ = true;
249 layer->draws_content_ = true; 247 layer->draws_content_ = true;
250 layer->hide_layer_and_subtree_ = false; 248 layer->hide_layer_and_subtree_ = false;
251 layer->has_render_surface_ = false; 249 layer->has_render_surface_ = false;
252 layer->masks_to_bounds_ = true; 250 layer->masks_to_bounds_ = true;
253 layer->main_thread_scrolling_reasons_ = 251 layer->main_thread_scrolling_reasons_ =
254 MainThreadScrollingReason::kNotScrollingOnMain; 252 MainThreadScrollingReason::kNotScrollingOnMain;
255 layer->have_wheel_event_handlers_ = true;
256 layer->have_scroll_event_handlers_ = false; 253 layer->have_scroll_event_handlers_ = false;
257 layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3)); 254 layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
258 layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5)); 255 layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
259 layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_NONE; 256 layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_NONE;
260 layer->contents_opaque_ = true; 257 layer->contents_opaque_ = true;
261 layer->opacity_ = 1.f; 258 layer->opacity_ = 1.f;
262 layer->blend_mode_ = SkXfermode::kSrcOver_Mode; 259 layer->blend_mode_ = SkXfermode::kSrcOver_Mode;
263 layer->is_root_for_isolated_group_ = true; 260 layer->is_root_for_isolated_group_ = true;
264 layer->position_ = gfx::PointF(3.14f, 6.28f); 261 layer->position_ = gfx::PointF(3.14f, 6.28f);
265 layer->is_container_for_fixed_position_layers_ = true; 262 layer->is_container_for_fixed_position_layers_ = true;
(...skipping 30 matching lines...) Expand all
296 layer->effect_tree_index_ = 17; 293 layer->effect_tree_index_ = 17;
297 layer->clip_tree_index_ = 71; 294 layer->clip_tree_index_ = 71;
298 layer->offset_to_transform_parent_ = gfx::Vector2dF(3.14f, 1.618f); 295 layer->offset_to_transform_parent_ = gfx::Vector2dF(3.14f, 1.618f);
299 layer->double_sided_ = !layer->double_sided_; 296 layer->double_sided_ = !layer->double_sided_;
300 layer->draws_content_ = !layer->draws_content_; 297 layer->draws_content_ = !layer->draws_content_;
301 layer->hide_layer_and_subtree_ = !layer->hide_layer_and_subtree_; 298 layer->hide_layer_and_subtree_ = !layer->hide_layer_and_subtree_;
302 layer->has_render_surface_ = !layer->has_render_surface_; 299 layer->has_render_surface_ = !layer->has_render_surface_;
303 layer->masks_to_bounds_ = !layer->masks_to_bounds_; 300 layer->masks_to_bounds_ = !layer->masks_to_bounds_;
304 layer->main_thread_scrolling_reasons_ = 301 layer->main_thread_scrolling_reasons_ =
305 MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects; 302 MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects;
306 layer->have_wheel_event_handlers_ = !layer->have_wheel_event_handlers_;
307 layer->have_scroll_event_handlers_ = !layer->have_scroll_event_handlers_; 303 layer->have_scroll_event_handlers_ = !layer->have_scroll_event_handlers_;
308 layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3)); 304 layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
309 layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5)); 305 layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
310 layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_WHEEL_EVENT; 306 layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_WHEEL_EVENT;
311 layer->contents_opaque_ = !layer->contents_opaque_; 307 layer->contents_opaque_ = !layer->contents_opaque_;
312 layer->opacity_ = 3.14f; 308 layer->opacity_ = 3.14f;
313 layer->blend_mode_ = SkXfermode::kSrcIn_Mode; 309 layer->blend_mode_ = SkXfermode::kSrcIn_Mode;
314 layer->is_root_for_isolated_group_ = !layer->is_root_for_isolated_group_; 310 layer->is_root_for_isolated_group_ = !layer->is_root_for_isolated_group_;
315 layer->position_ = gfx::PointF(3.14f, 6.28f); 311 layer->position_ = gfx::PointF(3.14f, 6.28f);
316 layer->is_container_for_fixed_position_layers_ = 312 layer->is_container_for_fixed_position_layers_ =
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 // We can use any layer pointer here since we aren't syncing for real. 962 // We can use any layer pointer here since we aren't syncing for real.
967 EXPECT_SET_NEEDS_COMMIT(1, 963 EXPECT_SET_NEEDS_COMMIT(1,
968 test_layer->SetScrollClipLayerId(test_layer->id())); 964 test_layer->SetScrollClipLayerId(test_layer->id()));
969 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false)); 965 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false));
970 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset( 966 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset(
971 gfx::ScrollOffset(10, 10))); 967 gfx::ScrollOffset(10, 10)));
972 EXPECT_SET_NEEDS_COMMIT(1, test_layer->AddMainThreadScrollingReasons( 968 EXPECT_SET_NEEDS_COMMIT(1, test_layer->AddMainThreadScrollingReasons(
973 MainThreadScrollingReason::kEventHandlers)); 969 MainThreadScrollingReason::kEventHandlers));
974 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetNonFastScrollableRegion( 970 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetNonFastScrollableRegion(
975 Region(gfx::Rect(1, 1, 2, 2)))); 971 Region(gfx::Rect(1, 1, 2, 2))));
976 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveWheelEventHandlers(true));
977 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveScrollEventHandlers(true)); 972 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveScrollEventHandlers(true));
978 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTransform( 973 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTransform(
979 gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0))); 974 gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));
980 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDoubleSided(false)); 975 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDoubleSided(false));
981 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTouchEventHandlerRegion( 976 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTouchEventHandlerRegion(
982 gfx::Rect(10, 10))); 977 gfx::Rect(10, 10)));
983 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetForceRenderSurface(true)); 978 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetForceRenderSurface(true));
984 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHideLayerAndSubtree(true)); 979 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHideLayerAndSubtree(true));
985 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetElementId(2)); 980 EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetElementId(2));
986 EXPECT_SET_NEEDS_COMMIT( 981 EXPECT_SET_NEEDS_COMMIT(
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
2131 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); 2126 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties());
2132 2127
2133 test_layer->PushPropertiesTo(impl_layer.get()); 2128 test_layer->PushPropertiesTo(impl_layer.get());
2134 2129
2135 EXPECT_EQ(2lu, impl_layer->element_id()); 2130 EXPECT_EQ(2lu, impl_layer->element_id());
2136 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); 2131 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties());
2137 } 2132 }
2138 2133
2139 } // namespace 2134 } // namespace
2140 } // namespace cc 2135 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698