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

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

Issue 1904773004: 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
Index: content/browser/compositor/surface_utils.cc
diff --git a/content/browser/compositor/surface_utils.cc b/content/browser/compositor/surface_utils.cc
index ae618c03d562b20d2bd8ab66736257cb5ca39653..a0b878b78a3aba762381eccfbc85f376fbd35285 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -10,7 +10,7 @@
#include "cc/output/copy_output_result.h"
#include "cc/resources/single_release_callback.h"
#include "cc/surfaces/surface_id_allocator.h"
-#include "components/display_compositor/gl_helper.h"
+#include "content/browser/compositor/gl_helper.h"
#include "skia/ext/image_operations.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColorFilter.h"
@@ -38,7 +38,7 @@
gpu::SyncToken sync_token;
if (result) {
- display_compositor::GLHelper* gl_helper =
+ content::GLHelper* gl_helper =
content::ImageTransportFactory::GetInstance()->GetGLHelper();
if (gl_helper)
gl_helper->GenerateSyncToken(&sync_token);
@@ -83,7 +83,7 @@
content::ImageTransportFactory* factory =
content::ImageTransportFactory::GetInstance();
- display_compositor::GLHelper* gl_helper = factory->GetGLHelper();
+ content::GLHelper* gl_helper = factory->GetGLHelper();
if (!gl_helper)
return;
@@ -104,7 +104,7 @@
base::Bind(&CopyFromCompositingSurfaceFinished, callback,
base::Passed(&release_callback), base::Passed(&bitmap),
base::Passed(&bitmap_pixels_lock)),
- display_compositor::GLHelper::SCALER_QUALITY_GOOD);
+ content::GLHelper::SCALER_QUALITY_GOOD);
#endif
}

Powered by Google App Engine
This is Rietveld 408576698