| OLD | NEW |
| 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/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 virtual void setHasTransparentBackground(bool transparent); | 91 virtual void setHasTransparentBackground(bool transparent); |
| 92 virtual void setOverhangBitmap(const SkBitmap& bitmap); | 92 virtual void setOverhangBitmap(const SkBitmap& bitmap); |
| 93 virtual void setVisible(bool visible); | 93 virtual void setVisible(bool visible); |
| 94 virtual void setPageScaleFactorAndLimits(float page_scale_factor, | 94 virtual void setPageScaleFactorAndLimits(float page_scale_factor, |
| 95 float minimum, | 95 float minimum, |
| 96 float maximum); | 96 float maximum); |
| 97 virtual void startPageScaleAnimation(const blink::WebPoint& destination, | 97 virtual void startPageScaleAnimation(const blink::WebPoint& destination, |
| 98 bool use_anchor, | 98 bool use_anchor, |
| 99 float new_page_scale, | 99 float new_page_scale, |
| 100 double duration_sec); | 100 double duration_sec); |
| 101 virtual void setNeedsAnimate(); | 101 virtual void setNeedsAnimate(); // Renamed. Staged for removal. |
| 102 virtual bool commitRequested() const; | 102 virtual void setNeedsUpdateLayers(); |
| 103 virtual bool commitRequested() const; // Unused. Staged for removal. |
| 103 virtual void didStopFlinging(); | 104 virtual void didStopFlinging(); |
| 104 virtual bool compositeAndReadback(void *pixels, const blink::WebRect& rect); | 105 virtual bool compositeAndReadback(void *pixels, const blink::WebRect& rect); |
| 105 virtual void finishAllRendering(); | 106 virtual void finishAllRendering(); |
| 106 virtual void setDeferCommits(bool defer_commits); | 107 virtual void setDeferCommits(bool defer_commits); |
| 107 virtual void registerForAnimations(blink::WebLayer* layer); | 108 virtual void registerForAnimations(blink::WebLayer* layer); |
| 108 virtual void registerViewportLayers( | 109 virtual void registerViewportLayers( |
| 109 const blink::WebLayer* pageScaleLayer, | 110 const blink::WebLayer* pageScaleLayer, |
| 110 const blink::WebLayer* innerViewportScrollLayer, | 111 const blink::WebLayer* innerViewportScrollLayer, |
| 111 const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; | 112 const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; |
| 112 virtual void clearViewportLayers() OVERRIDE; | 113 virtual void clearViewportLayers() OVERRIDE; |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 | 149 |
| 149 bool threaded_; | 150 bool threaded_; |
| 150 bool suppress_schedule_composite_; | 151 bool suppress_schedule_composite_; |
| 151 RenderWidget* widget_; | 152 RenderWidget* widget_; |
| 152 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; | 153 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; |
| 153 }; | 154 }; |
| 154 | 155 |
| 155 } // namespace content | 156 } // namespace content |
| 156 | 157 |
| 157 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 158 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
| OLD | NEW |