content/browser/compositor/image_transport_factory.cc - Issue 369923003: NoTransportImageTransportFactory is compiled into only test targets.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/compositor/image_transport_factory.cc

Issue 369923003: NoTransportImageTransportFactory is compiled into only test targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: not miss test/ in git commit Created 6 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/image_transport_factory.h ('k') | content/browser/compositor/no_transport_image_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/image_transport_factory.cc

diff --git a/content/browser/compositor/image_transport_factory.cc b/content/browser/compositor/image_transport_factory.cc

index 66d484f51eb51bfc39629fe3201d2c6aec0195b5..e1e8175ef62946efe6baeaaf31caa56d9abb4638 100644

--- a/content/browser/compositor/image_transport_factory.cc

+++ b/content/browser/compositor/image_transport_factory.cc

@@ -6,7 +6,6 @@

#include "base/command_line.h"

#include "content/browser/compositor/gpu_process_transport_factory.h"

-#include "content/browser/compositor/no_transport_image_transport_factory.h"

#include "ui/compositor/compositor.h"

#include "ui/compositor/compositor_switches.h"

#include "ui/gl/gl_implementation.h"

@@ -33,7 +32,7 @@ void ImageTransportFactory::Initialize() {

}

void ImageTransportFactory::InitializeForUnitTests(

- scoped_ptr<ui::ContextFactory> test_factory) {

+ ImageTransportFactory* factory) {

danakj 2014/07/08 15:45:53 Can you pass the ImageTransportFactory with scoped

DCHECK(!g_factory);

DCHECK(!g_initialized_for_unit_tests);

g_initialized_for_unit_tests = true;

@@ -42,7 +41,7 @@ void ImageTransportFactory::InitializeForUnitTests(

if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))

g_disable_null_draw = new gfx::DisableNullDrawGLBindings;

- SetFactory(new NoTransportImageTransportFactory(test_factory.Pass()));

+ SetFactory(factory);

}

// static