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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: Merge branch 'master' into secondaryid Created 3 years, 7 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 std::unique_ptr<CompositorAnimationTimeline> compositor_timeline = 121 std::unique_ptr<CompositorAnimationTimeline> compositor_timeline =
122 CompositorAnimationTimeline::Create(); 122 CompositorAnimationTimeline::Create();
123 AnimationPlayerForTesting player; 123 AnimationPlayerForTesting player;
124 124
125 CompositorAnimationHost host(LayerTreeView()->CompositorAnimationHost()); 125 CompositorAnimationHost host(LayerTreeView()->CompositorAnimationHost());
126 126
127 host.AddTimeline(*compositor_timeline); 127 host.AddTimeline(*compositor_timeline);
128 compositor_timeline->PlayerAttached(player); 128 compositor_timeline->PlayerAttached(player);
129 129
130 platform_layer_->SetElementId(CompositorElementId(platform_layer_->Id(), 0)); 130 platform_layer_->SetElementId(CompositorElementId(platform_layer_->Id()));
131 131
132 player.CompositorPlayer()->AttachElement(platform_layer_->GetElementId()); 132 player.CompositorPlayer()->AttachElement(platform_layer_->GetElementId());
133 ASSERT_TRUE(player.CompositorPlayer()->IsElementAttached()); 133 ASSERT_TRUE(player.CompositorPlayer()->IsElementAttached());
134 134
135 player.CompositorPlayer()->AddAnimation(std::move(float_animation)); 135 player.CompositorPlayer()->AddAnimation(std::move(float_animation));
136 136
137 ASSERT_TRUE(platform_layer_->HasTickingAnimationForTesting()); 137 ASSERT_TRUE(platform_layer_->HasTickingAnimationForTesting());
138 138
139 graphics_layer_->SetShouldFlattenTransform(false); 139 graphics_layer_->SetShouldFlattenTransform(false);
140 140
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 return Platform::Current()->CurrentThread()->Scheduler()->TimerTaskRunner(); 196 return Platform::Current()->CurrentThread()->Scheduler()->TimerTaskRunner();
197 } 197 }
198 198
199 DEFINE_INLINE_VIRTUAL_TRACE() { ScrollableArea::Trace(visitor); } 199 DEFINE_INLINE_VIRTUAL_TRACE() { ScrollableArea::Trace(visitor); }
200 200
201 private: 201 private:
202 ScrollOffset scroll_offset_; 202 ScrollOffset scroll_offset_;
203 }; 203 };
204 204
205 } // namespace blink 205 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698