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

Side by Side Diff: content/browser/android/in_process/synchronous_compositor_output_surface.h

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Error in android Created 6 years, 2 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE _H_ 5 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE _H_
6 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE _H_ 6 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE _H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // to a fixed thread when BindToClient is called. 58 // to a fixed thread when BindToClient is called.
59 class SynchronousCompositorOutputSurface 59 class SynchronousCompositorOutputSurface
60 : NON_EXPORTED_BASE(public cc::OutputSurface) { 60 : NON_EXPORTED_BASE(public cc::OutputSurface) {
61 public: 61 public:
62 explicit SynchronousCompositorOutputSurface( 62 explicit SynchronousCompositorOutputSurface(
63 int routing_id, 63 int routing_id,
64 scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue); 64 scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue);
65 virtual ~SynchronousCompositorOutputSurface(); 65 virtual ~SynchronousCompositorOutputSurface();
66 66
67 // OutputSurface. 67 // OutputSurface.
68 virtual bool BindToClient(cc::OutputSurfaceClient* surface_client) OVERRIDE; 68 virtual bool BindToClient(cc::OutputSurfaceClient* surface_client) override;
69 virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE; 69 virtual void Reshape(const gfx::Size& size, float scale_factor) override;
70 virtual void SetNeedsBeginFrame(bool enable) OVERRIDE; 70 virtual void SetNeedsBeginFrame(bool enable) override;
71 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; 71 virtual void SwapBuffers(cc::CompositorFrame* frame) override;
72 72
73 // Partial SynchronousCompositor API implementation. 73 // Partial SynchronousCompositor API implementation.
74 bool InitializeHwDraw( 74 bool InitializeHwDraw(
75 scoped_refptr<cc::ContextProvider> onscreen_context_provider); 75 scoped_refptr<cc::ContextProvider> onscreen_context_provider);
76 void ReleaseHwDraw(); 76 void ReleaseHwDraw();
77 scoped_ptr<cc::CompositorFrame> DemandDrawHw( 77 scoped_ptr<cc::CompositorFrame> DemandDrawHw(
78 gfx::Size surface_size, 78 gfx::Size surface_size,
79 const gfx::Transform& transform, 79 const gfx::Transform& transform,
80 gfx::Rect viewport, 80 gfx::Rect viewport,
81 gfx::Rect clip, 81 gfx::Rect clip,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 scoped_ptr<cc::CompositorFrame> frame_holder_; 118 scoped_ptr<cc::CompositorFrame> frame_holder_;
119 119
120 scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_; 120 scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface); 122 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
123 }; 123 };
124 124
125 } // namespace content 125 } // namespace content
126 126
127 #endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURF ACE_H_ 127 #endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURF ACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698