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

Side by Side Diff: webkit/common/gpu/context_provider_in_process.h

Issue 636443003: Replacing the OVERRIDE with override in /src/webkit (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
« no previous file with comments | « no previous file | webkit/common/gpu/webgraphicscontext3d_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ 5 #ifndef WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
6 #define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ 6 #define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_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/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 12 matching lines...) Expand all
23 : NON_EXPORTED_BASE(public ContextProviderWebContext) { 23 : NON_EXPORTED_BASE(public ContextProviderWebContext) {
24 public: 24 public:
25 static scoped_refptr<ContextProviderInProcess> Create( 25 static scoped_refptr<ContextProviderInProcess> Create(
26 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d, 26 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d,
27 const std::string& debug_name); 27 const std::string& debug_name);
28 28
29 // Uses default attributes for creating an offscreen context. 29 // Uses default attributes for creating an offscreen context.
30 static scoped_refptr<ContextProviderInProcess> CreateOffscreen( 30 static scoped_refptr<ContextProviderInProcess> CreateOffscreen(
31 bool lose_context_when_out_of_memory); 31 bool lose_context_when_out_of_memory);
32 32
33 virtual blink::WebGraphicsContext3D* WebContext3D() OVERRIDE; 33 virtual blink::WebGraphicsContext3D* WebContext3D() override;
34 34
35 virtual bool BindToCurrentThread() OVERRIDE; 35 virtual bool BindToCurrentThread() override;
36 virtual Capabilities ContextCapabilities() OVERRIDE; 36 virtual Capabilities ContextCapabilities() override;
37 virtual ::gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; 37 virtual ::gpu::gles2::GLES2Interface* ContextGL() override;
38 virtual ::gpu::ContextSupport* ContextSupport() OVERRIDE; 38 virtual ::gpu::ContextSupport* ContextSupport() override;
39 virtual class GrContext* GrContext() OVERRIDE; 39 virtual class GrContext* GrContext() override;
40 virtual bool IsContextLost() OVERRIDE; 40 virtual bool IsContextLost() override;
41 virtual void VerifyContexts() OVERRIDE; 41 virtual void VerifyContexts() override;
42 virtual void DeleteCachedResources() OVERRIDE; 42 virtual void DeleteCachedResources() override;
43 virtual bool DestroyedOnMainThread() OVERRIDE; 43 virtual bool DestroyedOnMainThread() override;
44 virtual void SetLostContextCallback( 44 virtual void SetLostContextCallback(
45 const LostContextCallback& lost_context_callback) OVERRIDE; 45 const LostContextCallback& lost_context_callback) override;
46 virtual void SetMemoryPolicyChangedCallback( 46 virtual void SetMemoryPolicyChangedCallback(
47 const MemoryPolicyChangedCallback& memory_policy_changed_callback) 47 const MemoryPolicyChangedCallback& memory_policy_changed_callback)
48 OVERRIDE; 48 override;
49 49
50 protected: 50 protected:
51 ContextProviderInProcess( 51 ContextProviderInProcess(
52 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d, 52 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d,
53 const std::string& debug_name); 53 const std::string& debug_name);
54 virtual ~ContextProviderInProcess(); 54 virtual ~ContextProviderInProcess();
55 55
56 void OnLostContext(); 56 void OnLostContext();
57 57
58 private: 58 private:
(...skipping 17 matching lines...) Expand all
76 76
77 cc::ContextProvider::Capabilities capabilities_; 77 cc::ContextProvider::Capabilities capabilities_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess); 79 DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess);
80 }; 80 };
81 81
82 } // namespace gpu 82 } // namespace gpu
83 } // namespace webkit 83 } // namespace webkit
84 84
85 #endif // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ 85 #endif // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/common/gpu/webgraphicscontext3d_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698