| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 virtual void setHasTransparentBackground(bool transparent); | 84 virtual void setHasTransparentBackground(bool transparent); |
| 85 virtual void setOverhangBitmap(const SkBitmap& bitmap); | 85 virtual void setOverhangBitmap(const SkBitmap& bitmap); |
| 86 virtual void setVisible(bool visible); | 86 virtual void setVisible(bool visible); |
| 87 virtual void setPageScaleFactorAndLimits(float page_scale_factor, | 87 virtual void setPageScaleFactorAndLimits(float page_scale_factor, |
| 88 float minimum, | 88 float minimum, |
| 89 float maximum); | 89 float maximum); |
| 90 virtual void startPageScaleAnimation(const blink::WebPoint& destination, | 90 virtual void startPageScaleAnimation(const blink::WebPoint& destination, |
| 91 bool use_anchor, | 91 bool use_anchor, |
| 92 float new_page_scale, | 92 float new_page_scale, |
| 93 double duration_sec); | 93 double duration_sec); |
| 94 virtual void setNeedsAnimate(); | 94 virtual void setNeedsAnimate() { setNeedsUpdateLayers(); } // Renamed. Staged
for removal. |
| 95 virtual void setNeedsUpdateLayers(); |
| 95 virtual void setNeedsRedraw(); | 96 virtual void setNeedsRedraw(); |
| 96 virtual bool commitRequested() const; | 97 virtual bool commitRequested() const { NOTREACHED(); return false; } // Unused
. Staged for removal. |
| 97 virtual void didStopFlinging(); | 98 virtual void didStopFlinging(); |
| 98 virtual bool compositeAndReadback(void *pixels, const blink::WebRect& rect); | 99 virtual bool compositeAndReadback(void *pixels, const blink::WebRect& rect); |
| 99 virtual void finishAllRendering(); | 100 virtual void finishAllRendering(); |
| 100 virtual void setDeferCommits(bool defer_commits); | 101 virtual void setDeferCommits(bool defer_commits); |
| 101 virtual void registerForAnimations(blink::WebLayer* layer); | 102 virtual void registerForAnimations(blink::WebLayer* layer); |
| 102 virtual void registerViewportLayers( | 103 virtual void registerViewportLayers( |
| 103 const blink::WebLayer* pageScaleLayer, | 104 const blink::WebLayer* pageScaleLayer, |
| 104 const blink::WebLayer* innerViewportScrollLayer, | 105 const blink::WebLayer* innerViewportScrollLayer, |
| 105 const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; | 106 const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; |
| 106 virtual void clearViewportLayers() OVERRIDE; | 107 virtual void clearViewportLayers() OVERRIDE; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 142 |
| 142 bool threaded_; | 143 bool threaded_; |
| 143 bool suppress_schedule_composite_; | 144 bool suppress_schedule_composite_; |
| 144 RenderWidget* widget_; | 145 RenderWidget* widget_; |
| 145 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; | 146 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; |
| 146 }; | 147 }; |
| 147 | 148 |
| 148 } // namespace content | 149 } // namespace content |
| 149 | 150 |
| 150 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 151 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
| OLD | NEW |