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 <cmath> includes to sky Review URL: https://codereview.chromium.org/903273002
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user