content/browser/compositor/test/no_transport_image_transport_factory.h - Issue 1905863002: Revert of Introduce components/display_compositor

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/test/no_transport_image_transport_factory.h

Issue 1905863002: Revert of Introduce components/display_compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 side-by-side diff with in-line comments

Download patch

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

Index: content/browser/compositor/test/no_transport_image_transport_factory.h

diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h

index 54a5897638e6ad335a605def5f086927d791c6d7..ccfee3797da34775d1799076c78dccea82426f23 100644

--- a/content/browser/compositor/test/no_transport_image_transport_factory.h

+++ b/content/browser/compositor/test/no_transport_image_transport_factory.h

@@ -27,7 +27,7 @@

// ImageTransportFactory implementation.

ui::ContextFactory* GetContextFactory() override;

cc::SurfaceManager* GetSurfaceManager() override;

- display_compositor::GLHelper* GetGLHelper() override;

+ GLHelper* GetGLHelper() override;

void AddObserver(ImageTransportFactoryObserver* observer) override;

void RemoveObserver(ImageTransportFactoryObserver* observer) override;

#if defined(OS_MACOSX)

@@ -45,7 +45,7 @@

std::unique_ptr<cc::SurfaceManager> surface_manager_;

std::unique_ptr<ui::ContextFactory> context_factory_;

scoped_refptr<cc::ContextProvider> context_provider_;

- std::unique_ptr<display_compositor::GLHelper> gl_helper_;

+ std::unique_ptr<GLHelper> gl_helper_;

base::ObserverList<ImageTransportFactoryObserver> observer_list_;

DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory);