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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/gpu/vaapi_drm_picture.cc

Issue 2102443003: Break //ui/gl/ dependency on //ui/ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gl_bindings
Patch Set: Rebase again. Created 4 years, 5 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 | « gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/vaapi_drm_picture.cc
diff --git a/media/gpu/vaapi_drm_picture.cc b/media/gpu/vaapi_drm_picture.cc
index 1aaa8800ff877fdeb7c55d6c2b980fb0ec639a5c..1b89848d1864199684349f131b90948e3c6e1d8a 100644
--- a/media/gpu/vaapi_drm_picture.cc
+++ b/media/gpu/vaapi_drm_picture.cc
@@ -10,8 +10,8 @@
#include "third_party/libva/va/va.h"
#include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
#include "ui/gl/scoped_binders.h"
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
#include "ui/ozone/public/native_pixmap.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/surface_factory_ozone.h"
@@ -78,8 +78,8 @@ bool VaapiDrmPicture::Initialize() {
gfx::BufferFormat format = pixmap_->GetBufferFormat();
- scoped_refptr<gl::GLImageOzoneNativePixmap> image(
- new gl::GLImageOzoneNativePixmap(size_,
+ scoped_refptr<ui::GLImageOzoneNativePixmap> image(
+ new ui::GLImageOzoneNativePixmap(size_,
BufferFormatToInternalFormat(format)));
if (!image->Initialize(pixmap_.get(), format)) {
LOG(ERROR) << "Failed to create GLImage";
« no previous file with comments | « gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698