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

Side by Side Diff: content/renderer/gpu/mailbox_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_MAILBOX_OUTPUT_SURFACE_H_ 5 #ifndef CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
6 #define CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_ 6 #define CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 18 matching lines...) Expand all
29 MailboxOutputSurface( 29 MailboxOutputSurface(
30 int32 routing_id, 30 int32 routing_id,
31 uint32 output_surface_id, 31 uint32 output_surface_id,
32 const scoped_refptr<ContextProviderCommandBuffer>& context_provider, 32 const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
33 scoped_ptr<cc::SoftwareOutputDevice> software_device, 33 scoped_ptr<cc::SoftwareOutputDevice> software_device,
34 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, 34 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
35 cc::ResourceFormat format); 35 cc::ResourceFormat format);
36 virtual ~MailboxOutputSurface(); 36 virtual ~MailboxOutputSurface();
37 37
38 // cc::OutputSurface implementation. 38 // cc::OutputSurface implementation.
39 virtual void EnsureBackbuffer() OVERRIDE; 39 virtual void EnsureBackbuffer() override;
40 virtual void DiscardBackbuffer() OVERRIDE; 40 virtual void DiscardBackbuffer() override;
41 virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE; 41 virtual void Reshape(const gfx::Size& size, float scale_factor) override;
42 virtual void BindFramebuffer() OVERRIDE; 42 virtual void BindFramebuffer() override;
43 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; 43 virtual void SwapBuffers(cc::CompositorFrame* frame) override;
44 44
45 private: 45 private:
46 // CompositorOutputSurface overrides. 46 // CompositorOutputSurface overrides.
47 virtual void OnSwapAck(uint32 output_surface_id, 47 virtual void OnSwapAck(uint32 output_surface_id,
48 const cc::CompositorFrameAck& ack) OVERRIDE; 48 const cc::CompositorFrameAck& ack) override;
49 49
50 size_t GetNumAcksPending(); 50 size_t GetNumAcksPending();
51 51
52 struct TransferableFrame { 52 struct TransferableFrame {
53 TransferableFrame() : texture_id(0), sync_point(0) {} 53 TransferableFrame() : texture_id(0), sync_point(0) {}
54 54
55 TransferableFrame(uint32 texture_id, 55 TransferableFrame(uint32 texture_id,
56 const gpu::Mailbox& mailbox, 56 const gpu::Mailbox& mailbox,
57 const gfx::Size size) 57 const gfx::Size size)
58 : texture_id(texture_id), mailbox(mailbox), size(size), sync_point(0) {} 58 : texture_id(texture_id), mailbox(mailbox), size(size), sync_point(0) {}
59 59
60 uint32 texture_id; 60 uint32 texture_id;
61 gpu::Mailbox mailbox; 61 gpu::Mailbox mailbox;
62 gfx::Size size; 62 gfx::Size size;
63 uint32 sync_point; 63 uint32 sync_point;
64 }; 64 };
65 65
66 TransferableFrame current_backing_; 66 TransferableFrame current_backing_;
67 std::deque<TransferableFrame> pending_textures_; 67 std::deque<TransferableFrame> pending_textures_;
68 std::queue<TransferableFrame> returned_textures_; 68 std::queue<TransferableFrame> returned_textures_;
69 69
70 uint32 fbo_; 70 uint32 fbo_;
71 bool is_backbuffer_discarded_; 71 bool is_backbuffer_discarded_;
72 cc::ResourceFormat format_; 72 cc::ResourceFormat format_;
73 }; 73 };
74 74
75 } // namespace content 75 } // namespace content
76 76
77 #endif // CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_ 77 #endif // CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | content/renderer/gpu/queue_message_swap_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698