content/browser/context_factory.cc - Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/context_factory.cc

Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate (Closed)

Patch Set: Updated Created 4 years 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 | « content/browser/compositor/test/no_transport_image_transport_factory.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc » ('j') | content/public/browser/context_factory.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/public/browser/context_factory.h"	5 #include "content/public/browser/context_factory.h"

6	6

7 #include "content/browser/compositor/image_transport_factory.h"	7 #include "content/browser/compositor/image_transport_factory.h"

8	8

9 namespace content {	9 namespace content {

10	10

11 ui::ContextFactory* GetContextFactory() {	11 ui::ContextFactory* GetContextFactory() {

12 DCHECK(ImageTransportFactory::GetInstance());	12 DCHECK(ImageTransportFactory::GetInstance());

13 return ImageTransportFactory::GetInstance()->GetContextFactory();	13 return ImageTransportFactory::GetInstance()->GetContextFactory();

14 }	14 }

15	15

	16 ui::ContextFactoryPrivate* GetContextFactoryPrivate() {
	rjkroege 2016/12/08 23:42:59 presuming that I am correct in my understanding th presuming that I am correct in my understanding that this should never be invoked from a mus client, could it have a DCHECK enforcing this -- i.e. test if we're running in --mash mode and check? Fady Samuel 2016/12/13 19:13:59 That is correct but unfortunately, Chrome has its Show quoted text On 2016/12/08 23:42:59, rjkroege wrote: > presuming that I am correct in my understanding that this should never be > invoked from a mus client, could it have a DCHECK enforcing this -- i.e. test if > we're running in --mash mode and check? That is correct but unfortunately, Chrome has its own ContextFactoryPrivate for now: GpuProcessTransportFactory. I intend to fix this in a subsequent CL.
	17 DCHECK(ImageTransportFactory::GetInstance());

	18 return ImageTransportFactory::GetInstance()->GetContextFactoryPrivate();

	19 }

	20

16 } // namespace content	21 } // namespace content

OLD	NEW