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

Side by Side Diff: ui/gfx/compositor/compositor_cc.h

Issue 8463018: Use ScopedMakeCurrent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer comments Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/compositor/compositor.h ('k') | ui/gfx/compositor/compositor_cc.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_ 5 #ifndef UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
6 #define UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_ 6 #define UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 12 matching lines...) Expand all
23 class GLShareGroup; 23 class GLShareGroup;
24 } 24 }
25 25
26 namespace ui { 26 namespace ui {
27 27
28 class COMPOSITOR_EXPORT SharedResourcesCC 28 class COMPOSITOR_EXPORT SharedResourcesCC
29 : NON_EXPORTED_BASE(public SharedResources) { 29 : NON_EXPORTED_BASE(public SharedResources) {
30 public: 30 public:
31 static SharedResourcesCC* GetInstance(); 31 static SharedResourcesCC* GetInstance();
32 32
33 virtual bool MakeSharedContextCurrent(); 33 virtual gfx::ScopedMakeCurrent* GetScopedMakeCurrent() OVERRIDE;
34
34 virtual void* GetDisplay(); 35 virtual void* GetDisplay();
35 36
36 gfx::GLShareGroup* GetShareGroup(); 37 gfx::GLShareGroup* GetShareGroup();
37 38
38 private: 39 private:
39 friend struct DefaultSingletonTraits<SharedResourcesCC>; 40 friend struct DefaultSingletonTraits<SharedResourcesCC>;
40 41
41 SharedResourcesCC(); 42 SharedResourcesCC();
42 virtual ~SharedResourcesCC(); 43 virtual ~SharedResourcesCC();
43 44
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 gfx::AcceleratedWidget widget_; 116 gfx::AcceleratedWidget widget_;
116 WebKit::WebLayer root_web_layer_; 117 WebKit::WebLayer root_web_layer_;
117 WebKit::WebLayerTreeView host_; 118 WebKit::WebLayerTreeView host_;
118 119
119 DISALLOW_COPY_AND_ASSIGN(CompositorCC); 120 DISALLOW_COPY_AND_ASSIGN(CompositorCC);
120 }; 121 };
121 122
122 } // namespace ui 123 } // namespace ui
123 124
124 #endif // UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_ 125 #endif // UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
OLDNEW
« no previous file with comments | « ui/gfx/compositor/compositor.h ('k') | ui/gfx/compositor/compositor_cc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698