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

Unified Diff: content/test/fake_compositor_dependencies.h

Issue 2120713002: Fix use_image_texture_target inconsistencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix content browsertests 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 | « content/renderer/render_thread_impl_browsertest.cc ('k') | content/test/fake_compositor_dependencies.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/fake_compositor_dependencies.h
diff --git a/content/test/fake_compositor_dependencies.h b/content/test/fake_compositor_dependencies.h
index 2ab67c831c916a21d3d35ce93b6a2d972cdeb336..348c6cbe2d1204447e27def74eb26eac3fa0e8ba 100644
--- a/content/test/fake_compositor_dependencies.h
+++ b/content/test/fake_compositor_dependencies.h
@@ -6,6 +6,7 @@
#define CONTENT_TEST_FAKE_COMPOSITOR_DEPENDENCIES_H_
#include "base/macros.h"
+#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/test/test_gpu_memory_buffer_manager.h"
#include "cc/test/test_shared_bitmap_manager.h"
#include "cc/test/test_task_graph_runner.h"
@@ -30,7 +31,7 @@ class FakeCompositorDependencies : public CompositorDependencies {
bool IsPartialRasterEnabled() override;
bool IsGpuMemoryBufferCompositorResourcesEnabled() override;
bool IsElasticOverscrollEnabled() override;
- std::vector<unsigned> GetImageTextureTargets() override;
+ const cc::BufferToTextureTargetMap& GetBufferToTextureTargetMap() override;
scoped_refptr<base::SingleThreadTaskRunner>
GetCompositorMainThreadTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner>
@@ -50,6 +51,7 @@ class FakeCompositorDependencies : public CompositorDependencies {
cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
cc::TestTaskGraphRunner task_graph_runner_;
FakeRendererScheduler renderer_scheduler_;
+ cc::BufferToTextureTargetMap buffer_to_texture_target_map_;
DISALLOW_COPY_AND_ASSIGN(FakeCompositorDependencies);
};
« no previous file with comments | « content/renderer/render_thread_impl_browsertest.cc ('k') | content/test/fake_compositor_dependencies.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698