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

Unified Diff: content/test/fake_compositor_dependencies.cc

Issue 2120713002: Fix use_image_texture_target inconsistencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup 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
Index: content/test/fake_compositor_dependencies.cc
diff --git a/content/test/fake_compositor_dependencies.cc b/content/test/fake_compositor_dependencies.cc
index bf38812c9b3e47f140f960cf8d2dc70124e80ac7..e8632aecd813ed3dee01f5280b65681500b67645 100644
--- a/content/test/fake_compositor_dependencies.cc
+++ b/content/test/fake_compositor_dependencies.cc
@@ -60,9 +60,10 @@ bool FakeCompositorDependencies::IsGpuMemoryBufferCompositorResourcesEnabled() {
bool FakeCompositorDependencies::IsElasticOverscrollEnabled() {
return true;
}
-std::vector<unsigned> FakeCompositorDependencies::GetImageTextureTargets() {
- return std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
- GL_TEXTURE_2D);
+
+const cc::RendererSettings::ImageTextureTargetsMap&
+FakeCompositorDependencies::GetImageTextureTargets() {
+ return image_texture_targets_;
}
scoped_refptr<base::SingleThreadTaskRunner>

Powered by Google App Engine
This is Rietveld 408576698