content/browser/compositor/no_transport_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/no_transport_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: fix mac build. merge same condition in gyp. 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

« content/browser/compositor/image_transport_factory.h ('K') | « content/browser/compositor/no_transport_image_transport_factory.h ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/no_transport_image_transport_factory.cc

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

index 03289c0f68511a2ca6714e7c0357c362268915f6..276e4d0f61e5e4fabb8d411fd29903941fb48a6f 100644

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

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

@@ -8,12 +8,13 @@

#include "content/common/gpu/client/gl_helper.h"

#include "gpu/command_buffer/client/gles2_interface.h"

#include "ui/compositor/compositor.h"

+#include "ui/compositor/test/in_process_context_factory.h"

namespace content {

-NoTransportImageTransportFactory::NoTransportImageTransportFactory(

- scoped_ptr<ui::ContextFactory> context_factory)

- : context_factory_(context_factory.Pass()) {}

+NoTransportImageTransportFactory::NoTransportImageTransportFactory()

+ : context_factory_(new ui::InProcessContextFactory) {

NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {

scoped_ptr<GLHelper> lost_gl_helper = gl_helper_.Pass();