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

Side by Side Diff: cc/layer_impl.h

Issue 11550035: Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revised architecture - complete cl for comments on approach. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « cc/cc.gyp ('k') | cc/layer_impl.cc » ('j') | cc/layer_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_LAYER_IMPL_H_ 5 #ifndef CC_LAYER_IMPL_H_
6 #define CC_LAYER_IMPL_H_ 6 #define CC_LAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 ScrollbarAnimationController* scrollbarAnimationController() const { return m_scrollbarAnimationController.get(); } 291 ScrollbarAnimationController* scrollbarAnimationController() const { return m_scrollbarAnimationController.get(); }
292 292
293 void setScrollbarOpacity(float opacity); 293 void setScrollbarOpacity(float opacity);
294 294
295 void setHorizontalScrollbarLayer(ScrollbarLayerImpl*); 295 void setHorizontalScrollbarLayer(ScrollbarLayerImpl*);
296 ScrollbarLayerImpl* horizontalScrollbarLayer() { return m_horizontalScrollba rLayer; } 296 ScrollbarLayerImpl* horizontalScrollbarLayer() { return m_horizontalScrollba rLayer; }
297 297
298 void setVerticalScrollbarLayer(ScrollbarLayerImpl*); 298 void setVerticalScrollbarLayer(ScrollbarLayerImpl*);
299 ScrollbarLayerImpl* verticalScrollbarLayer() { return m_verticalScrollbarLay er; } 299 ScrollbarLayerImpl* verticalScrollbarLayer() { return m_verticalScrollbarLay er; }
300 300
301 void setHorizontalPinchZoomScrollbarLayer(ScrollbarLayerImpl*);
302 void setVerticalPinchZoomScrollbarLayer(ScrollbarLayerImpl*);
303
301 gfx::Rect layerRectToContentRect(const gfx::RectF& layerRect) const; 304 gfx::Rect layerRectToContentRect(const gfx::RectF& layerRect) const;
302 305
303 virtual skia::RefPtr<SkPicture> getPicture(); 306 virtual skia::RefPtr<SkPicture> getPicture();
304 307
305 virtual bool canClipSelf() const; 308 virtual bool canClipSelf() const;
306 309
307 virtual bool areVisibleResourcesReady() const; 310 virtual bool areVisibleResourcesReady() const;
308 311
309 virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl*); 312 virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl*);
310 virtual void pushPropertiesTo(LayerImpl*); 313 virtual void pushPropertiesTo(LayerImpl*);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 scoped_refptr<LayerAnimationController> m_layerAnimationController; 421 scoped_refptr<LayerAnimationController> m_layerAnimationController;
419 422
420 // Manages scrollbars for this layer 423 // Manages scrollbars for this layer
421 scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController; 424 scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController;
422 425
423 // Weak pointers to this layer's scrollbars, if it has them. Updated during 426 // Weak pointers to this layer's scrollbars, if it has them. Updated during
424 // tree synchronization. 427 // tree synchronization.
425 ScrollbarLayerImpl* m_horizontalScrollbarLayer; 428 ScrollbarLayerImpl* m_horizontalScrollbarLayer;
426 ScrollbarLayerImpl* m_verticalScrollbarLayer; 429 ScrollbarLayerImpl* m_verticalScrollbarLayer;
427 430
431 // Weak pointers to this layer's pinch-zoom scrollbars, if it has them.
432 // Either both or neither will be present. Updated during tree
433 // synchronization.
434 ScrollbarLayerImpl* m_horizontalPinchZoomScrollbarLayer;
435 ScrollbarLayerImpl* m_verticalPinchZoomScrollbarLayer;
436
428 // Group of properties that need to be computed based on the layer tree 437 // Group of properties that need to be computed based on the layer tree
429 // hierarchy before layers can be drawn. 438 // hierarchy before layers can be drawn.
430 DrawProperties<LayerImpl, RenderSurfaceImpl> m_drawProperties; 439 DrawProperties<LayerImpl, RenderSurfaceImpl> m_drawProperties;
431 440
432 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 441 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
433 }; 442 };
434 443
435 } 444 }
436 445
437 #endif // CC_LAYER_IMPL_H_ 446 #endif // CC_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/cc.gyp ('k') | cc/layer_impl.cc » ('j') | cc/layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698