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

Unified Diff: content/renderer/media/android/stream_texture_factory_synchronous_impl.cc

Issue 1770073002: SurfaceTexture* => gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/renderer/media/android/stream_texture_factory_synchronous_impl.cc
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
index 137dc98d41c653e261d262562a3630d459722f73..d9fdf826e1666b694772e5f438ae65a17b8d8976 100644
--- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
+++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
@@ -15,9 +15,9 @@
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
#include "cc/output/context_provider.h"
-#include "content/common/android/surface_texture_peer.h"
#include "content/renderer/render_thread_impl.h"
#include "gpu/command_buffer/client/gles2_interface.h"
+#include "gpu/ipc/common/surface_texture_peer.h"
#include "ui/gl/android/surface_texture.h"
using gpu::gles2::GLES2Interface;
@@ -183,11 +183,8 @@ void StreamTextureFactorySynchronousImpl::EstablishPeer(int32_t stream_id,
scoped_refptr<gfx::SurfaceTexture> surface_texture =
context_provider_->GetSurfaceTexture(stream_id);
if (surface_texture.get()) {
- SurfaceTexturePeer::GetInstance()->EstablishSurfaceTexturePeer(
- base::GetCurrentProcessHandle(),
- surface_texture,
- frame_id,
- player_id);
+ gpu::SurfaceTexturePeer::GetInstance()->EstablishSurfaceTexturePeer(
+ base::GetCurrentProcessHandle(), surface_texture, frame_id, player_id);
}
}

Powered by Google App Engine
This is Rietveld 408576698