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

Side by Side Diff: cc/trees/layer_tree_host.h

Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add fix for empty scroll-layer bounds. Created 6 years, 11 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
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 #ifndef CC_TREES_LAYER_TREE_HOST_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_H_
6 #define CC_TREES_LAYER_TREE_HOST_H_ 6 #define CC_TREES_LAYER_TREE_HOST_H_
7 7
8 #include <limits> 8 #include <limits>
9 #include <list> 9 #include <list>
10 #include <set> 10 #include <set>
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 base::Time wall_clock_time); 185 base::Time wall_clock_time);
186 186
187 void SetRootLayer(scoped_refptr<Layer> root_layer); 187 void SetRootLayer(scoped_refptr<Layer> root_layer);
188 Layer* root_layer() { return root_layer_.get(); } 188 Layer* root_layer() { return root_layer_.get(); }
189 const Layer* root_layer() const { return root_layer_.get(); } 189 const Layer* root_layer() const { return root_layer_.get(); }
190 const Layer* page_scale_layer() const { return page_scale_layer_.get(); } 190 const Layer* page_scale_layer() const { return page_scale_layer_.get(); }
191 void RegisterViewportLayers( 191 void RegisterViewportLayers(
192 scoped_refptr<Layer> page_scale_layer, 192 scoped_refptr<Layer> page_scale_layer,
193 scoped_refptr<Layer> inner_viewport_scroll_layer, 193 scoped_refptr<Layer> inner_viewport_scroll_layer,
194 scoped_refptr<Layer> outer_viewport_scroll_layer); 194 scoped_refptr<Layer> outer_viewport_scroll_layer);
195 Layer* inner_viewport_scroll_layer() const {
196 return inner_viewport_scroll_layer_.get();
197 }
198 Layer* outer_viewport_scroll_layer() const {
199 return outer_viewport_scroll_layer_.get();
200 }
195 201
196 const LayerTreeSettings& settings() const { return settings_; } 202 const LayerTreeSettings& settings() const { return settings_; }
197 203
198 void SetDebugState(const LayerTreeDebugState& debug_state); 204 void SetDebugState(const LayerTreeDebugState& debug_state);
199 const LayerTreeDebugState& debug_state() const { return debug_state_; } 205 const LayerTreeDebugState& debug_state() const { return debug_state_; }
200 206
201 void SetViewportSize(gfx::Size device_viewport_size); 207 void SetViewportSize(gfx::Size device_viewport_size);
202 void SetOverdrawBottomHeight(float overdraw_bottom_height); 208 void SetOverdrawBottomHeight(float overdraw_bottom_height);
203 209
204 gfx::Size device_viewport_size() const { return device_viewport_size_; } 210 gfx::Size device_viewport_size() const { return device_viewport_size_; }
(...skipping 20 matching lines...) Expand all
225 231
226 void SetVisible(bool visible); 232 void SetVisible(bool visible);
227 bool visible() const { return visible_; } 233 bool visible() const { return visible_; }
228 234
229 void StartPageScaleAnimation(gfx::Vector2d target_offset, 235 void StartPageScaleAnimation(gfx::Vector2d target_offset,
230 bool use_anchor, 236 bool use_anchor,
231 float scale, 237 float scale,
232 base::TimeDelta duration); 238 base::TimeDelta duration);
233 239
234 void ApplyScrollAndScale(const ScrollAndScaleSet& info); 240 void ApplyScrollAndScale(const ScrollAndScaleSet& info);
241 gfx::Vector2d DistributeScrollOffsetToViewports(const gfx::Vector2d offset,
242 Layer* layer);
235 243
236 void SetImplTransform(const gfx::Transform& transform); 244 void SetImplTransform(const gfx::Transform& transform);
237 245
238 // Virtual for tests. 246 // Virtual for tests.
239 virtual void StartRateLimiter(); 247 virtual void StartRateLimiter();
240 virtual void StopRateLimiter(); 248 virtual void StopRateLimiter();
241 249
242 void RateLimit(); 250 void RateLimit();
243 251
244 bool AlwaysUsePartialTextureUpdates(); 252 bool AlwaysUsePartialTextureUpdates();
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 457
450 ScopedPtrVector<SwapPromise> swap_promise_list_; 458 ScopedPtrVector<SwapPromise> swap_promise_list_;
451 std::set<SwapPromiseMonitor*> swap_promise_monitor_; 459 std::set<SwapPromiseMonitor*> swap_promise_monitor_;
452 460
453 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 461 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
454 }; 462 };
455 463
456 } // namespace cc 464 } // namespace cc
457 465
458 #endif // CC_TREES_LAYER_TREE_HOST_H_ 466 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698