From 86ae400a55f66af76329c3d31a4202f7f3355a8a Mon Sep 17 00:00:00 2001 From: James Robinson Date: Fri, 6 Feb 2015 15:14:04 -0800 Subject: [PATCH] Update from https://crrev.com/315085 This includes the switch to libc++ on Android. Other fixes: *) Add (dumb) impl of OrderingBarrier() to command buffer *) "base/debug/trace_event.h" -> "base/trace_event/trace_event.h" *) Added a few includes to sky Review URL: https://codereview.chromium.org/903273002 --- engine/src/flutter/compositor/layer.cc | 2 +- engine/src/flutter/compositor/layer_host.cc | 2 +- engine/src/flutter/compositor/rasterizer_ganesh.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/compositor/layer.cc b/engine/src/flutter/compositor/layer.cc index 006206d347..5c05fdf5c6 100644 --- a/engine/src/flutter/compositor/layer.cc +++ b/engine/src/flutter/compositor/layer.cc @@ -4,7 +4,7 @@ #include "sky/compositor/layer.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "sky/compositor/layer_host.h" #include "sky/compositor/picture_serializer.h" #include "sky/compositor/rasterizer.h" diff --git a/engine/src/flutter/compositor/layer_host.cc b/engine/src/flutter/compositor/layer_host.cc index 697ed265f0..bf4661805e 100644 --- a/engine/src/flutter/compositor/layer_host.cc +++ b/engine/src/flutter/compositor/layer_host.cc @@ -4,8 +4,8 @@ #include "sky/compositor/layer_host.h" -#include "base/debug/trace_event.h" #include "base/message_loop/message_loop.h" +#include "base/trace_event/trace_event.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/gpu/gl_context.h" #include "mojo/services/surfaces/public/cpp/surfaces_utils.h" diff --git a/engine/src/flutter/compositor/rasterizer_ganesh.cc b/engine/src/flutter/compositor/rasterizer_ganesh.cc index d91749e378..46ac59be5d 100644 --- a/engine/src/flutter/compositor/rasterizer_ganesh.cc +++ b/engine/src/flutter/compositor/rasterizer_ganesh.cc @@ -4,7 +4,7 @@ #include "sky/compositor/rasterizer_ganesh.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "mojo/skia/ganesh_surface.h" #include "sky/compositor/layer_host.h" #include "third_party/skia/include/core/SkCanvas.h"