Chromium Code Reviews| Index: content/renderer/gpu/compositor_output_surface.h |
| diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h |
| index cb4bdba9b4bcbd45808f9ab010ca5dfe610534ac..369b874a36d0cfb2368a90e9376f1e11b908ec16 100644 |
| --- a/content/renderer/gpu/compositor_output_surface.h |
| +++ b/content/renderer/gpu/compositor_output_surface.h |
| @@ -54,9 +54,11 @@ class CompositorOutputSurface |
| bool BindToClient(cc::OutputSurfaceClient* client) override; |
| void SwapBuffers(cc::CompositorFrame* frame) override; |
| +#if defined(OS_ANDROID) |
| // TODO(epenner): This seems out of place here and would be a better fit |
| // int CompositorThread after it is fully refactored (http://crbug/170828) |
| void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; |
| +#endif |
| protected: |
| void ShortcutSwapAck(uint32 output_surface_id, |
| @@ -102,8 +104,10 @@ class CompositorOutputSurface |
| scoped_refptr<IPC::SyncMessageFilter> message_sender_; |
| scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_; |
| int routing_id_; |
| +#if defined(OS_ANDROID) |
| bool prefers_smoothness_; |
| - base::PlatformThreadHandle main_thread_handle_; |
| + scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner_; |
|
gab
2015/06/23 17:01:32
Please keep logic changes to another CL here as we
Ken Russell (switch to Gerrit)
2015/06/23 21:08:40
I agree with gab's assessment.
Takashi Toyoshima
2015/06/24 04:15:39
Done.
|
| +#endif |
| // TODO(danakj): Remove this when crbug.com/311404 |
| bool layout_test_mode_; |