Roll Chrome into Mojo.
Update from https://crrev.com/313321
This roll is to pick up a fix which prevents -Wl,--as-needed being used
in Release ASAN builds.
This also has some manual changes to mojo only code to fix interface
changes from chromium (mainly, changes in skia interfaces, and changes
in cc). It updates a cc patch, which started failing to apply I also
added patch files to deal with the upstream move of mojo to
third_party/mojo/.
BUG=452105
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/885443002
diff --git a/cc/resources/pixel_buffer_tile_task_worker_pool.cc b/cc/resources/pixel_buffer_tile_task_worker_pool.cc
index 7256f94..d79577d 100644
--- a/cc/resources/pixel_buffer_tile_task_worker_pool.cc
+++ b/cc/resources/pixel_buffer_tile_task_worker_pool.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include "base/containers/stack_container.h"
-#include "base/debug/trace_event.h"
-#include "base/debug/trace_event_argument.h"
#include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_argument.h"
#include "cc/debug/traced_value.h"
#include "cc/resources/raster_buffer.h"
#include "cc/resources/resource.h"
@@ -307,6 +307,10 @@
completed_raster_tasks_.clear();
}
+ResourceFormat PixelBufferTileTaskWorkerPool::GetResourceFormat() {
+ return resource_provider_->memory_efficient_texture_format();
+}
+
scoped_ptr<RasterBuffer> PixelBufferTileTaskWorkerPool::AcquireBufferForRaster(
const Resource* resource) {
return make_scoped_ptr<RasterBuffer>(
