Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/cancelable_callback.h" | 9 #include "base/cancelable_callback.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 virtual void Layout() override; | 69 virtual void Layout() override; |
| 70 virtual void ApplyViewportDeltas( | 70 virtual void ApplyViewportDeltas( |
| 71 const gfx::Vector2d& inner_delta, | 71 const gfx::Vector2d& inner_delta, |
| 72 const gfx::Vector2d& outer_delta, | 72 const gfx::Vector2d& outer_delta, |
| 73 float page_scale, | 73 float page_scale, |
| 74 float top_controls_delta) override {} | 74 float top_controls_delta) override {} |
| 75 virtual void ApplyViewportDeltas( | 75 virtual void ApplyViewportDeltas( |
| 76 const gfx::Vector2d& scroll_delta, | 76 const gfx::Vector2d& scroll_delta, |
| 77 float page_scale, | 77 float page_scale, |
| 78 float top_controls_delta) override {} | 78 float top_controls_delta) override {} |
| 79 virtual void RequestNewOutputSurface(bool fallback) override; | 79 virtual void RequestNewOutputSurface() override; |
| 80 virtual void DidInitializeOutputSurface() override {} | 80 virtual void DidInitializeOutputSurface() override {} |
| 81 virtual void DidFailToInitializeOutputSurface() override; | |
| 81 virtual void WillCommit() override {} | 82 virtual void WillCommit() override {} |
| 82 virtual void DidCommit() override; | 83 virtual void DidCommit() override; |
| 83 virtual void DidCommitAndDrawFrame() override {} | 84 virtual void DidCommitAndDrawFrame() override {} |
| 84 virtual void DidCompleteSwapBuffers() override; | 85 virtual void DidCompleteSwapBuffers() override; |
| 85 | 86 |
| 86 // LayerTreeHostSingleThreadClient implementation. | 87 // LayerTreeHostSingleThreadClient implementation. |
| 87 virtual void ScheduleComposite() override; | 88 virtual void ScheduleComposite() override; |
| 88 virtual void ScheduleAnimation() override; | 89 virtual void ScheduleAnimation() override; |
| 89 virtual void DidPostSwapBuffers() override; | 90 virtual void DidPostSwapBuffers() override; |
| 90 virtual void DidAbortSwapBuffers() override; | 91 virtual void DidAbortSwapBuffers() override; |
| 91 | 92 |
| 92 // WindowAndroidCompositor implementation. | 93 // WindowAndroidCompositor implementation. |
| 93 virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override; | 94 virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override; |
| 94 virtual void RequestCopyOfOutputOnRootLayer( | 95 virtual void RequestCopyOfOutputOnRootLayer( |
| 95 scoped_ptr<cc::CopyOutputRequest> request) override; | 96 scoped_ptr<cc::CopyOutputRequest> request) override; |
| 96 virtual void OnVSync(base::TimeTicks frame_time, | 97 virtual void OnVSync(base::TimeTicks frame_time, |
| 97 base::TimeDelta vsync_period) override; | 98 base::TimeDelta vsync_period) override; |
| 98 virtual void SetNeedsAnimate() override; | 99 virtual void SetNeedsAnimate() override; |
| 99 virtual ui::SystemUIResourceManager& GetSystemUIResourceManager() override; | 100 virtual ui::SystemUIResourceManager& GetSystemUIResourceManager() override; |
| 100 | 101 |
| 101 void SetWindowSurface(ANativeWindow* window); | 102 void SetWindowSurface(ANativeWindow* window); |
| 102 | 103 |
| 103 enum CompositingTrigger { | 104 enum CompositingTrigger { |
| 104 DO_NOT_COMPOSITE, | 105 DO_NOT_COMPOSITE, |
| 105 COMPOSITE_IMMEDIATELY, | 106 COMPOSITE_IMMEDIATELY, |
| 106 COMPOSITE_EVENTUALLY, | 107 COMPOSITE_EVENTUALLY, |
| 107 }; | 108 }; |
| 108 void PostComposite(CompositingTrigger trigger); | 109 void PostComposite(CompositingTrigger trigger); |
| 109 void Composite(CompositingTrigger trigger); | 110 void Composite(CompositingTrigger trigger); |
| 110 void CreateOutputSurface(bool fallback); | 111 void CreateOutputSurface(bool fallback); |
|
no sievers
2014/12/02 20:38:07
remove argument here
enne (OOO)
2014/12/02 21:09:33
Done.
| |
| 111 | 112 |
| 112 bool WillCompositeThisFrame() const { | 113 bool WillCompositeThisFrame() const { |
| 113 return current_composite_task_ && | 114 return current_composite_task_ && |
| 114 !current_composite_task_->callback().is_null(); | 115 !current_composite_task_->callback().is_null(); |
| 115 } | 116 } |
| 116 bool DidCompositeThisFrame() const { | 117 bool DidCompositeThisFrame() const { |
| 117 return current_composite_task_ && | 118 return current_composite_task_ && |
| 118 current_composite_task_->callback().is_null(); | 119 current_composite_task_->callback().is_null(); |
| 119 } | 120 } |
| 120 bool WillComposite() const { | 121 bool WillComposite() const { |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 190 base::TimeTicks last_vsync_; | 191 base::TimeTicks last_vsync_; |
| 191 | 192 |
| 192 base::WeakPtrFactory<CompositorImpl> weak_factory_; | 193 base::WeakPtrFactory<CompositorImpl> weak_factory_; |
| 193 | 194 |
| 194 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); | 195 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); |
| 195 }; | 196 }; |
| 196 | 197 |
| 197 } // namespace content | 198 } // namespace content |
| 198 | 199 |
| 199 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ | 200 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ |
| OLD | NEW |