| Index: content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.cc b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| index e7c46e05dbc8492a84c9b93cb7158cccba8cc6e0..9d2b18d3fa7577819aa3ccce8fd63771e7ea1aa6 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| @@ -9,7 +9,7 @@
|
| #include "build/build_config.h"
|
| #include "cc/output/context_provider.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| -#include "content/browser/compositor/gl_helper.h"
|
| +#include "components/display_compositor/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"
|
| @@ -24,7 +24,8 @@ NoTransportImageTransportFactory::NoTransportImageTransportFactory()
|
| new ui::InProcessContextFactory(true, surface_manager_.get())) {}
|
|
|
| NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
|
| - std::unique_ptr<GLHelper> lost_gl_helper = std::move(gl_helper_);
|
| + std::unique_ptr<display_compositor::GLHelper> lost_gl_helper =
|
| + std::move(gl_helper_);
|
| FOR_EACH_OBSERVER(
|
| ImageTransportFactoryObserver, observer_list_, OnLostResources());
|
| }
|
| @@ -37,11 +38,11 @@ cc::SurfaceManager* NoTransportImageTransportFactory::GetSurfaceManager() {
|
| return surface_manager_.get();
|
| }
|
|
|
| -GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
|
| +display_compositor::GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
|
| if (!gl_helper_) {
|
| context_provider_ = context_factory_->SharedMainThreadContextProvider();
|
| - gl_helper_.reset(new GLHelper(context_provider_->ContextGL(),
|
| - context_provider_->ContextSupport()));
|
| + gl_helper_.reset(new display_compositor::GLHelper(
|
| + context_provider_->ContextGL(), context_provider_->ContextSupport()));
|
| }
|
| return gl_helper_.get();
|
| }
|
|
|