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

Side by Side Diff: content/browser/android/in_process/synchronous_compositor_factory_impl.cc

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 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 #include "content/browser/android/in_process/synchronous_compositor_factory_impl .h" 5 #include "content/browser/android/in_process/synchronous_compositor_factory_impl .h"
6 6
7 #include "base/observer_list.h" 7 #include "base/observer_list.h"
8 #include "content/browser/android/in_process/synchronous_compositor_output_surfa ce.h" 8 #include "content/browser/android/in_process/synchronous_compositor_output_surfa ce.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/renderer/gpu/frame_swap_message_queue.h" 10 #include "content/renderer/gpu/frame_swap_message_queue.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 scoped_ptr<gpu::GLInProcessContext> gl_in_process_context) 113 scoped_ptr<gpu::GLInProcessContext> gl_in_process_context)
114 : gl_in_process_context_(gl_in_process_context.get()) { 114 : gl_in_process_context_(gl_in_process_context.get()) {
115 115
116 context_provider_ = webkit::gpu::ContextProviderInProcess::Create( 116 context_provider_ = webkit::gpu::ContextProviderInProcess::Create(
117 WrapContext(gl_in_process_context.Pass()), 117 WrapContext(gl_in_process_context.Pass()),
118 "Video-Offscreen-main-thread"); 118 "Video-Offscreen-main-thread");
119 context_provider_->BindToCurrentThread(); 119 context_provider_->BindToCurrentThread();
120 } 120 }
121 121
122 virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( 122 virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
123 uint32 stream_id) OVERRIDE { 123 uint32 stream_id) override {
124 return gl_in_process_context_->GetSurfaceTexture(stream_id); 124 return gl_in_process_context_->GetSurfaceTexture(stream_id);
125 } 125 }
126 126
127 virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE { 127 virtual gpu::gles2::GLES2Interface* ContextGL() override {
128 return context_provider_->ContextGL(); 128 return context_provider_->ContextGL();
129 } 129 }
130 130
131 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE { 131 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override {
132 observer_list_.AddObserver(obs); 132 observer_list_.AddObserver(obs);
133 } 133 }
134 134
135 virtual void RemoveObserver( 135 virtual void RemoveObserver(
136 StreamTextureFactoryContextObserver* obs) OVERRIDE { 136 StreamTextureFactoryContextObserver* obs) override {
137 observer_list_.RemoveObserver(obs); 137 observer_list_.RemoveObserver(obs);
138 } 138 }
139 139
140 void RestoreContext() { 140 void RestoreContext() {
141 FOR_EACH_OBSERVER(StreamTextureFactoryContextObserver, 141 FOR_EACH_OBSERVER(StreamTextureFactoryContextObserver,
142 observer_list_, 142 observer_list_,
143 ResetStreamTextureProxy()); 143 ResetStreamTextureProxy());
144 } 144 }
145 145
146 private: 146 private:
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 DCHECK(!service_); 289 DCHECK(!service_);
290 service_ = service; 290 service_ = service;
291 } 291 }
292 292
293 void SynchronousCompositorFactoryImpl::SetRecordFullDocument( 293 void SynchronousCompositorFactoryImpl::SetRecordFullDocument(
294 bool record_full_document) { 294 bool record_full_document) {
295 record_full_layer_ = record_full_document; 295 record_full_layer_ = record_full_document;
296 } 296 }
297 297
298 } // namespace content 298 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698