From 02720fbca8e026d5e0e77499b6f2e39d0ddd5f41 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 3 Apr 2020 12:33:54 -0700 Subject: [PATCH] Fix include paths of fml/time headers in the shell and rasterizer (flutter/engine#17502) --- engine/src/flutter/shell/common/rasterizer.cc | 4 ++-- engine/src/flutter/shell/common/rasterizer.h | 4 ++-- engine/src/flutter/shell/common/shell.h | 2 +- engine/src/flutter/shell/common/shell_test.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/src/flutter/shell/common/rasterizer.cc b/engine/src/flutter/shell/common/rasterizer.cc index 0561b0ce4e4..f360cefe960 100644 --- a/engine/src/flutter/shell/common/rasterizer.cc +++ b/engine/src/flutter/shell/common/rasterizer.cc @@ -8,8 +8,8 @@ #include -#include "fml/time/time_delta.h" -#include "fml/time/time_point.h" +#include "flutter/fml/time/time_delta.h" +#include "flutter/fml/time/time_point.h" #include "third_party/skia/include/core/SkEncodedImageFormat.h" #include "third_party/skia/include/core/SkImageEncoder.h" #include "third_party/skia/include/core/SkPictureRecorder.h" diff --git a/engine/src/flutter/shell/common/rasterizer.h b/engine/src/flutter/shell/common/rasterizer.h index d4d57c5efe1..dac22644db0 100644 --- a/engine/src/flutter/shell/common/rasterizer.h +++ b/engine/src/flutter/shell/common/rasterizer.h @@ -16,11 +16,11 @@ #include "flutter/fml/memory/weak_ptr.h" #include "flutter/fml/raster_thread_merger.h" #include "flutter/fml/synchronization/waitable_event.h" +#include "flutter/fml/time/time_delta.h" +#include "flutter/fml/time/time_point.h" #include "flutter/lib/ui/snapshot_delegate.h" #include "flutter/shell/common/pipeline.h" #include "flutter/shell/common/surface.h" -#include "fml/time/time_delta.h" -#include "fml/time/time_point.h" namespace flutter { diff --git a/engine/src/flutter/shell/common/shell.h b/engine/src/flutter/shell/common/shell.h index f8cbc85cd6c..b5245527ff6 100644 --- a/engine/src/flutter/shell/common/shell.h +++ b/engine/src/flutter/shell/common/shell.h @@ -22,6 +22,7 @@ #include "flutter/fml/synchronization/sync_switch.h" #include "flutter/fml/synchronization/waitable_event.h" #include "flutter/fml/thread.h" +#include "flutter/fml/time/time_point.h" #include "flutter/lib/ui/semantics/custom_accessibility_action.h" #include "flutter/lib/ui/semantics/semantics_node.h" #include "flutter/lib/ui/window/platform_message.h" @@ -33,7 +34,6 @@ #include "flutter/shell/common/rasterizer.h" #include "flutter/shell/common/shell_io_manager.h" #include "flutter/shell/common/surface.h" -#include "fml/time/time_point.h" namespace flutter { diff --git a/engine/src/flutter/shell/common/shell_test.h b/engine/src/flutter/shell/common/shell_test.h index 79eaf255499..680db7d349c 100644 --- a/engine/src/flutter/shell/common/shell_test.h +++ b/engine/src/flutter/shell/common/shell_test.h @@ -11,6 +11,7 @@ #include "flutter/flow/layers/container_layer.h" #include "flutter/fml/build_config.h" #include "flutter/fml/macros.h" +#include "flutter/fml/time/time_point.h" #include "flutter/lib/ui/window/platform_message.h" #include "flutter/shell/common/run_configuration.h" #include "flutter/shell/common/shell.h" @@ -19,7 +20,6 @@ #include "flutter/testing/elf_loader.h" #include "flutter/testing/test_dart_native_resolver.h" #include "flutter/testing/thread_test.h" -#include "fml/time/time_point.h" namespace flutter { namespace testing {