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

Side by Side Diff: content/renderer/gpu/render_widget_compositor.h

Issue 16679011: Add viewport scrollbar class to support overlay scrollbars for pinch zoom virtual viewport. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add scrollbars layers in compositor, plumb layer ids to LayerTreeImpl. Created 7 years, 6 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ 5 #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ 6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "cc/debug/rendering_stats.h" 10 #include "cc/debug/rendering_stats.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 float new_page_scale, 77 float new_page_scale,
78 double duration_sec); 78 double duration_sec);
79 virtual void setNeedsAnimate(); 79 virtual void setNeedsAnimate();
80 virtual void setNeedsRedraw(); 80 virtual void setNeedsRedraw();
81 virtual bool commitRequested() const; 81 virtual bool commitRequested() const;
82 virtual void didStopFlinging(); 82 virtual void didStopFlinging();
83 virtual bool compositeAndReadback(void *pixels, const WebKit::WebRect& rect); 83 virtual bool compositeAndReadback(void *pixels, const WebKit::WebRect& rect);
84 virtual void finishAllRendering(); 84 virtual void finishAllRendering();
85 virtual void setDeferCommits(bool defer_commits); 85 virtual void setDeferCommits(bool defer_commits);
86 virtual void registerForAnimations(WebKit::WebLayer* layer); 86 virtual void registerForAnimations(WebKit::WebLayer* layer);
87 virtual void registerPinchViewportLayers(
88 const WebKit::WebLayer* innerViewportClipLayer,
89 const WebKit::WebLayer* pageScaleLayerLayer,
trchen 2013/06/20 01:16:08 nits: LayerLayer?
wjmaclean 2013/06/21 18:20:53 Done.
90 const WebKit::WebLayer* innerViewportScrollLayer,
91 const WebKit::WebLayer* outerViewportScrollLayer,
92 const WebKit::WebLayer* innerViewportHorizontalScrollbarLayer,
93 const WebKit::WebLayer* innerViewportVerticalScrollbarLayer) OVERRIDE;
trchen 2013/06/20 01:16:08 I feel CC is making too much assumption about the
wjmaclean 2013/06/21 18:20:53 This is a special case for scrollbars that (1) Bli
trchen 2013/06/24 21:38:04 Thanks for the explaination!
94 virtual void clearPinchViewportLayers() OVERRIDE;
87 virtual void renderingStats(WebKit::WebRenderingStats& stats) const {} 95 virtual void renderingStats(WebKit::WebRenderingStats& stats) const {}
88 virtual void setShowFPSCounter(bool show); 96 virtual void setShowFPSCounter(bool show);
89 virtual void setShowPaintRects(bool show); 97 virtual void setShowPaintRects(bool show);
90 virtual void setShowDebugBorders(bool show); 98 virtual void setShowDebugBorders(bool show);
91 virtual void setContinuousPaintingEnabled(bool enabled); 99 virtual void setContinuousPaintingEnabled(bool enabled);
92 100
93 // cc::LayerTreeHostClient implementation. 101 // cc::LayerTreeHostClient implementation.
94 virtual void WillBeginFrame() OVERRIDE; 102 virtual void WillBeginFrame() OVERRIDE;
95 virtual void DidBeginFrame() OVERRIDE; 103 virtual void DidBeginFrame() OVERRIDE;
96 virtual void Animate(double frame_begin_time) OVERRIDE; 104 virtual void Animate(double frame_begin_time) OVERRIDE;
(...skipping 19 matching lines...) Expand all
116 124
117 bool threaded_; 125 bool threaded_;
118 bool suppress_schedule_composite_; 126 bool suppress_schedule_composite_;
119 RenderWidget* widget_; 127 RenderWidget* widget_;
120 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; 128 scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
121 }; 129 };
122 130
123 } // namespace content 131 } // namespace content
124 132
125 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ 133 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698