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

Side by Side Diff: content/renderer/gpu/compositor_output_surface.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (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_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ 5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 CompositorOutputSurface( 49 CompositorOutputSurface(
50 int32 routing_id, 50 int32 routing_id,
51 uint32 output_surface_id, 51 uint32 output_surface_id,
52 const scoped_refptr<ContextProviderCommandBuffer>& context_provider, 52 const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
53 scoped_ptr<cc::SoftwareOutputDevice> software, 53 scoped_ptr<cc::SoftwareOutputDevice> software,
54 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, 54 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
55 bool use_swap_compositor_frame_message); 55 bool use_swap_compositor_frame_message);
56 virtual ~CompositorOutputSurface(); 56 virtual ~CompositorOutputSurface();
57 57
58 // cc::OutputSurface implementation. 58 // cc::OutputSurface implementation.
59 virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE; 59 virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
60 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; 60 virtual void SwapBuffers(cc::CompositorFrame* frame) override;
61 #if defined(OS_ANDROID) 61 #if defined(OS_ANDROID)
62 virtual void SetNeedsBeginFrame(bool enable) OVERRIDE; 62 virtual void SetNeedsBeginFrame(bool enable) override;
63 #endif 63 #endif
64 64
65 // TODO(epenner): This seems out of place here and would be a better fit 65 // TODO(epenner): This seems out of place here and would be a better fit
66 // int CompositorThread after it is fully refactored (http://crbug/170828) 66 // int CompositorThread after it is fully refactored (http://crbug/170828)
67 virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) OVERRIDE; 67 virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override;
68 68
69 protected: 69 protected:
70 void ShortcutSwapAck(uint32 output_surface_id, 70 void ShortcutSwapAck(uint32 output_surface_id,
71 scoped_ptr<cc::GLFrameData> gl_frame_data, 71 scoped_ptr<cc::GLFrameData> gl_frame_data,
72 scoped_ptr<cc::SoftwareFrameData> software_frame_data); 72 scoped_ptr<cc::SoftwareFrameData> software_frame_data);
73 virtual void OnSwapAck(uint32 output_surface_id, 73 virtual void OnSwapAck(uint32 output_surface_id,
74 const cc::CompositorFrameAck& ack); 74 const cc::CompositorFrameAck& ack);
75 virtual void OnReclaimResources(uint32 output_surface_id, 75 virtual void OnReclaimResources(uint32 output_surface_id,
76 const cc::CompositorFrameAck& ack); 76 const cc::CompositorFrameAck& ack);
77 uint32 output_surface_id_; 77 uint32 output_surface_id_;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 // TODO(danakj): Remove this when crbug.com/311404 118 // TODO(danakj): Remove this when crbug.com/311404
119 bool layout_test_mode_; 119 bool layout_test_mode_;
120 scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_; 120 scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_;
121 base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_; 121 base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_;
122 }; 122 };
123 123
124 } // namespace content 124 } // namespace content
125 125
126 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ 126 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « content/renderer/gin_browsertest.cc ('k') | content/renderer/gpu/compositor_software_output_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698