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

Unified Diff: content/test/fake_compositor_dependencies.cc

Issue 1251693003: cc: Fix the format of GpuMemoryBuffer for SurfaceTexture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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/test/fake_compositor_dependencies.h ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/fake_compositor_dependencies.cc
diff --git a/content/test/fake_compositor_dependencies.cc b/content/test/fake_compositor_dependencies.cc
index e33554d969e5c27aec76f33ff8e3f21e29bb7e2d..700af5480a2f7ab5007fb59e660d92adda8f1f11 100644
--- a/content/test/fake_compositor_dependencies.cc
+++ b/content/test/fake_compositor_dependencies.cc
@@ -8,6 +8,7 @@
#include "base/thread_task_runner_handle.h"
#include "cc/test/fake_external_begin_frame_source.h"
#include "third_party/khronos/GLES2/gl2.h"
+#include "ui/gfx/buffer_types.h"
namespace content {
@@ -48,9 +49,9 @@ bool FakeCompositorDependencies::IsOneCopyEnabled() {
bool FakeCompositorDependencies::IsElasticOverscrollEnabled() {
return false;
}
-
-uint32 FakeCompositorDependencies::GetImageTextureTarget() {
- return GL_TEXTURE_2D;
+std::vector<unsigned> FakeCompositorDependencies::GetImageTextureTargets() {
+ return std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
+ GL_TEXTURE_2D);
}
scoped_refptr<base::SingleThreadTaskRunner>
« no previous file with comments | « content/test/fake_compositor_dependencies.h ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698