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

Side by Side Diff: content/renderer/pepper/pepper_compositor_host.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PEPPER_PEPPER_COMPOSITOR_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 bool is_lost); 53 bool is_lost);
54 void SendCommitLayersReplyIfNecessary(); 54 void SendCommitLayersReplyIfNecessary();
55 void UpdateLayer(const scoped_refptr<cc::Layer>& layer, 55 void UpdateLayer(const scoped_refptr<cc::Layer>& layer,
56 const ppapi::CompositorLayerData* old_layer, 56 const ppapi::CompositorLayerData* old_layer,
57 const ppapi::CompositorLayerData* new_layer, 57 const ppapi::CompositorLayerData* new_layer,
58 scoped_ptr<base::SharedMemory> image_shm); 58 scoped_ptr<base::SharedMemory> image_shm);
59 59
60 // ResourceMessageHandler overrides: 60 // ResourceMessageHandler overrides:
61 virtual int32_t OnResourceMessageReceived( 61 virtual int32_t OnResourceMessageReceived(
62 const IPC::Message& msg, 62 const IPC::Message& msg,
63 ppapi::host::HostMessageContext* context) OVERRIDE; 63 ppapi::host::HostMessageContext* context) override;
64 64
65 // ppapi::host::ResourceHost overrides: 65 // ppapi::host::ResourceHost overrides:
66 virtual bool IsCompositorHost() OVERRIDE; 66 virtual bool IsCompositorHost() override;
67 67
68 // Message handlers: 68 // Message handlers:
69 int32_t OnHostMsgCommitLayers( 69 int32_t OnHostMsgCommitLayers(
70 ppapi::host::HostMessageContext* context, 70 ppapi::host::HostMessageContext* context,
71 const std::vector<ppapi::CompositorLayerData>& layers, 71 const std::vector<ppapi::CompositorLayerData>& layers,
72 bool reset); 72 bool reset);
73 73
74 // Non-owning pointer to the plugin instance this context is currently bound 74 // Non-owning pointer to the plugin instance this context is currently bound
75 // to, if any. If the context is currently unbound, this will be NULL. 75 // to, if any. If the context is currently unbound, this will be NULL.
76 PepperPluginInstanceImpl* bound_instance_; 76 PepperPluginInstanceImpl* bound_instance_;
(...skipping 16 matching lines...) Expand all
93 ppapi::host::ReplyMessageContext commit_layers_reply_context_; 93 ppapi::host::ReplyMessageContext commit_layers_reply_context_;
94 94
95 base::WeakPtrFactory<PepperCompositorHost> weak_factory_; 95 base::WeakPtrFactory<PepperCompositorHost> weak_factory_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(PepperCompositorHost); 97 DISALLOW_COPY_AND_ASSIGN(PepperCompositorHost);
98 }; 98 };
99 99
100 } // namespace content 100 } // namespace content
101 101
102 #endif // CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_H_ 102 #endif // CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698