diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/cc/layers/texture_layer_impl.cc | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/texture_layer_impl.cc')
| -rw-r--r-- | chromium/cc/layers/texture_layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/cc/layers/texture_layer_impl.cc b/chromium/cc/layers/texture_layer_impl.cc index 200dad4a261..ed7b8d876fb 100644 --- a/chromium/cc/layers/texture_layer_impl.cc +++ b/chromium/cc/layers/texture_layer_impl.cc @@ -11,7 +11,6 @@ #include "base/strings/stringprintf.h" #include "cc/output/output_surface.h" -#include "cc/output/renderer.h" #include "cc/quads/solid_color_draw_quad.h" #include "cc/quads/texture_draw_quad.h" #include "cc/resources/platform_color.h" @@ -111,7 +110,8 @@ bool TextureLayerImpl::WillDraw(DrawMode draw_mode, if (!texture_copy_->id()) { texture_copy_->Allocate(texture_mailbox_.size_in_pixels(), ResourceProvider::TEXTURE_HINT_IMMUTABLE, - resource_provider->best_texture_format()); + resource_provider->best_texture_format(), + gfx::ColorSpace()); } if (texture_copy_->id()) { |