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

Side by Side Diff: content/common/gpu/image_transport_surface_mac.cc

Issue 256713002: Remove 'transport' paths from PassThroughImageTransportSurface (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 (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 #include "content/common/gpu/image_transport_surface.h" 5 #include "content/common/gpu/image_transport_surface.h"
6 6
7 #include "base/mac/scoped_cftyperef.h" 7 #include "base/mac/scoped_cftyperef.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/common/gpu/gpu_command_buffer_stub.h" 9 #include "content/common/gpu/gpu_command_buffer_stub.h"
10 #include "content/common/gpu/gpu_messages.h" 10 #include "content/common/gpu/gpu_messages.h"
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 // image transport surface, but that surface isn't used to read pixel 538 // image transport surface, but that surface isn't used to read pixel
539 // baselines. So this is mostly a dummy surface. 539 // baselines. So this is mostly a dummy surface.
540 if (!g_allow_os_mesa) { 540 if (!g_allow_os_mesa) {
541 NOTREACHED(); 541 NOTREACHED();
542 return scoped_refptr<gfx::GLSurface>(); 542 return scoped_refptr<gfx::GLSurface>();
543 } 543 }
544 scoped_refptr<gfx::GLSurface> surface(new DRTSurfaceOSMesa()); 544 scoped_refptr<gfx::GLSurface> surface(new DRTSurfaceOSMesa());
545 if (!surface.get() || !surface->Initialize()) 545 if (!surface.get() || !surface->Initialize())
546 return surface; 546 return surface;
547 return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface( 547 return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface(
548 manager, stub, surface.get(), false)); 548 manager, stub, surface.get()));
549 } 549 }
550 } 550 }
551 551
552 // static 552 // static
553 void ImageTransportSurface::SetAllowOSMesaForTesting(bool allow) { 553 void ImageTransportSurface::SetAllowOSMesaForTesting(bool allow) {
554 g_allow_os_mesa = allow; 554 g_allow_os_mesa = allow;
555 } 555 }
556 556
557 } // namespace content 557 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698