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

Unified Diff: content/renderer/render_thread_impl.h

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/renderer/render_thread_impl.h
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 477c555c756ee78cc2c418420529fe9d5e5bbcd0..5ac171784397311f3fe7faf32bc815ce01c700a9 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -206,7 +206,8 @@ class CONTENT_EXPORT RenderThreadImpl
bool IsPartialRasterEnabled() override;
bool IsGpuMemoryBufferCompositorResourcesEnabled() override;
bool IsElasticOverscrollEnabled() override;
- std::vector<unsigned> GetImageTextureTargets() override;
+ const cc::RendererSettings::ImageTextureTargetsMap& GetImageTextureTargets()
+ override;
scoped_refptr<base::SingleThreadTaskRunner>
GetCompositorMainThreadTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner>
@@ -658,7 +659,7 @@ class CONTENT_EXPORT RenderThreadImpl
bool is_gpu_memory_buffer_compositor_resources_enabled_;
bool is_partial_raster_enabled_;
bool is_elastic_overscroll_enabled_;
- std::vector<unsigned> use_image_texture_targets_;
+ cc::RendererSettings::ImageTextureTargetsMap use_image_texture_targets_;
enne (OOO) 2016/07/15 21:39:32 This is maybe a readability nit, but I expect some
ericrk 2016/07/19 20:22:43 Renamed this to "buffer_to_texture_target_map"
std::vector<unsigned> use_video_frame_image_texture_targets_;
bool are_image_decode_tasks_enabled_;
bool is_threaded_animation_enabled_;

Powered by Google App Engine
This is Rietveld 408576698