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

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

Issue 23247002: Remove base::Callback from ContextProvider creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_widget.cc ('k') | ui/compositor/compositor.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) 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 UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 virtual scoped_refptr<cc::ContextProvider> 127 virtual scoped_refptr<cc::ContextProvider>
128 OffscreenContextProviderForMainThread() OVERRIDE; 128 OffscreenContextProviderForMainThread() OVERRIDE;
129 virtual scoped_refptr<cc::ContextProvider> 129 virtual scoped_refptr<cc::ContextProvider>
130 OffscreenContextProviderForCompositorThread() OVERRIDE; 130 OffscreenContextProviderForCompositorThread() OVERRIDE;
131 virtual void RemoveCompositor(Compositor* compositor) OVERRIDE; 131 virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
132 virtual bool DoesCreateTestContexts() OVERRIDE; 132 virtual bool DoesCreateTestContexts() OVERRIDE;
133 133
134 bool Initialize(); 134 bool Initialize();
135 135
136 private: 136 private:
137 static scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl>
138 CreateViewContext(Compositor* compositor);
139
140 scoped_refptr<webkit::gpu::ContextProviderInProcess> 137 scoped_refptr<webkit::gpu::ContextProviderInProcess>
141 offscreen_contexts_main_thread_; 138 offscreen_contexts_main_thread_;
142 scoped_refptr<webkit::gpu::ContextProviderInProcess> 139 scoped_refptr<webkit::gpu::ContextProviderInProcess>
143 offscreen_contexts_compositor_thread_; 140 offscreen_contexts_compositor_thread_;
144 141
145 DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory); 142 DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory);
146 }; 143 };
147 144
148 // The factory that creates test contexts. 145 // The factory that creates test contexts.
149 class COMPOSITOR_EXPORT TestContextFactory : public ContextFactory { 146 class COMPOSITOR_EXPORT TestContextFactory : public ContextFactory {
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 bool disable_schedule_composite_; 449 bool disable_schedule_composite_;
453 450
454 CompositorLock* compositor_lock_; 451 CompositorLock* compositor_lock_;
455 452
456 DISALLOW_COPY_AND_ASSIGN(Compositor); 453 DISALLOW_COPY_AND_ASSIGN(Compositor);
457 }; 454 };
458 455
459 } // namespace ui 456 } // namespace ui
460 457
461 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 458 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « content/renderer/render_widget.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698