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

Side by Side Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 1575943002: ozone: gracefully handle SoftwareOutputDeviceOzoneTest.CheckCorrectResizeBehavior (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | content/browser/compositor/software_output_device_ozone.h » ('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 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/compositor/gpu_process_transport_factory.h" 5 #include "content/browser/compositor/gpu_process_transport_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 if (IsRunningInMojoShell()) { 142 if (IsRunningInMojoShell()) {
143 return scoped_ptr<cc::SoftwareOutputDevice>( 143 return scoped_ptr<cc::SoftwareOutputDevice>(
144 new SoftwareOutputDeviceMus(compositor)); 144 new SoftwareOutputDeviceMus(compositor));
145 } 145 }
146 #endif 146 #endif
147 147
148 #if defined(OS_WIN) 148 #if defined(OS_WIN)
149 return scoped_ptr<cc::SoftwareOutputDevice>( 149 return scoped_ptr<cc::SoftwareOutputDevice>(
150 new SoftwareOutputDeviceWin(software_backing_.get(), compositor)); 150 new SoftwareOutputDeviceWin(software_backing_.get(), compositor));
151 #elif defined(USE_OZONE) 151 #elif defined(USE_OZONE)
152 return scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareOutputDeviceOzone( 152 return SoftwareOutputDeviceOzone::Create(compositor);
153 compositor));
154 #elif defined(USE_X11) 153 #elif defined(USE_X11)
155 return scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareOutputDeviceX11( 154 return scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareOutputDeviceX11(
156 compositor)); 155 compositor));
157 #elif defined(OS_MACOSX) 156 #elif defined(OS_MACOSX)
158 return scoped_ptr<cc::SoftwareOutputDevice>( 157 return scoped_ptr<cc::SoftwareOutputDevice>(
159 new SoftwareOutputDeviceMac(compositor)); 158 new SoftwareOutputDeviceMac(compositor));
160 #else 159 #else
161 NOTREACHED(); 160 NOTREACHED();
162 return scoped_ptr<cc::SoftwareOutputDevice>(); 161 return scoped_ptr<cc::SoftwareOutputDevice>();
163 #endif 162 #endif
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, 658 FOR_EACH_OBSERVER(ImageTransportFactoryObserver,
660 observer_list_, 659 observer_list_,
661 OnLostResources()); 660 OnLostResources());
662 661
663 // Kill things that use the shared context before killing the shared context. 662 // Kill things that use the shared context before killing the shared context.
664 lost_gl_helper.reset(); 663 lost_gl_helper.reset();
665 lost_shared_main_thread_contexts = NULL; 664 lost_shared_main_thread_contexts = NULL;
666 } 665 }
667 666
668 } // namespace content 667 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/compositor/software_output_device_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698