Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1262)

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

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/reflector_texture.h ('k') | content/browser/compositor/surface_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/reflector_texture.cc
diff --git a/content/browser/compositor/reflector_texture.cc b/content/browser/compositor/reflector_texture.cc
index 2eb76b45b941b999d6c1f36566f0046a307d5107..c9b742d425f66847cc302073d6bed2068b9e2643 100644
--- a/content/browser/compositor/reflector_texture.cc
+++ b/content/browser/compositor/reflector_texture.cc
@@ -4,7 +4,7 @@
#include "content/browser/compositor/reflector_texture.h"
-#include "components/display_compositor/gl_helper.h"
+#include "content/browser/compositor/gl_helper.h"
#include "content/browser/compositor/owned_mailbox.h"
#include "content/common/gpu/client/context_provider_command_buffer.h"
#include "gpu/command_buffer/client/context_support.h"
@@ -14,13 +14,12 @@
ReflectorTexture::ReflectorTexture(cc::ContextProvider* context_provider)
: texture_id_(0) {
- display_compositor::GLHelper* shared_helper =
+ GLHelper* shared_helper =
ImageTransportFactory::GetInstance()->GetGLHelper();
mailbox_ = new OwnedMailbox(shared_helper);
gpu::gles2::GLES2Interface* gl = context_provider->ContextGL();
- gl_helper_.reset(
- new display_compositor::GLHelper(gl, context_provider->ContextSupport()));
+ gl_helper_.reset(new GLHelper(gl, context_provider->ContextSupport()));
texture_id_ = gl_helper_->ConsumeMailboxToTexture(mailbox_->mailbox(),
mailbox_->sync_token());
« no previous file with comments | « content/browser/compositor/reflector_texture.h ('k') | content/browser/compositor/surface_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698