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

Side by Side Diff: ui/compositor/test/in_process_context_factory.cc

Issue 221783002: Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
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 "ui/compositor/test/in_process_context_factory.h" 5 #include "ui/compositor/test/in_process_context_factory.h"
6 6
7 #include "cc/output/output_surface.h" 7 #include "cc/output/output_surface.h"
8 #include "ui/compositor/reflector.h" 8 #include "ui/compositor/reflector.h"
9 #include "ui/gl/gl_implementation.h" 9 #include "ui/gl/gl_implementation.h"
10 #include "ui/gl/gl_surface.h" 10 #include "ui/gl/gl_surface.h"
(...skipping 11 matching lines...) Expand all
22 22
23 scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface( 23 scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface(
24 Compositor* compositor, 24 Compositor* compositor,
25 bool software_fallback) { 25 bool software_fallback) {
26 DCHECK(!software_fallback); 26 DCHECK(!software_fallback);
27 blink::WebGraphicsContext3D::Attributes attrs; 27 blink::WebGraphicsContext3D::Attributes attrs;
28 attrs.depth = false; 28 attrs.depth = false;
29 attrs.stencil = false; 29 attrs.stencil = false;
30 attrs.antialias = false; 30 attrs.antialias = false;
31 attrs.shareResources = true; 31 attrs.shareResources = true;
32 bool lose_context_when_out_of_memory = true;
33 32
34 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; 33 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
35 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d( 34 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
36 WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext( 35 WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
37 attrs, lose_context_when_out_of_memory, compositor->widget())); 36 attrs, compositor->widget()));
38 CHECK(context3d); 37 CHECK(context3d);
39 38
40 using webkit::gpu::ContextProviderInProcess; 39 using webkit::gpu::ContextProviderInProcess;
41 scoped_refptr<ContextProviderInProcess> context_provider = 40 scoped_refptr<ContextProviderInProcess> context_provider =
42 ContextProviderInProcess::Create(context3d.Pass(), "UICompositor"); 41 ContextProviderInProcess::Create(context3d.Pass(), "UICompositor");
43 42
44 return make_scoped_ptr(new cc::OutputSurface(context_provider)); 43 return make_scoped_ptr(new cc::OutputSurface(context_provider));
45 } 44 }
46 45
47 scoped_refptr<Reflector> InProcessContextFactory::CreateReflector( 46 scoped_refptr<Reflector> InProcessContextFactory::CreateReflector(
48 Compositor* mirroed_compositor, 47 Compositor* mirroed_compositor,
49 Layer* mirroring_layer) { 48 Layer* mirroring_layer) {
50 return new Reflector(); 49 return new Reflector();
51 } 50 }
52 51
53 void InProcessContextFactory::RemoveReflector( 52 void InProcessContextFactory::RemoveReflector(
54 scoped_refptr<Reflector> reflector) {} 53 scoped_refptr<Reflector> reflector) {}
55 54
56 scoped_refptr<cc::ContextProvider> 55 scoped_refptr<cc::ContextProvider>
57 InProcessContextFactory::OffscreenCompositorContextProvider() { 56 InProcessContextFactory::OffscreenCompositorContextProvider() {
58 if (!offscreen_compositor_contexts_.get() || 57 if (!offscreen_compositor_contexts_.get() ||
59 !offscreen_compositor_contexts_->DestroyedOnMainThread()) { 58 !offscreen_compositor_contexts_->DestroyedOnMainThread()) {
60 bool lose_context_when_out_of_memory = true;
61 offscreen_compositor_contexts_ = 59 offscreen_compositor_contexts_ =
62 webkit::gpu::ContextProviderInProcess::CreateOffscreen( 60 webkit::gpu::ContextProviderInProcess::CreateOffscreen();
63 lose_context_when_out_of_memory);
64 } 61 }
65 return offscreen_compositor_contexts_; 62 return offscreen_compositor_contexts_;
66 } 63 }
67 64
68 scoped_refptr<cc::ContextProvider> 65 scoped_refptr<cc::ContextProvider>
69 InProcessContextFactory::SharedMainThreadContextProvider() { 66 InProcessContextFactory::SharedMainThreadContextProvider() {
70 if (shared_main_thread_contexts_ && 67 if (shared_main_thread_contexts_ &&
71 !shared_main_thread_contexts_->DestroyedOnMainThread()) 68 !shared_main_thread_contexts_->DestroyedOnMainThread())
72 return shared_main_thread_contexts_; 69 return shared_main_thread_contexts_;
73 70
74 if (ui::Compositor::WasInitializedWithThread()) { 71 if (ui::Compositor::WasInitializedWithThread()) {
75 bool lose_context_when_out_of_memory = false;
76 shared_main_thread_contexts_ = 72 shared_main_thread_contexts_ =
77 webkit::gpu::ContextProviderInProcess::CreateOffscreen( 73 webkit::gpu::ContextProviderInProcess::CreateOffscreen();
78 lose_context_when_out_of_memory);
79 } else { 74 } else {
80 shared_main_thread_contexts_ = 75 shared_main_thread_contexts_ =
81 static_cast<webkit::gpu::ContextProviderInProcess*>( 76 static_cast<webkit::gpu::ContextProviderInProcess*>(
82 OffscreenCompositorContextProvider().get()); 77 OffscreenCompositorContextProvider().get());
83 } 78 }
84 if (shared_main_thread_contexts_ && 79 if (shared_main_thread_contexts_ &&
85 !shared_main_thread_contexts_->BindToCurrentThread()) 80 !shared_main_thread_contexts_->BindToCurrentThread())
86 shared_main_thread_contexts_ = NULL; 81 shared_main_thread_contexts_ = NULL;
87 82
88 return shared_main_thread_contexts_; 83 return shared_main_thread_contexts_;
89 } 84 }
90 85
91 void InProcessContextFactory::RemoveCompositor(Compositor* compositor) {} 86 void InProcessContextFactory::RemoveCompositor(Compositor* compositor) {}
92 87
93 bool InProcessContextFactory::DoesCreateTestContexts() { return false; } 88 bool InProcessContextFactory::DoesCreateTestContexts() { return false; }
94 89
95 } // namespace ui 90 } // namespace ui
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppb_graphics_3d_shared.cc ('k') | webkit/common/gpu/context_provider_in_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698