Update paths to account for buildroot
diff --git a/BUILD.gn b/BUILD.gn
index f608a68..b05d6bb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3,16 +3,16 @@
# found in the LICENSE file.
# This target will be built if no target is specified when invoking ninja.
-group("default") {
+group("flutter") {
testonly = true
deps = [
- "//sky",
+ "//flutter/sky",
]
if (is_ios) {
deps += [
- "//sky/services/dynamic:sdk_lib_archive",
- "//sky/shell:flutter_framework",
+ "//flutter/services/dynamic:sdk_lib_archive",
+ "//flutter/sky/shell:flutter_framework",
]
}
}
@@ -21,6 +21,6 @@
testonly = true
deps = [
- "//sky/dist",
+ "//flutter/sky/dist",
]
}
diff --git a/DEPS b/DEPS
index 2cce6eb..e2435b6 100644
--- a/DEPS
+++ b/DEPS
@@ -43,6 +43,8 @@
]
deps = {
+ 'src': 'https://github.com/flutter/buildroot.git' + '@' + '9a9f454f5f454c6c01ee3814daa151b0fd49df85',
+
# Fuchsia compatibility
#
# The dependencies in this section should match the layout in the Fuchsia gn
diff --git a/flutter/assets/BUILD.gn b/assets/BUILD.gn
similarity index 96%
rename from flutter/assets/BUILD.gn
rename to assets/BUILD.gn
index 6b4e91a..6541b8a 100644
--- a/flutter/assets/BUILD.gn
+++ b/assets/BUILD.gn
@@ -19,7 +19,7 @@
]
deps = [
- "//glue",
+ "//flutter/glue",
"//lib/ftl",
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/system",
diff --git a/flutter/assets/directory_asset_bundle.cc b/assets/directory_asset_bundle.cc
similarity index 97%
rename from flutter/assets/directory_asset_bundle.cc
rename to assets/directory_asset_bundle.cc
index b1d4ff5..a922953 100644
--- a/flutter/assets/directory_asset_bundle.cc
+++ b/assets/directory_asset_bundle.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "glue/data_pipe_utils.h"
+#include "flutter/glue/data_pipe_utils.h"
#include "lib/ftl/files/eintr_wrapper.h"
#include "lib/ftl/files/path.h"
#include "lib/ftl/files/unique_fd.h"
diff --git a/flutter/assets/directory_asset_bundle.h b/assets/directory_asset_bundle.h
similarity index 100%
rename from flutter/assets/directory_asset_bundle.h
rename to assets/directory_asset_bundle.h
diff --git a/flutter/assets/unique_unzipper.cc b/assets/unique_unzipper.cc
similarity index 100%
rename from flutter/assets/unique_unzipper.cc
rename to assets/unique_unzipper.cc
diff --git a/flutter/assets/unique_unzipper.h b/assets/unique_unzipper.h
similarity index 100%
rename from flutter/assets/unique_unzipper.h
rename to assets/unique_unzipper.h
diff --git a/flutter/assets/unzip_job.cc b/assets/unzip_job.cc
similarity index 100%
rename from flutter/assets/unzip_job.cc
rename to assets/unzip_job.cc
diff --git a/flutter/assets/unzip_job.h b/assets/unzip_job.h
similarity index 100%
rename from flutter/assets/unzip_job.h
rename to assets/unzip_job.h
diff --git a/flutter/assets/zip_asset_bundle.cc b/assets/zip_asset_bundle.cc
similarity index 100%
rename from flutter/assets/zip_asset_bundle.cc
rename to assets/zip_asset_bundle.cc
diff --git a/flutter/assets/zip_asset_bundle.h b/assets/zip_asset_bundle.h
similarity index 100%
rename from flutter/assets/zip_asset_bundle.h
rename to assets/zip_asset_bundle.h
diff --git a/flutter/assets/zip_asset_store.cc b/assets/zip_asset_store.cc
similarity index 98%
rename from flutter/assets/zip_asset_store.cc
rename to assets/zip_asset_store.cc
index 681c29b..fff0085 100644
--- a/flutter/assets/zip_asset_store.cc
+++ b/assets/zip_asset_store.cc
@@ -11,7 +11,7 @@
#include "flutter/assets/unique_unzipper.h"
#include "flutter/assets/unzip_job.h"
-#include "glue/data_pipe_utils.h"
+#include "flutter/glue/data_pipe_utils.h"
#include "lib/ftl/files/eintr_wrapper.h"
#include "lib/ftl/files/unique_fd.h"
#include "third_party/zlib/contrib/minizip/unzip.h"
diff --git a/flutter/assets/zip_asset_store.h b/assets/zip_asset_store.h
similarity index 100%
rename from flutter/assets/zip_asset_store.h
rename to assets/zip_asset_store.h
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
index a5ef7f5..206040f 100644
--- a/flow/BUILD.gn
+++ b/flow/BUILD.gn
@@ -44,10 +44,10 @@
]
deps = [
- "//glue",
+ "//flutter/glue",
"//lib/ftl",
"//mojo/services/gfx/composition/interfaces",
"//mojo/skia",
- "//skia",
+ "//flutter/skia",
]
}
diff --git a/flow/compositor_context.cc b/flow/compositor_context.cc
index 7c1b75e..8e4ac14 100644
--- a/flow/compositor_context.cc
+++ b/flow/compositor_context.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/compositor_context.h"
+#include "flutter/flow/compositor_context.h"
#include "third_party/skia/include/core/SkCanvas.h"
diff --git a/flow/compositor_context.h b/flow/compositor_context.h
index 8ede656..97629ad 100644
--- a/flow/compositor_context.h
+++ b/flow/compositor_context.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_COMPOSITOR_CONTEXT_H_
-#define FLOW_COMPOSITOR_CONTEXT_H_
+#ifndef FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
+#define FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
#include <memory>
#include <string>
-#include "flow/instrumentation.h"
-#include "flow/raster_cache.h"
+#include "flutter/flow/instrumentation.h"
+#include "flutter/flow/raster_cache.h"
#include "lib/ftl/macros.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
@@ -72,4 +72,4 @@
} // namespace flow
-#endif // FLOW_COMPOSITOR_CONTEXT_H_
+#endif // FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
diff --git a/flow/instrumentation.cc b/flow/instrumentation.cc
index 6c139a5..83f8136 100644
--- a/flow/instrumentation.cc
+++ b/flow/instrumentation.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/instrumentation.h"
+#include "flutter/flow/instrumentation.h"
#include <algorithm>
diff --git a/flow/instrumentation.h b/flow/instrumentation.h
index eb3c89d..d4a8c2b 100644
--- a/flow/instrumentation.h
+++ b/flow/instrumentation.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_INSTRUMENTATION_H_
-#define FLOW_INSTRUMENTATION_H_
+#ifndef FLUTTER_FLOW_INSTRUMENTATION_H_
+#define FLUTTER_FLOW_INSTRUMENTATION_H_
#include <vector>
@@ -67,4 +67,4 @@
} // namespace flow
-#endif // FLOW_INSTRUMENTATION_H_
+#endif // FLUTTER_FLOW_INSTRUMENTATION_H_
diff --git a/flow/layers/backdrop_filter_layer.cc b/flow/layers/backdrop_filter_layer.cc
index f267c5e..2079b00 100644
--- a/flow/layers/backdrop_filter_layer.cc
+++ b/flow/layers/backdrop_filter_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/backdrop_filter_layer.h"
+#include "flutter/flow/layers/backdrop_filter_layer.h"
#include "third_party/skia/include/core/SkImageFilter.h"
diff --git a/flow/layers/backdrop_filter_layer.h b/flow/layers/backdrop_filter_layer.h
index e16d82b..e388912 100644
--- a/flow/layers/backdrop_filter_layer.h
+++ b/flow/layers/backdrop_filter_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
-#define FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -27,4 +27,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
diff --git a/flow/layers/child_scene_layer.cc b/flow/layers/child_scene_layer.cc
index 3ef8ff2..84db5ab 100644
--- a/flow/layers/child_scene_layer.cc
+++ b/flow/layers/child_scene_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/child_scene_layer.h"
+#include "flutter/flow/layers/child_scene_layer.h"
#include "mojo/skia/type_converters.h"
diff --git a/flow/layers/child_scene_layer.h b/flow/layers/child_scene_layer.h
index d88cac4..c2461ca 100644
--- a/flow/layers/child_scene_layer.h
+++ b/flow/layers/child_scene_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_CHILD_SCENE_LAYER_H_
-#define FLOW_LAYERS_CHILD_SCENE_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
#include "mojo/services/gfx/composition/interfaces/scenes.mojom.h"
namespace flow {
@@ -46,4 +46,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_CHILD_SCENE_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
index fa1622a..9faf600 100644
--- a/flow/layers/clip_path_layer.cc
+++ b/flow/layers/clip_path_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/clip_path_layer.h"
+#include "flutter/flow/layers/clip_path_layer.h"
namespace flow {
diff --git a/flow/layers/clip_path_layer.h b/flow/layers/clip_path_layer.h
index 17838ed..185f8b7 100644
--- a/flow/layers/clip_path_layer.h
+++ b/flow/layers/clip_path_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_CLIP_PATH_LAYER_H_
-#define FLOW_LAYERS_CLIP_PATH_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -28,4 +28,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_CLIP_PATH_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
diff --git a/flow/layers/clip_rect_layer.cc b/flow/layers/clip_rect_layer.cc
index 7c75644..66db9c7 100644
--- a/flow/layers/clip_rect_layer.cc
+++ b/flow/layers/clip_rect_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/clip_rect_layer.h"
+#include "flutter/flow/layers/clip_rect_layer.h"
namespace flow {
diff --git a/flow/layers/clip_rect_layer.h b/flow/layers/clip_rect_layer.h
index b23e272..64d7dc4 100644
--- a/flow/layers/clip_rect_layer.h
+++ b/flow/layers/clip_rect_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_CLIP_RECT_LAYER_H_
-#define FLOW_LAYERS_CLIP_RECT_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -28,4 +28,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_CLIP_RECT_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
diff --git a/flow/layers/clip_rrect_layer.cc b/flow/layers/clip_rrect_layer.cc
index 4ec794e..78b09d6 100644
--- a/flow/layers/clip_rrect_layer.cc
+++ b/flow/layers/clip_rrect_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/clip_rrect_layer.h"
+#include "flutter/flow/layers/clip_rrect_layer.h"
namespace flow {
diff --git a/flow/layers/clip_rrect_layer.h b/flow/layers/clip_rrect_layer.h
index 2113745..5dc4d89 100644
--- a/flow/layers/clip_rrect_layer.h
+++ b/flow/layers/clip_rrect_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_CLIP_RRECT_LAYER_H_
-#define FLOW_LAYERS_CLIP_RRECT_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -28,4 +28,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_CLIP_RRECT_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
diff --git a/flow/layers/color_filter_layer.cc b/flow/layers/color_filter_layer.cc
index 9abcd62..9040019 100644
--- a/flow/layers/color_filter_layer.cc
+++ b/flow/layers/color_filter_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/color_filter_layer.h"
+#include "flutter/flow/layers/color_filter_layer.h"
namespace flow {
diff --git a/flow/layers/color_filter_layer.h b/flow/layers/color_filter_layer.h
index 05c5708..1fbd1ec 100644
--- a/flow/layers/color_filter_layer.h
+++ b/flow/layers/color_filter_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_COLOR_FILTER_LAYER_H_
-#define FLOW_LAYERS_COLOR_FILTER_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -32,4 +32,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_COLOR_FILTER_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
diff --git a/flow/layers/container_layer.cc b/flow/layers/container_layer.cc
index ee29d74..684e988 100644
--- a/flow/layers/container_layer.cc
+++ b/flow/layers/container_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
diff --git a/flow/layers/container_layer.h b/flow/layers/container_layer.h
index 37ede5b..1663b35 100644
--- a/flow/layers/container_layer.h
+++ b/flow/layers/container_layer.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_CONTAINER_LAYER_H_
-#define FLOW_LAYERS_CONTAINER_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
#include <vector>
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
namespace flow {
@@ -35,4 +35,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_CONTAINER_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
diff --git a/flow/layers/layer.cc b/flow/layers/layer.cc
index 5b24347..3bbcec8 100644
--- a/flow/layers/layer.cc
+++ b/flow/layers/layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
#include "third_party/skia/include/core/SkColorFilter.h"
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
index 8b551b6..342223c 100644
--- a/flow/layers/layer.h
+++ b/flow/layers/layer.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_LAYER_H_
-#define FLOW_LAYERS_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_LAYER_H_
#include <memory>
#include <vector>
-#include "flow/instrumentation.h"
-#include "flow/raster_cache.h"
-#include "glue/trace_event.h"
+#include "flutter/flow/instrumentation.h"
+#include "flutter/flow/raster_cache.h"
+#include "flutter/glue/trace_event.h"
#include "lib/ftl/logging.h"
#include "lib/ftl/macros.h"
#include "third_party/skia/include/core/SkCanvas.h"
@@ -85,4 +85,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_LAYER_H_
diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
index f078137..5bdd9c1a1 100644
--- a/flow/layers/layer_tree.cc
+++ b/flow/layers/layer_tree.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/layer_tree.h"
+#include "flutter/flow/layers/layer_tree.h"
-#include "glue/trace_event.h"
-#include "flow/layers/layer.h"
+#include "flutter/glue/trace_event.h"
+#include "flutter/flow/layers/layer.h"
namespace flow {
diff --git a/flow/layers/layer_tree.h b/flow/layers/layer_tree.h
index 3025219..a205467 100644
--- a/flow/layers/layer_tree.h
+++ b/flow/layers/layer_tree.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_LAYER_TREE_H_
-#define FLOW_LAYERS_LAYER_TREE_H_
+#ifndef FLUTTER_FLOW_LAYERS_LAYER_TREE_H_
+#define FLUTTER_FLOW_LAYERS_LAYER_TREE_H_
#include <stdint.h>
#include <memory>
-#include "flow/compositor_context.h"
-#include "flow/layers/layer.h"
+#include "flutter/flow/compositor_context.h"
+#include "flutter/flow/layers/layer.h"
#include "lib/ftl/macros.h"
#include "lib/ftl/time/time_delta.h"
#include "third_party/skia/include/core/SkSize.h"
@@ -75,4 +75,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_LAYER_TREE_H_
+#endif // FLUTTER_FLOW_LAYERS_LAYER_TREE_H_
diff --git a/flow/layers/opacity_layer.cc b/flow/layers/opacity_layer.cc
index 6fc68f4..28b3f66 100644
--- a/flow/layers/opacity_layer.cc
+++ b/flow/layers/opacity_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/opacity_layer.h"
+#include "flutter/flow/layers/opacity_layer.h"
namespace flow {
diff --git a/flow/layers/opacity_layer.h b/flow/layers/opacity_layer.h
index 17a3edf..f5991b0 100644
--- a/flow/layers/opacity_layer.h
+++ b/flow/layers/opacity_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_OPACITY_LAYER_H_
-#define FLOW_LAYERS_OPACITY_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_OPACITY_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_OPACITY_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -27,4 +27,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_OPACITY_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_OPACITY_LAYER_H_
diff --git a/flow/layers/performance_overlay_layer.cc b/flow/layers/performance_overlay_layer.cc
index 77e6768..66aa349 100644
--- a/flow/layers/performance_overlay_layer.cc
+++ b/flow/layers/performance_overlay_layer.cc
@@ -6,7 +6,7 @@
#include <iostream>
#include <iomanip>
-#include "flow/layers/performance_overlay_layer.h"
+#include "flutter/flow/layers/performance_overlay_layer.h"
namespace flow {
namespace {
diff --git a/flow/layers/performance_overlay_layer.h b/flow/layers/performance_overlay_layer.h
index 51ec8eb..1eaeb7c 100644
--- a/flow/layers/performance_overlay_layer.h
+++ b/flow/layers/performance_overlay_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
-#define FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
#include "lib/ftl/macros.h"
namespace flow {
@@ -29,4 +29,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
diff --git a/flow/layers/picture_layer.cc b/flow/layers/picture_layer.cc
index cb36901..2936314 100644
--- a/flow/layers/picture_layer.cc
+++ b/flow/layers/picture_layer.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/picture_layer.h"
+#include "flutter/flow/layers/picture_layer.h"
-#include "flow/raster_cache.h"
+#include "flutter/flow/raster_cache.h"
#include "lib/ftl/logging.h"
namespace flow {
diff --git a/flow/layers/picture_layer.h b/flow/layers/picture_layer.h
index 4cd0796..c030578 100644
--- a/flow/layers/picture_layer.h
+++ b/flow/layers/picture_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_PICTURE_LAYER_H_
-#define FLOW_LAYERS_PICTURE_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_PICTURE_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_PICTURE_LAYER_H_
-#include "flow/layers/layer.h"
+#include "flutter/flow/layers/layer.h"
namespace flow {
@@ -39,4 +39,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_PICTURE_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_PICTURE_LAYER_H_
diff --git a/flow/layers/shader_mask_layer.cc b/flow/layers/shader_mask_layer.cc
index 5d57f61..446e745 100644
--- a/flow/layers/shader_mask_layer.cc
+++ b/flow/layers/shader_mask_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/shader_mask_layer.h"
+#include "flutter/flow/layers/shader_mask_layer.h"
namespace flow {
diff --git a/flow/layers/shader_mask_layer.h b/flow/layers/shader_mask_layer.h
index 31a34b8..4e32adf 100644
--- a/flow/layers/shader_mask_layer.h
+++ b/flow/layers/shader_mask_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_SHADER_MASK_LAYER_H_
-#define FLOW_LAYERS_SHADER_MASK_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_SHADER_MASK_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_SHADER_MASK_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
#include "third_party/skia/include/core/SkShader.h"
@@ -37,4 +37,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_SHADER_MASK_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_SHADER_MASK_LAYER_H_
diff --git a/flow/layers/transform_layer.cc b/flow/layers/transform_layer.cc
index 1b913c0..2b7448a 100644
--- a/flow/layers/transform_layer.cc
+++ b/flow/layers/transform_layer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/layers/transform_layer.h"
+#include "flutter/flow/layers/transform_layer.h"
namespace flow {
diff --git a/flow/layers/transform_layer.h b/flow/layers/transform_layer.h
index 9239a7c..63439a4 100644
--- a/flow/layers/transform_layer.h
+++ b/flow/layers/transform_layer.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_LAYERS_TRANSFORM_LAYER_H_
-#define FLOW_LAYERS_TRANSFORM_LAYER_H_
+#ifndef FLUTTER_FLOW_LAYERS_TRANSFORM_LAYER_H_
+#define FLUTTER_FLOW_LAYERS_TRANSFORM_LAYER_H_
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
namespace flow {
@@ -27,4 +27,4 @@
} // namespace flow
-#endif // FLOW_LAYERS_TRANSFORM_LAYER_H_
+#endif // FLUTTER_FLOW_LAYERS_TRANSFORM_LAYER_H_
diff --git a/flow/open_gl.h b/flow/open_gl.h
index 13bcb06..b9beaad 100644
--- a/flow/open_gl.h
+++ b/flow/open_gl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_OPEN_GL_H_
-#define FLOW_OPEN_GL_H_
+#ifndef FLUTTER_FLOW_OPEN_GL_H_
+#define FLUTTER_FLOW_OPEN_GL_H_
#include "lib/ftl/build_config.h"
@@ -29,4 +29,4 @@
#endif
-#endif // FLOW_OPEN_GL_H_
+#endif // FLUTTER_FLOW_OPEN_GL_H_
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
index a255eb1..8fcbc3b 100644
--- a/flow/raster_cache.cc
+++ b/flow/raster_cache.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/raster_cache.h"
+#include "flutter/flow/raster_cache.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "lib/ftl/logging.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkImage.h"
diff --git a/flow/raster_cache.h b/flow/raster_cache.h
index a76d726..6c98840 100644
--- a/flow/raster_cache.h
+++ b/flow/raster_cache.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_RASTER_CACHE_H_
-#define FLOW_RASTER_CACHE_H_
+#ifndef FLUTTER_FLOW_RASTER_CACHE_H_
+#define FLUTTER_FLOW_RASTER_CACHE_H_
#include <memory>
#include <unordered_map>
-#include "flow/instrumentation.h"
+#include "flutter/flow/instrumentation.h"
#include "lib/ftl/macros.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkSize.h"
@@ -48,4 +48,4 @@
} // namespace flow
-#endif // FLOW_RASTER_CACHE_H_
+#endif // FLUTTER_FLOW_RASTER_CACHE_H_
diff --git a/flow/texture_image.cc b/flow/texture_image.cc
index 184a247..f7d1072 100644
--- a/flow/texture_image.cc
+++ b/flow/texture_image.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "flow/open_gl.h"
-#include "flow/texture_image.h"
-#include "glue/trace_event.h"
+#include "flutter/flow/open_gl.h"
+#include "flutter/flow/texture_image.h"
+#include "flutter/glue/trace_event.h"
#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
namespace flow {
diff --git a/flow/texture_image.h b/flow/texture_image.h
index 18b6f2c..1596c7b 100644
--- a/flow/texture_image.h
+++ b/flow/texture_image.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FLOW_TEXTURE_IMAGE_H_
-#define FLOW_TEXTURE_IMAGE_H_
+#ifndef FLUTTER_FLOW_TEXTURE_IMAGE_H_
+#define FLUTTER_FLOW_TEXTURE_IMAGE_H_
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkImageGenerator.h"
@@ -17,4 +17,4 @@
} // namespace flow
-#endif // FLOW_TEXTURE_IMAGE_H_
+#endif // FLUTTER_FLOW_TEXTURE_IMAGE_H_
diff --git a/glue/data_pipe_utils.cc b/glue/data_pipe_utils.cc
index 2412e03..de73cf0 100644
--- a/glue/data_pipe_utils.cc
+++ b/glue/data_pipe_utils.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "glue/data_pipe_utils.h"
+#include "flutter/glue/data_pipe_utils.h"
#include <stdio.h>
#include <unistd.h>
diff --git a/glue/data_pipe_utils.h b/glue/data_pipe_utils.h
index 4ae71c4..326054e 100644
--- a/glue/data_pipe_utils.h
+++ b/glue/data_pipe_utils.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GLUE_DATA_PIPE_FILES_H_
-#define GLUE_DATA_PIPE_FILES_H_
+#ifndef FLUTTER_GLU_DATA_PIPE_FILES_H_
+#define FLUTTER_GLU_DATA_PIPE_FILES_H_
#include <stdio.h>
@@ -35,4 +35,4 @@
} // namespace glue
-#endif // GLUE_DATA_PIPE_FILES_H_
+#endif // FLUTTER_GLU_DATA_PIPE_FILES_H_
diff --git a/glue/drain_data_pipe_job.cc b/glue/drain_data_pipe_job.cc
index 06fe056..89c985b 100644
--- a/glue/drain_data_pipe_job.cc
+++ b/glue/drain_data_pipe_job.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "glue/drain_data_pipe_job.h"
+#include "flutter/glue/drain_data_pipe_job.h"
#include <utility>
diff --git a/glue/drain_data_pipe_job.h b/glue/drain_data_pipe_job.h
index 7baa162..74d6044 100644
--- a/glue/drain_data_pipe_job.h
+++ b/glue/drain_data_pipe_job.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GLUE_DRAIN_DATA_PIPE_JOB_H_
-#define GLUE_DRAIN_DATA_PIPE_JOB_H_
+#ifndef FLUTTER_GLU_DRAIN_DATA_PIPE_JOB_H_
+#define FLUTTER_GLU_DRAIN_DATA_PIPE_JOB_H_
#include <functional>
#include <memory>
@@ -32,4 +32,4 @@
} // namespace glue
-#endif // GLUE_DRAIN_DATA_PIPE_JOB_H_
+#endif // FLUTTER_GLU_DRAIN_DATA_PIPE_JOB_H_
diff --git a/glue/movable_wrapper.h b/glue/movable_wrapper.h
index 6ef7142..03b3645 100644
--- a/glue/movable_wrapper.h
+++ b/glue/movable_wrapper.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GLUE_MOVABLE_WRAPPER_H_
-#define GLUE_MOVABLE_WRAPPER_H_
+#ifndef FLUTTER_GLU_MOVABLE_WRAPPER_H_
+#define FLUTTER_GLU_MOVABLE_WRAPPER_H_
#include <utility>
@@ -34,4 +34,4 @@
} // namespace glue
-#endif // GLUE_MOVABLE_WRAPPER_H_
+#endif // FLUTTER_GLU_MOVABLE_WRAPPER_H_
diff --git a/glue/stack_trace.cc b/glue/stack_trace.cc
index 7369f20..9e9c1ef 100644
--- a/glue/stack_trace.cc
+++ b/glue/stack_trace.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "glue/stack_trace.h"
+#include "flutter/glue/stack_trace.h"
#include "base/debug/stack_trace.h"
diff --git a/glue/stack_trace.h b/glue/stack_trace.h
index f7129e1..63a0916 100644
--- a/glue/stack_trace.h
+++ b/glue/stack_trace.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GLUE_STACK_TRACE_H_
-#define GLUE_STACK_TRACE_H_
+#ifndef FLUTTER_GLU_STACK_TRACE_H_
+#define FLUTTER_GLU_STACK_TRACE_H_
namespace glue {
@@ -11,4 +11,4 @@
} // namespace glue
-#endif // GLUE_STACK_TRACE_H_
+#endif // FLUTTER_GLU_STACK_TRACE_H_
diff --git a/glue/task_runner_adaptor.cc b/glue/task_runner_adaptor.cc
index 97de71e..8079aa4 100644
--- a/glue/task_runner_adaptor.cc
+++ b/glue/task_runner_adaptor.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "glue/task_runner_adaptor.h"
+#include "flutter/glue/task_runner_adaptor.h"
#include <utility>
diff --git a/glue/task_runner_adaptor.h b/glue/task_runner_adaptor.h
index 0fad1ca..2292527 100644
--- a/glue/task_runner_adaptor.h
+++ b/glue/task_runner_adaptor.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GLUE_BASE_TASK_RUNNER_H_
-#define GLUE_BASE_TASK_RUNNER_H_
+#ifndef FLUTTER_GLU_BASE_TASK_RUNNER_H_
+#define FLUTTER_GLU_BASE_TASK_RUNNER_H_
#include "base/memory/ref_counted.h"
#include "lib/ftl/tasks/task_runner.h"
@@ -30,4 +30,4 @@
} // namespace glue
-#endif // GLUE_BASE_TASK_RUNNER_H_
+#endif // FLUTTER_GLU_BASE_TASK_RUNNER_H_
diff --git a/glue/thread.cc b/glue/thread.cc
index a250eec..16d6c10 100644
--- a/glue/thread.cc
+++ b/glue/thread.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "glue/thread.h"
+#include "flutter/glue/thread.h"
#include <utility>
#include "base/threading/thread.h"
-#include "glue/task_runner_adaptor.h"
+#include "flutter/glue/task_runner_adaptor.h"
namespace glue {
diff --git a/glue/thread.h b/glue/thread.h
index ec19943..bd6e68d 100644
--- a/glue/thread.h
+++ b/glue/thread.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GLUE_THREAD_H_
-#define GLUE_THREAD_H_
+#ifndef FLUTTER_GLU_THREAD_H_
+#define FLUTTER_GLU_THREAD_H_
#include <memory>
@@ -31,4 +31,4 @@
} // namespace glue
-#endif // GLUE_THREAD_H_
+#endif // FLUTTER_GLU_THREAD_H_
diff --git a/flutter/lib/jni/BUILD.gn b/lib/jni/BUILD.gn
similarity index 100%
rename from flutter/lib/jni/BUILD.gn
rename to lib/jni/BUILD.gn
diff --git a/flutter/lib/jni/dart_jni.cc b/lib/jni/dart_jni.cc
similarity index 100%
rename from flutter/lib/jni/dart_jni.cc
rename to lib/jni/dart_jni.cc
diff --git a/flutter/lib/jni/dart_jni.gni b/lib/jni/dart_jni.gni
similarity index 100%
rename from flutter/lib/jni/dart_jni.gni
rename to lib/jni/dart_jni.gni
diff --git a/flutter/lib/jni/dart_jni.h b/lib/jni/dart_jni.h
similarity index 100%
rename from flutter/lib/jni/dart_jni.h
rename to lib/jni/dart_jni.h
diff --git a/flutter/lib/jni/jni.dart b/lib/jni/jni.dart
similarity index 100%
rename from flutter/lib/jni/jni.dart
rename to lib/jni/jni.dart
diff --git a/flutter/lib/jni/jni_api.cc b/lib/jni/jni_api.cc
similarity index 100%
rename from flutter/lib/jni/jni_api.cc
rename to lib/jni/jni_api.cc
diff --git a/flutter/lib/jni/jni_api.h b/lib/jni/jni_api.h
similarity index 100%
rename from flutter/lib/jni/jni_api.h
rename to lib/jni/jni_api.h
diff --git a/flutter/lib/jni/jni_array.cc b/lib/jni/jni_array.cc
similarity index 100%
rename from flutter/lib/jni/jni_array.cc
rename to lib/jni/jni_array.cc
diff --git a/flutter/lib/jni/jni_array.h b/lib/jni/jni_array.h
similarity index 100%
rename from flutter/lib/jni/jni_array.h
rename to lib/jni/jni_array.h
diff --git a/flutter/lib/jni/jni_class.cc b/lib/jni/jni_class.cc
similarity index 100%
rename from flutter/lib/jni/jni_class.cc
rename to lib/jni/jni_class.cc
diff --git a/flutter/lib/jni/jni_class.h b/lib/jni/jni_class.h
similarity index 100%
rename from flutter/lib/jni/jni_class.h
rename to lib/jni/jni_class.h
diff --git a/flutter/lib/jni/jni_helper.dart b/lib/jni/jni_helper.dart
similarity index 100%
rename from flutter/lib/jni/jni_helper.dart
rename to lib/jni/jni_helper.dart
diff --git a/flutter/lib/jni/jni_object.cc b/lib/jni/jni_object.cc
similarity index 100%
rename from flutter/lib/jni/jni_object.cc
rename to lib/jni/jni_object.cc
diff --git a/flutter/lib/jni/jni_object.h b/lib/jni/jni_object.h
similarity index 100%
rename from flutter/lib/jni/jni_object.h
rename to lib/jni/jni_object.h
diff --git a/flutter/lib/jni/jni_raw.dart b/lib/jni/jni_raw.dart
similarity index 100%
rename from flutter/lib/jni/jni_raw.dart
rename to lib/jni/jni_raw.dart
diff --git a/flutter/lib/jni/jni_string.cc b/lib/jni/jni_string.cc
similarity index 100%
rename from flutter/lib/jni/jni_string.cc
rename to lib/jni/jni_string.cc
diff --git a/flutter/lib/jni/jni_string.h b/lib/jni/jni_string.h
similarity index 100%
rename from flutter/lib/jni/jni_string.h
rename to lib/jni/jni_string.h
diff --git a/flutter/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
similarity index 90%
rename from flutter/lib/ui/BUILD.gn
rename to lib/ui/BUILD.gn
index 077dcf4..d9db1a4 100644
--- a/flutter/lib/ui/BUILD.gn
+++ b/lib/ui/BUILD.gn
@@ -42,14 +42,14 @@
deps = [
"//base",
- "//flow",
+ "//flutter/flow",
"//flutter/tonic",
- "//glue",
+ "//flutter/glue",
"//lib/tonic",
- "//skia",
+ "//flutter/skia",
# For image_decoding:
- "//sky/engine/platform",
- "//sky/engine/wtf",
+ "//flutter/sky/engine/platform",
+ "//flutter/sky/engine/wtf",
]
}
diff --git a/flutter/lib/ui/compositing.dart b/lib/ui/compositing.dart
similarity index 100%
rename from flutter/lib/ui/compositing.dart
rename to lib/ui/compositing.dart
diff --git a/flutter/lib/ui/compositing/scene.cc b/lib/ui/compositing/scene.cc
similarity index 100%
rename from flutter/lib/ui/compositing/scene.cc
rename to lib/ui/compositing/scene.cc
diff --git a/flutter/lib/ui/compositing/scene.h b/lib/ui/compositing/scene.h
similarity index 96%
rename from flutter/lib/ui/compositing/scene.h
rename to lib/ui/compositing/scene.h
index fa534a0..a9c7eaf 100644
--- a/flutter/lib/ui/compositing/scene.h
+++ b/lib/ui/compositing/scene.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <memory>
-#include "flow/layers/layer_tree.h"
+#include "flutter/flow/layers/layer_tree.h"
#include "lib/tonic/dart_wrappable.h"
#include "third_party/skia/include/core/SkPicture.h"
diff --git a/flutter/lib/ui/compositing/scene_builder.cc b/lib/ui/compositing/scene_builder.cc
similarity index 91%
rename from flutter/lib/ui/compositing/scene_builder.cc
rename to lib/ui/compositing/scene_builder.cc
index 4455448..2fc6c5b 100644
--- a/flutter/lib/ui/compositing/scene_builder.cc
+++ b/lib/ui/compositing/scene_builder.cc
@@ -4,18 +4,18 @@
#include "flutter/lib/ui/compositing/scene_builder.h"
-#include "flow/layers/backdrop_filter_layer.h"
-#include "flow/layers/child_scene_layer.h"
-#include "flow/layers/clip_path_layer.h"
-#include "flow/layers/clip_rect_layer.h"
-#include "flow/layers/clip_rrect_layer.h"
-#include "flow/layers/color_filter_layer.h"
-#include "flow/layers/container_layer.h"
-#include "flow/layers/opacity_layer.h"
-#include "flow/layers/performance_overlay_layer.h"
-#include "flow/layers/picture_layer.h"
-#include "flow/layers/shader_mask_layer.h"
-#include "flow/layers/transform_layer.h"
+#include "flutter/flow/layers/backdrop_filter_layer.h"
+#include "flutter/flow/layers/child_scene_layer.h"
+#include "flutter/flow/layers/clip_path_layer.h"
+#include "flutter/flow/layers/clip_rect_layer.h"
+#include "flutter/flow/layers/clip_rrect_layer.h"
+#include "flutter/flow/layers/color_filter_layer.h"
+#include "flutter/flow/layers/container_layer.h"
+#include "flutter/flow/layers/opacity_layer.h"
+#include "flutter/flow/layers/performance_overlay_layer.h"
+#include "flutter/flow/layers/picture_layer.h"
+#include "flutter/flow/layers/shader_mask_layer.h"
+#include "flutter/flow/layers/transform_layer.h"
#include "flutter/lib/ui/painting/matrix.h"
#include "flutter/lib/ui/painting/shader.h"
#include "lib/tonic/dart_args.h"
diff --git a/flutter/lib/ui/compositing/scene_builder.h b/lib/ui/compositing/scene_builder.h
similarity index 97%
rename from flutter/lib/ui/compositing/scene_builder.h
rename to lib/ui/compositing/scene_builder.h
index eb5ec88..f352f8b 100644
--- a/flutter/lib/ui/compositing/scene_builder.h
+++ b/lib/ui/compositing/scene_builder.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "flow/layers/container_layer.h"
+#include "flutter/flow/layers/container_layer.h"
#include "flutter/lib/ui/compositing/scene.h"
#include "flutter/lib/ui/painting/image_filter.h"
#include "flutter/lib/ui/painting/path.h"
diff --git a/flutter/lib/ui/dart_ui.gni b/lib/ui/dart_ui.gni
similarity index 100%
rename from flutter/lib/ui/dart_ui.gni
rename to lib/ui/dart_ui.gni
diff --git a/flutter/lib/ui/geometry.dart b/lib/ui/geometry.dart
similarity index 100%
rename from flutter/lib/ui/geometry.dart
rename to lib/ui/geometry.dart
diff --git a/flutter/lib/ui/painting.dart b/lib/ui/painting.dart
similarity index 100%
rename from flutter/lib/ui/painting.dart
rename to lib/ui/painting.dart
diff --git a/flutter/lib/ui/painting/canvas.cc b/lib/ui/painting/canvas.cc
similarity index 100%
rename from flutter/lib/ui/painting/canvas.cc
rename to lib/ui/painting/canvas.cc
diff --git a/flutter/lib/ui/painting/canvas.h b/lib/ui/painting/canvas.h
similarity index 100%
rename from flutter/lib/ui/painting/canvas.h
rename to lib/ui/painting/canvas.h
diff --git a/flutter/lib/ui/painting/gradient.cc b/lib/ui/painting/gradient.cc
similarity index 100%
rename from flutter/lib/ui/painting/gradient.cc
rename to lib/ui/painting/gradient.cc
diff --git a/flutter/lib/ui/painting/gradient.h b/lib/ui/painting/gradient.h
similarity index 100%
rename from flutter/lib/ui/painting/gradient.h
rename to lib/ui/painting/gradient.h
diff --git a/flutter/lib/ui/painting/image.cc b/lib/ui/painting/image.cc
similarity index 100%
rename from flutter/lib/ui/painting/image.cc
rename to lib/ui/painting/image.cc
diff --git a/flutter/lib/ui/painting/image.h b/lib/ui/painting/image.h
similarity index 100%
rename from flutter/lib/ui/painting/image.h
rename to lib/ui/painting/image.h
diff --git a/flutter/lib/ui/painting/image_decoding.cc b/lib/ui/painting/image_decoding.cc
similarity index 94%
rename from flutter/lib/ui/painting/image_decoding.cc
rename to lib/ui/painting/image_decoding.cc
index 9eca1fb..a87bf9f 100644
--- a/flutter/lib/ui/painting/image_decoding.cc
+++ b/lib/ui/painting/image_decoding.cc
@@ -4,19 +4,19 @@
#include "flutter/lib/ui/painting/image_decoding.h"
-#include "flow/texture_image.h"
+#include "flutter/flow/texture_image.h"
#include "flutter/lib/ui/painting/image.h"
#include "flutter/lib/ui/painting/resource_context.h"
-#include "glue/drain_data_pipe_job.h"
-#include "glue/movable_wrapper.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/drain_data_pipe_job.h"
+#include "flutter/glue/movable_wrapper.h"
+#include "flutter/glue/trace_event.h"
#include "lib/ftl/tasks/task_runner.h"
#include "lib/tonic/dart_persistent_value.h"
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/mojo_converter.h"
#include "lib/tonic/typed_data/uint8_list.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
#include "third_party/skia/include/core/SkImageGenerator.h"
using tonic::DartInvoke;
diff --git a/flutter/lib/ui/painting/image_decoding.h b/lib/ui/painting/image_decoding.h
similarity index 100%
rename from flutter/lib/ui/painting/image_decoding.h
rename to lib/ui/painting/image_decoding.h
diff --git a/flutter/lib/ui/painting/image_filter.cc b/lib/ui/painting/image_filter.cc
similarity index 100%
rename from flutter/lib/ui/painting/image_filter.cc
rename to lib/ui/painting/image_filter.cc
diff --git a/flutter/lib/ui/painting/image_filter.h b/lib/ui/painting/image_filter.h
similarity index 100%
rename from flutter/lib/ui/painting/image_filter.h
rename to lib/ui/painting/image_filter.h
diff --git a/flutter/lib/ui/painting/image_shader.cc b/lib/ui/painting/image_shader.cc
similarity index 100%
rename from flutter/lib/ui/painting/image_shader.cc
rename to lib/ui/painting/image_shader.cc
diff --git a/flutter/lib/ui/painting/image_shader.h b/lib/ui/painting/image_shader.h
similarity index 100%
rename from flutter/lib/ui/painting/image_shader.h
rename to lib/ui/painting/image_shader.h
diff --git a/flutter/lib/ui/painting/mask_filter.cc b/lib/ui/painting/mask_filter.cc
similarity index 100%
rename from flutter/lib/ui/painting/mask_filter.cc
rename to lib/ui/painting/mask_filter.cc
diff --git a/flutter/lib/ui/painting/mask_filter.h b/lib/ui/painting/mask_filter.h
similarity index 100%
rename from flutter/lib/ui/painting/mask_filter.h
rename to lib/ui/painting/mask_filter.h
diff --git a/flutter/lib/ui/painting/matrix.cc b/lib/ui/painting/matrix.cc
similarity index 100%
rename from flutter/lib/ui/painting/matrix.cc
rename to lib/ui/painting/matrix.cc
diff --git a/flutter/lib/ui/painting/matrix.h b/lib/ui/painting/matrix.h
similarity index 100%
rename from flutter/lib/ui/painting/matrix.h
rename to lib/ui/painting/matrix.h
diff --git a/flutter/lib/ui/painting/paint.cc b/lib/ui/painting/paint.cc
similarity index 100%
rename from flutter/lib/ui/painting/paint.cc
rename to lib/ui/painting/paint.cc
diff --git a/flutter/lib/ui/painting/paint.h b/lib/ui/painting/paint.h
similarity index 100%
rename from flutter/lib/ui/painting/paint.h
rename to lib/ui/painting/paint.h
diff --git a/flutter/lib/ui/painting/path.cc b/lib/ui/painting/path.cc
similarity index 100%
rename from flutter/lib/ui/painting/path.cc
rename to lib/ui/painting/path.cc
diff --git a/flutter/lib/ui/painting/path.h b/lib/ui/painting/path.h
similarity index 100%
rename from flutter/lib/ui/painting/path.h
rename to lib/ui/painting/path.h
diff --git a/flutter/lib/ui/painting/picture.cc b/lib/ui/painting/picture.cc
similarity index 100%
rename from flutter/lib/ui/painting/picture.cc
rename to lib/ui/painting/picture.cc
diff --git a/flutter/lib/ui/painting/picture.h b/lib/ui/painting/picture.h
similarity index 100%
rename from flutter/lib/ui/painting/picture.h
rename to lib/ui/painting/picture.h
diff --git a/flutter/lib/ui/painting/picture_recorder.cc b/lib/ui/painting/picture_recorder.cc
similarity index 100%
rename from flutter/lib/ui/painting/picture_recorder.cc
rename to lib/ui/painting/picture_recorder.cc
diff --git a/flutter/lib/ui/painting/picture_recorder.h b/lib/ui/painting/picture_recorder.h
similarity index 100%
rename from flutter/lib/ui/painting/picture_recorder.h
rename to lib/ui/painting/picture_recorder.h
diff --git a/flutter/lib/ui/painting/resource_context.cc b/lib/ui/painting/resource_context.cc
similarity index 100%
rename from flutter/lib/ui/painting/resource_context.cc
rename to lib/ui/painting/resource_context.cc
diff --git a/flutter/lib/ui/painting/resource_context.h b/lib/ui/painting/resource_context.h
similarity index 100%
rename from flutter/lib/ui/painting/resource_context.h
rename to lib/ui/painting/resource_context.h
diff --git a/flutter/lib/ui/painting/rrect.cc b/lib/ui/painting/rrect.cc
similarity index 100%
rename from flutter/lib/ui/painting/rrect.cc
rename to lib/ui/painting/rrect.cc
diff --git a/flutter/lib/ui/painting/rrect.h b/lib/ui/painting/rrect.h
similarity index 100%
rename from flutter/lib/ui/painting/rrect.h
rename to lib/ui/painting/rrect.h
diff --git a/flutter/lib/ui/painting/shader.cc b/lib/ui/painting/shader.cc
similarity index 100%
rename from flutter/lib/ui/painting/shader.cc
rename to lib/ui/painting/shader.cc
diff --git a/flutter/lib/ui/painting/shader.h b/lib/ui/painting/shader.h
similarity index 100%
rename from flutter/lib/ui/painting/shader.h
rename to lib/ui/painting/shader.h
diff --git a/flutter/lib/ui/ui.dart b/lib/ui/ui.dart
similarity index 100%
rename from flutter/lib/ui/ui.dart
rename to lib/ui/ui.dart
diff --git a/sky/services/activity/BUILD.gn b/services/activity/BUILD.gn
similarity index 95%
rename from sky/services/activity/BUILD.gn
rename to services/activity/BUILD.gn
index 8219374..a45b057 100644
--- a/sky/services/activity/BUILD.gn
+++ b/services/activity/BUILD.gn
@@ -48,7 +48,7 @@
"//base:base",
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings:bindings",
- "//sky//services/activity:interfaces",
+ "//flutter/services/activity:interfaces",
]
}
}
diff --git a/sky/services/activity/activity.mojom b/services/activity/activity.mojom
similarity index 100%
rename from sky/services/activity/activity.mojom
rename to services/activity/activity.mojom
diff --git a/sky/services/activity/ios/activity_impl.h b/services/activity/ios/activity_impl.h
similarity index 79%
rename from sky/services/activity/ios/activity_impl.h
rename to services/activity/ios/activity_impl.h
index 08e0da2..395b729 100644
--- a/sky/services/activity/ios/activity_impl.h
+++ b/services/activity/ios/activity_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_ACTIVITY_IOS_ACTIVITY_IMPL_H_
-#define SKY_SERVICES_ACTIVITY_IOS_ACTIVITY_IMPL_H_
+#ifndef FLUTTER_SERVICES_ACTIVITY_IOS_ACTIVITY_IMPL_H_
+#define FLUTTER_SERVICES_ACTIVITY_IOS_ACTIVITY_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/activity/activity.mojom.h"
+#include "flutter/services/activity/activity.mojom.h"
namespace sky {
namespace services {
@@ -33,4 +33,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_ACTIVITY_IOS_ACTIVITY_IMPL_H_
+#endif // FLUTTER_SERVICES_ACTIVITY_IOS_ACTIVITY_IMPL_H_
diff --git a/sky/services/activity/ios/activity_impl.mm b/services/activity/ios/activity_impl.mm
similarity index 94%
rename from sky/services/activity/ios/activity_impl.mm
rename to services/activity/ios/activity_impl.mm
index 8c2fd1b..44e8f9f 100644
--- a/sky/services/activity/ios/activity_impl.mm
+++ b/services/activity/ios/activity_impl.mm
@@ -4,7 +4,7 @@
#include "base/logging.h"
#include "base/mac/scoped_nsautorelease_pool.h"
-#include "sky/services/activity/ios/activity_impl.h"
+#include "flutter/services/activity/ios/activity_impl.h"
#include <UIKit/UIKit.h>
diff --git a/sky/services/activity/src/org/domokit/activity/ActivityImpl.java b/services/activity/src/org/domokit/activity/ActivityImpl.java
similarity index 100%
rename from sky/services/activity/src/org/domokit/activity/ActivityImpl.java
rename to services/activity/src/org/domokit/activity/ActivityImpl.java
diff --git a/sky/services/common/BUILD.gn b/services/common/BUILD.gn
similarity index 100%
rename from sky/services/common/BUILD.gn
rename to services/common/BUILD.gn
diff --git a/sky/services/common/src/org/domokit/common/ActivityLifecycleListener.java b/services/common/src/org/domokit/common/ActivityLifecycleListener.java
similarity index 100%
rename from sky/services/common/src/org/domokit/common/ActivityLifecycleListener.java
rename to services/common/src/org/domokit/common/ActivityLifecycleListener.java
diff --git a/sky/services/common/src/org/domokit/common/ResourcePaths.java b/services/common/src/org/domokit/common/ResourcePaths.java
similarity index 100%
rename from sky/services/common/src/org/domokit/common/ResourcePaths.java
rename to services/common/src/org/domokit/common/ResourcePaths.java
diff --git a/sky/services/dynamic/BUILD.gn b/services/dynamic/BUILD.gn
similarity index 100%
rename from sky/services/dynamic/BUILD.gn
rename to services/dynamic/BUILD.gn
diff --git a/sky/services/dynamic/README.md b/services/dynamic/README.md
similarity index 83%
rename from sky/services/dynamic/README.md
rename to services/dynamic/README.md
index a0d96a5..a8bbeba 100644
--- a/sky/services/dynamic/README.md
+++ b/services/dynamic/README.md
@@ -1,4 +1,4 @@
Flutter Dynamic Services Loader
===============================
-Third party service implementations are packaged as dylibs. Each dylib implementation needs to import just one file (`dynamic_service_dylib.h`) and implement `FlutterServicePerform` to provide the service implementation. In order to build the dylib, the build step needs the `//sky/services/dynamic:sdk_lib` GN rule.
+Third party service implementations are packaged as dylibs. Each dylib implementation needs to import just one file (`dynamic_service_dylib.h`) and implement `FlutterServicePerform` to provide the service implementation. In order to build the dylib, the build step needs the `//flutter/services/dynamic:sdk_lib` GN rule.
diff --git a/sky/services/dynamic/dynamic_service.c b/services/dynamic/dynamic_service.c
similarity index 94%
rename from sky/services/dynamic/dynamic_service.c
rename to services/dynamic/dynamic_service.c
index e4d091a..70e3a99 100644
--- a/sky/services/dynamic/dynamic_service.c
+++ b/services/dynamic/dynamic_service.c
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/dynamic/dynamic_service.h"
+#include "flutter/services/dynamic/dynamic_service.h"
const struct FlutterServiceVersion* FlutterServiceGetVersion() {
static const struct FlutterServiceVersion version = {
diff --git a/sky/services/dynamic/dynamic_service.h b/services/dynamic/dynamic_service.h
similarity index 92%
rename from sky/services/dynamic/dynamic_service.h
rename to services/dynamic/dynamic_service.h
index 77d9898..a3675ec 100644
--- a/sky/services/dynamic/dynamic_service.h
+++ b/services/dynamic/dynamic_service.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_H_
-#define SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_H_
+#ifndef FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_H_
+#define FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_H_
#include <stdbool.h>
#include "mojo/public/c/environment/async_waiter.h"
#include "mojo/public/c/environment/logger.h"
#include "mojo/public/c/system/handle.h"
-#include "sky/services/dynamic/dynamic_service_macros.h"
+#include "flutter/services/dynamic/dynamic_service_macros.h"
FLUTTER_C_API_START
@@ -63,4 +63,4 @@
FLUTTER_C_API_END
-#endif // SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_H_
+#endif // FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_H_
diff --git a/sky/services/dynamic/dynamic_service_definition.cc b/services/dynamic/dynamic_service_definition.cc
similarity index 98%
rename from sky/services/dynamic/dynamic_service_definition.cc
rename to services/dynamic/dynamic_service_definition.cc
index eb82dca..38285dd 100644
--- a/sky/services/dynamic/dynamic_service_definition.cc
+++ b/services/dynamic/dynamic_service_definition.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/dynamic/dynamic_service_definition.h"
+#include "flutter/services/dynamic/dynamic_service_definition.h"
#include <dlfcn.h>
diff --git a/sky/services/dynamic/dynamic_service_definition.h b/services/dynamic/dynamic_service_definition.h
similarity index 85%
rename from sky/services/dynamic/dynamic_service_definition.h
rename to services/dynamic/dynamic_service_definition.h
index c0ea715..1dbd3c6 100644
--- a/sky/services/dynamic/dynamic_service_definition.h
+++ b/services/dynamic/dynamic_service_definition.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DEFINITION_H_
-#define SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DEFINITION_H_
+#ifndef FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DEFINITION_H_
+#define FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DEFINITION_H_
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/platform/native/system_thunks.h"
-#include "sky/services/dynamic/dynamic_service_embedder.h"
+#include "flutter/services/dynamic/dynamic_service_embedder.h"
#include <mutex>
@@ -62,4 +62,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DEFINITION_H_
+#endif // FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DEFINITION_H_
diff --git a/sky/services/dynamic/dynamic_service_dylib.cc b/services/dynamic/dynamic_service_dylib.cc
similarity index 92%
rename from sky/services/dynamic/dynamic_service_dylib.cc
rename to services/dynamic/dynamic_service_dylib.cc
index 5097993..1a91f1b 100644
--- a/sky/services/dynamic/dynamic_service_dylib.cc
+++ b/services/dynamic/dynamic_service_dylib.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/dynamic/dynamic_service.h"
+#include "flutter/services/dynamic/dynamic_service.h"
#include <assert.h>
-#include "sky/services/dynamic/dynamic_service_dylib.h"
+#include "flutter/services/dynamic/dynamic_service_dylib.h"
#include "mojo/public/cpp/environment/environment.h"
static bool g_did_initialize_environment = false;
diff --git a/sky/services/dynamic/dynamic_service_dylib.h b/services/dynamic/dynamic_service_dylib.h
similarity index 69%
rename from sky/services/dynamic/dynamic_service_dylib.h
rename to services/dynamic/dynamic_service_dylib.h
index c15a48b..ecd3fa7 100644
--- a/sky/services/dynamic/dynamic_service_dylib.h
+++ b/services/dynamic/dynamic_service_dylib.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DYLIB_H_
-#define SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DYLIB_H_
+#ifndef FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DYLIB_H_
+#define FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DYLIB_H_
#include "mojo/public/cpp/system/message_pipe.h"
#include "mojo/public/cpp/bindings/string.h"
@@ -11,4 +11,4 @@
void FlutterServicePerform(mojo::ScopedMessagePipeHandle client_handle,
const mojo::String& service_name);
-#endif // SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DYLIB_H_
+#endif // FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_DYLIB_H_
diff --git a/sky/services/dynamic/dynamic_service_embedder.c b/services/dynamic/dynamic_service_embedder.c
similarity index 88%
rename from sky/services/dynamic/dynamic_service_embedder.c
rename to services/dynamic/dynamic_service_embedder.c
index eccc223..da0055f 100644
--- a/sky/services/dynamic/dynamic_service_embedder.c
+++ b/services/dynamic/dynamic_service_embedder.c
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/dynamic/dynamic_service_embedder.h"
+#include "flutter/services/dynamic/dynamic_service_embedder.h"
const char* const kFlutterServiceGetVersionProcName =
"FlutterServiceGetVersion";
diff --git a/sky/services/dynamic/dynamic_service_embedder.h b/services/dynamic/dynamic_service_embedder.h
similarity index 76%
rename from sky/services/dynamic/dynamic_service_embedder.h
rename to services/dynamic/dynamic_service_embedder.h
index e78bab0..fa1880f 100644
--- a/sky/services/dynamic/dynamic_service_embedder.h
+++ b/services/dynamic/dynamic_service_embedder.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_EMBEDDER_H_
-#define SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_EMBEDDER_H_
+#ifndef FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_EMBEDDER_H_
+#define FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_EMBEDDER_H_
-#include "sky/services/dynamic/dynamic_service.h"
+#include "flutter/services/dynamic/dynamic_service.h"
typedef const struct FlutterServiceVersion* (*FlutterServiceGetVersionProc)(
void);
@@ -23,4 +23,4 @@
FLUTTER_C_API_END
-#endif // SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_EMBEDDER_H_
+#endif // FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_EMBEDDER_H_
diff --git a/sky/services/dynamic/dynamic_service_macros.h b/services/dynamic/dynamic_service_macros.h
similarity index 77%
rename from sky/services/dynamic/dynamic_service_macros.h
rename to services/dynamic/dynamic_service_macros.h
index d603f75..8ec4c38 100644
--- a/sky/services/dynamic/dynamic_service_macros.h
+++ b/services/dynamic/dynamic_service_macros.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_MACROS_H_
-#define SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_MACROS_H_
+#ifndef FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_MACROS_H_
+#define FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_MACROS_H_
#if defined(DYNAMIC_SERVICE_EMBEDDER)
@@ -28,4 +28,4 @@
#endif // __cplusplus
-#endif // SKY_SERVICES_DYNAMIC_DYNAMIC_SERVICE_MACROS_H_
+#endif // FLUTTER_SERVICES_DYNAMIC_DYNAMIC_SERVICE_MACROS_H_
diff --git a/sky/services/editing/BUILD.gn b/services/editing/BUILD.gn
similarity index 100%
rename from sky/services/editing/BUILD.gn
rename to services/editing/BUILD.gn
diff --git a/sky/services/editing/editing.mojom b/services/editing/editing.mojom
similarity index 100%
rename from sky/services/editing/editing.mojom
rename to services/editing/editing.mojom
diff --git a/sky/services/editing/ios/clipboard_impl.h b/services/editing/ios/clipboard_impl.h
similarity index 76%
rename from sky/services/editing/ios/clipboard_impl.h
rename to services/editing/ios/clipboard_impl.h
index 7e7fb98..b05828c 100644
--- a/sky/services/editing/ios/clipboard_impl.h
+++ b/services/editing/ios/clipboard_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_CLIPBOARD_IOS_CLIPBOARD_SERVICE_IMPL_H_
-#define SKY_SERVICES_CLIPBOARD_IOS_CLIPBOARD_SERVICE_IMPL_H_
+#ifndef FLUTTER_SERVICES_CLIPBOARD_IOS_CLIPBOARD_SERVICE_IMPL_H_
+#define FLUTTER_SERVICES_CLIPBOARD_IOS_CLIPBOARD_SERVICE_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/editing/editing.mojom.h"
+#include "flutter/services/editing/editing.mojom.h"
namespace sky {
namespace services {
@@ -32,4 +32,4 @@
} // namespace services
} // namespace sky
-#endif /* defined(SKY_SERVICES_CLIPBOARD_IOS_CLIPBOARD_SERVICE_IMPL_H__) */
+#endif /* defined(FLUTTER_SERVICES_CLIPBOARD_IOS_CLIPBOARD_SERVICE_IMPL_H__) */
diff --git a/sky/services/editing/ios/clipboard_impl.mm b/services/editing/ios/clipboard_impl.mm
similarity index 95%
rename from sky/services/editing/ios/clipboard_impl.mm
rename to services/editing/ios/clipboard_impl.mm
index 7197c51..c72688a 100644
--- a/sky/services/editing/ios/clipboard_impl.mm
+++ b/services/editing/ios/clipboard_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/editing/ios/clipboard_impl.h"
+#include "flutter/services/editing/ios/clipboard_impl.h"
#include "base/logging.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/sky/services/editing/ios/keyboard_impl.h b/services/editing/ios/keyboard_impl.h
similarity index 80%
rename from sky/services/editing/ios/keyboard_impl.h
rename to services/editing/ios/keyboard_impl.h
index d715450..c16faeb 100644
--- a/sky/services/editing/ios/keyboard_impl.h
+++ b/services/editing/ios/keyboard_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_KEYBOARD_IOS_KEYBOARD_SERVICE_IMPL_H_
-#define SKY_SERVICES_KEYBOARD_IOS_KEYBOARD_SERVICE_IMPL_H_
+#ifndef FLUTTER_SERVICES_KEYBOARD_IOS_KEYBOARD_SERVICE_IMPL_H_
+#define FLUTTER_SERVICES_KEYBOARD_IOS_KEYBOARD_SERVICE_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/editing/editing.mojom.h"
+#include "flutter/services/editing/editing.mojom.h"
#if __OBJC__
@class KeyboardClient;
@@ -40,4 +40,4 @@
} // namespace services
} // namespace sky
-#endif /* defined(SKY_SERVICES_KEYBOARD_IOS_KEYBOARD_SERVICE_IMPL_H__) */
+#endif /* defined(FLUTTER_SERVICES_KEYBOARD_IOS_KEYBOARD_SERVICE_IMPL_H__) */
diff --git a/sky/services/editing/ios/keyboard_impl.mm b/services/editing/ios/keyboard_impl.mm
similarity index 98%
rename from sky/services/editing/ios/keyboard_impl.mm
rename to services/editing/ios/keyboard_impl.mm
index c2ecf7c..70872d8 100644
--- a/sky/services/editing/ios/keyboard_impl.mm
+++ b/services/editing/ios/keyboard_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/editing/ios/keyboard_impl.h"
+#include "flutter/services/editing/ios/keyboard_impl.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/sky/services/editing/src/org/domokit/editing/ClipboardImpl.java b/services/editing/src/org/domokit/editing/ClipboardImpl.java
similarity index 100%
rename from sky/services/editing/src/org/domokit/editing/ClipboardImpl.java
rename to services/editing/src/org/domokit/editing/ClipboardImpl.java
diff --git a/sky/services/editing/src/org/domokit/editing/InputConnectionAdaptor.java b/services/editing/src/org/domokit/editing/InputConnectionAdaptor.java
similarity index 100%
rename from sky/services/editing/src/org/domokit/editing/InputConnectionAdaptor.java
rename to services/editing/src/org/domokit/editing/InputConnectionAdaptor.java
diff --git a/sky/services/editing/src/org/domokit/editing/KeyboardImpl.java b/services/editing/src/org/domokit/editing/KeyboardImpl.java
similarity index 100%
rename from sky/services/editing/src/org/domokit/editing/KeyboardImpl.java
rename to services/editing/src/org/domokit/editing/KeyboardImpl.java
diff --git a/sky/services/editing/src/org/domokit/editing/KeyboardViewState.java b/services/editing/src/org/domokit/editing/KeyboardViewState.java
similarity index 100%
rename from sky/services/editing/src/org/domokit/editing/KeyboardViewState.java
rename to services/editing/src/org/domokit/editing/KeyboardViewState.java
diff --git a/sky/services/engine/BUILD.gn b/services/engine/BUILD.gn
similarity index 91%
rename from sky/services/engine/BUILD.gn
rename to services/engine/BUILD.gn
index 3b0938f..a0eb415 100644
--- a/sky/services/engine/BUILD.gn
+++ b/services/engine/BUILD.gn
@@ -15,6 +15,6 @@
"//mojo/services/asset_bundle/interfaces",
"//mojo/services/gfx/composition/interfaces",
"//mojo/services/ui/views/interfaces",
- "//sky/services/pointer:interfaces",
+ "//flutter/services/pointer:interfaces",
]
}
diff --git a/sky/services/engine/input_event.mojom b/services/engine/input_event.mojom
similarity index 100%
rename from sky/services/engine/input_event.mojom
rename to services/engine/input_event.mojom
diff --git a/sky/services/engine/sky_engine.mojom b/services/engine/sky_engine.mojom
similarity index 94%
rename from sky/services/engine/sky_engine.mojom
rename to services/engine/sky_engine.mojom
index 05a9815..40808a3 100644
--- a/sky/services/engine/sky_engine.mojom
+++ b/services/engine/sky_engine.mojom
@@ -9,8 +9,8 @@
import "mojo/services/asset_bundle/interfaces/asset_bundle.mojom";
import "mojo/services/gfx/composition/interfaces/scheduling.mojom";
import "mojo/services/ui/views/interfaces/views.mojom";
-import "sky/services/engine/input_event.mojom";
-import "sky/services/pointer/pointer.mojom";
+import "flutter/services/engine/input_event.mojom";
+import "flutter/services/pointer/pointer.mojom";
enum AppLifecycleState {
PAUSED,
diff --git a/services/icu/constants.h b/services/icu/constants.h
index 57ee975..8bc3348 100644
--- a/services/icu/constants.h
+++ b/services/icu/constants.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_ICU_CONSTANTS_H_
-#define SERVICES_ICU_CONSTANTS_H_
+#ifndef FLUTTER_SERVICES_ICU_CONSTANTS_H_
+#define FLUTTER_SERVICES_ICU_CONSTANTS_H_
#include <stddef.h>
@@ -16,4 +16,4 @@
} // namespace icu
} // namespace mojo
-#endif // SERVICES_ICU_CONSTANTS_H_
+#endif // FLUTTER_SERVICES_ICU_CONSTANTS_H_
diff --git a/services/icu/generate_icu_constants.py b/services/icu/generate_icu_constants.py
index 85a720f..c2b2683 100755
--- a/services/icu/generate_icu_constants.py
+++ b/services/icu/generate_icu_constants.py
@@ -22,7 +22,7 @@
sha1hash = hashlib.sha1(data).hexdigest()
with open(out_file, "w") as f:
- f.write('#include "services/icu/constants.h"\n')
+ f.write('#include "flutter/services/icu/constants.h"\n')
f.write("namespace mojo {\n")
f.write("namespace icu {\n")
f.write("const size_t kDataSize = %s;\n" % len(data))
diff --git a/services/icu/icu.cc b/services/icu/icu.cc
index 3d1c690..c7d1401 100644
--- a/services/icu/icu.cc
+++ b/services/icu/icu.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/icu/icu.h"
+#include "flutter/services/icu/icu.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/services/icu_data/interfaces/icu_data.mojom.h"
-#include "services/icu/constants.h"
+#include "flutter/services/icu/constants.h"
#include "third_party/icu/source/common/unicode/putil.h"
#include "third_party/icu/source/common/unicode/udata.h"
diff --git a/services/icu/icu.h b/services/icu/icu.h
index 55cf6c6..28491c6 100644
--- a/services/icu/icu.h
+++ b/services/icu/icu.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_ICU_ICU_H_
-#define SERVICES_ICU_ICU_H_
+#ifndef FLUTTER_SERVICES_ICU_ICU_H_
+#define FLUTTER_SERVICES_ICU_ICU_H_
namespace mojo {
class ApplicationConnector;
@@ -15,4 +15,4 @@
} // namespace icu
} // namespace mojo
-#endif // SERVICES_ICU_ICU_H_
+#endif // FLUTTER_SERVICES_ICU_ICU_H_
diff --git a/sky/services/media/BUILD.gn b/services/media/BUILD.gn
similarity index 96%
rename from sky/services/media/BUILD.gn
rename to services/media/BUILD.gn
index 5fa96dd..4c102d9 100644
--- a/sky/services/media/BUILD.gn
+++ b/services/media/BUILD.gn
@@ -36,7 +36,7 @@
"//mojo/java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//sky/services/common:common_lib",
+ "//flutter/services/common:common_lib",
":interfaces_java",
]
}
diff --git a/sky/services/media/ios/media_player_impl.h b/services/media/ios/media_player_impl.h
similarity index 85%
rename from sky/services/media/ios/media_player_impl.h
rename to services/media/ios/media_player_impl.h
index 3661003..8df4675 100644
--- a/sky/services/media/ios/media_player_impl.h
+++ b/services/media/ios/media_player_impl.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_MEDIA_IOS_MEDIA_PLAYER_IMPL_H_
-#define SKY_SERVICES_MEDIA_IOS_MEDIA_PLAYER_IMPL_H_
+#ifndef FLUTTER_SERVICES_MEDIA_IOS_MEDIA_PLAYER_IMPL_H_
+#define FLUTTER_SERVICES_MEDIA_IOS_MEDIA_PLAYER_IMPL_H_
#include "base/files/file_path.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/media/media.mojom.h"
+#include "flutter/services/media/media.mojom.h"
#if __OBJC__
@class AudioClient;
@@ -50,4 +50,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_MEDIA_IOS_MEDIA_PLAYER_IMPL_H_
+#endif // FLUTTER_SERVICES_MEDIA_IOS_MEDIA_PLAYER_IMPL_H_
diff --git a/sky/services/media/ios/media_player_impl.mm b/services/media/ios/media_player_impl.mm
similarity index 98%
rename from sky/services/media/ios/media_player_impl.mm
rename to services/media/ios/media_player_impl.mm
index 0f0a8af..b65d7e7 100644
--- a/sky/services/media/ios/media_player_impl.mm
+++ b/services/media/ios/media_player_impl.mm
@@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "mojo/data_pipe_utils/data_pipe_utils.h"
-#include "sky/services/media/ios/media_player_impl.h"
+#include "flutter/services/media/ios/media_player_impl.h"
#import <Foundation/Foundation.h>
#import <AVFoundation/AVFoundation.h>
diff --git a/sky/services/media/ios/media_service_impl.h b/services/media/ios/media_service_impl.h
similarity index 72%
rename from sky/services/media/ios/media_service_impl.h
rename to services/media/ios/media_service_impl.h
index c3ffb88..9982378 100644
--- a/sky/services/media/ios/media_service_impl.h
+++ b/services/media/ios/media_service_impl.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_MEDIA_IOS_MEDIA_SERVICE_IMPL_H_
-#define SKY_SERVICES_MEDIA_IOS_MEDIA_SERVICE_IMPL_H_
+#ifndef FLUTTER_SERVICES_MEDIA_IOS_MEDIA_SERVICE_IMPL_H_
+#define FLUTTER_SERVICES_MEDIA_IOS_MEDIA_SERVICE_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/media/media.mojom.h"
-#include "sky/services/media/ios/media_player_impl.h"
-#include "sky/services/media/ios/sound_pool_impl.h"
+#include "flutter/services/media/media.mojom.h"
+#include "flutter/services/media/ios/media_player_impl.h"
+#include "flutter/services/media/ios/sound_pool_impl.h"
namespace sky {
namespace services {
@@ -36,4 +36,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_MEDIA_IOS_MEDIA_SERVICE_IMPL_H_
+#endif // FLUTTER_SERVICES_MEDIA_IOS_MEDIA_SERVICE_IMPL_H_
diff --git a/sky/services/media/ios/media_service_impl.mm b/services/media/ios/media_service_impl.mm
similarity index 92%
rename from sky/services/media/ios/media_service_impl.mm
rename to services/media/ios/media_service_impl.mm
index 8715fa0..6275faf 100644
--- a/sky/services/media/ios/media_service_impl.mm
+++ b/services/media/ios/media_service_impl.mm
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/logging.h"
-#include "sky/services/media/ios/media_service_impl.h"
+#include "flutter/services/media/ios/media_service_impl.h"
namespace sky {
namespace services {
diff --git a/sky/services/media/ios/sound_pool_impl.h b/services/media/ios/sound_pool_impl.h
similarity index 85%
rename from sky/services/media/ios/sound_pool_impl.h
rename to services/media/ios/sound_pool_impl.h
index 7146ecb..990cae5 100644
--- a/sky/services/media/ios/sound_pool_impl.h
+++ b/services/media/ios/sound_pool_impl.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_MEDIA_IOS_SOUND_POOL_IMPL_H_
-#define SKY_SERVICES_MEDIA_IOS_SOUND_POOL_IMPL_H_
+#ifndef FLUTTER_SERVICES_MEDIA_IOS_SOUND_POOL_IMPL_H_
+#define FLUTTER_SERVICES_MEDIA_IOS_SOUND_POOL_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/media/media.mojom.h"
-#include "sky/services/media/ios/media_player_impl.h"
+#include "flutter/services/media/media.mojom.h"
+#include "flutter/services/media/ios/media_player_impl.h"
#if __OBJC__
@class SoundPoolClient;
@@ -67,4 +67,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_MEDIA_IOS_SOUND_POOL_IMPL_H_
+#endif // FLUTTER_SERVICES_MEDIA_IOS_SOUND_POOL_IMPL_H_
diff --git a/sky/services/media/ios/sound_pool_impl.mm b/services/media/ios/sound_pool_impl.mm
similarity index 98%
rename from sky/services/media/ios/sound_pool_impl.mm
rename to services/media/ios/sound_pool_impl.mm
index dd7a3b0..c157afd 100644
--- a/sky/services/media/ios/sound_pool_impl.mm
+++ b/services/media/ios/sound_pool_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/media/ios/sound_pool_impl.h"
+#include "flutter/services/media/ios/sound_pool_impl.h"
#include "base/bind.h"
#include "base/files/file_util.h"
diff --git a/sky/services/media/media.mojom b/services/media/media.mojom
similarity index 100%
rename from sky/services/media/media.mojom
rename to services/media/media.mojom
diff --git a/sky/services/media/src/org/domokit/media/MediaPlayerImpl.java b/services/media/src/org/domokit/media/MediaPlayerImpl.java
similarity index 100%
rename from sky/services/media/src/org/domokit/media/MediaPlayerImpl.java
rename to services/media/src/org/domokit/media/MediaPlayerImpl.java
diff --git a/sky/services/media/src/org/domokit/media/MediaServiceImpl.java b/services/media/src/org/domokit/media/MediaServiceImpl.java
similarity index 100%
rename from sky/services/media/src/org/domokit/media/MediaServiceImpl.java
rename to services/media/src/org/domokit/media/MediaServiceImpl.java
diff --git a/sky/services/media/src/org/domokit/media/SoundPoolImpl.java b/services/media/src/org/domokit/media/SoundPoolImpl.java
similarity index 100%
rename from sky/services/media/src/org/domokit/media/SoundPoolImpl.java
rename to services/media/src/org/domokit/media/SoundPoolImpl.java
diff --git a/sky/services/ns_net/BUILD.gn b/services/ns_net/BUILD.gn
similarity index 100%
rename from sky/services/ns_net/BUILD.gn
rename to services/ns_net/BUILD.gn
diff --git a/sky/services/ns_net/network_service_impl.h b/services/ns_net/network_service_impl.h
similarity index 91%
rename from sky/services/ns_net/network_service_impl.h
rename to services/ns_net/network_service_impl.h
index f6d1246..d70d7a3 100644
--- a/sky/services/ns_net/network_service_impl.h
+++ b/services/ns_net/network_service_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_NSNET_NETWORK_SERVICE_IMPL_H_
-#define SKY_SERVICES_NSNET_NETWORK_SERVICE_IMPL_H_
+#ifndef FLUTTER_SERVICES_NSNET_NETWORK_SERVICE_IMPL_H_
+#define FLUTTER_SERVICES_NSNET_NETWORK_SERVICE_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
@@ -46,4 +46,4 @@
} // namespace mojo
-#endif // SKY_SERVICES_NSNET_NETWORK_SERVICE_IMPL_H_
+#endif // FLUTTER_SERVICES_NSNET_NETWORK_SERVICE_IMPL_H_
diff --git a/sky/services/ns_net/network_service_impl.mm b/services/ns_net/network_service_impl.mm
similarity index 93%
rename from sky/services/ns_net/network_service_impl.mm
rename to services/ns_net/network_service_impl.mm
index 11dbeba..493346a 100644
--- a/sky/services/ns_net/network_service_impl.mm
+++ b/services/ns_net/network_service_impl.mm
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/ns_net/network_service_impl.h"
-#include "sky/services/ns_net/url_loader_impl.h"
+#include "flutter/services/ns_net/network_service_impl.h"
+#include "flutter/services/ns_net/url_loader_impl.h"
#include "base/logging.h"
namespace mojo {
diff --git a/sky/services/ns_net/url_loader_impl.h b/services/ns_net/url_loader_impl.h
similarity index 88%
rename from sky/services/ns_net/url_loader_impl.h
rename to services/ns_net/url_loader_impl.h
index 8ecf6e4..35a9979 100644
--- a/sky/services/ns_net/url_loader_impl.h
+++ b/services/ns_net/url_loader_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_NSNET_URLLOADER_IMPL_H_
-#define SKY_SERVICES_NSNET_URLLOADER_IMPL_H_
+#ifndef FLUTTER_SERVICES_NSNET_URLLOADER_IMPL_H_
+#define FLUTTER_SERVICES_NSNET_URLLOADER_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
@@ -42,4 +42,4 @@
} // namespace mojo
-#endif // SKY_SERVICES_NSNET_URLLOADER_IMPL_H_
+#endif // FLUTTER_SERVICES_NSNET_URLLOADER_IMPL_H_
diff --git a/sky/services/ns_net/url_loader_impl.mm b/services/ns_net/url_loader_impl.mm
similarity index 100%
rename from sky/services/ns_net/url_loader_impl.mm
rename to services/ns_net/url_loader_impl.mm
diff --git a/sky/services/oknet/BUILD.gn b/services/oknet/BUILD.gn
similarity index 100%
rename from sky/services/oknet/BUILD.gn
rename to services/oknet/BUILD.gn
diff --git a/sky/services/oknet/src/org/domokit/oknet/NetworkServiceImpl.java b/services/oknet/src/org/domokit/oknet/NetworkServiceImpl.java
similarity index 100%
rename from sky/services/oknet/src/org/domokit/oknet/NetworkServiceImpl.java
rename to services/oknet/src/org/domokit/oknet/NetworkServiceImpl.java
diff --git a/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java b/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
similarity index 100%
rename from sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
rename to services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
diff --git a/sky/services/platform/BUILD.gn b/services/platform/BUILD.gn
similarity index 97%
rename from sky/services/platform/BUILD.gn
rename to services/platform/BUILD.gn
index b2bd855..bfaad95 100644
--- a/sky/services/platform/BUILD.gn
+++ b/services/platform/BUILD.gn
@@ -32,7 +32,7 @@
"//base:base_java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//sky/services/common:common_lib",
+ "//flutter/services/common:common_lib",
":interfaces_java",
]
}
diff --git a/sky/services/platform/app_messages.mojom b/services/platform/app_messages.mojom
similarity index 100%
rename from sky/services/platform/app_messages.mojom
rename to services/platform/app_messages.mojom
diff --git a/sky/services/platform/haptic_feedback.mojom b/services/platform/haptic_feedback.mojom
similarity index 100%
rename from sky/services/platform/haptic_feedback.mojom
rename to services/platform/haptic_feedback.mojom
diff --git a/sky/services/platform/ios/haptic_feedback_impl.h b/services/platform/ios/haptic_feedback_impl.h
similarity index 73%
rename from sky/services/platform/ios/haptic_feedback_impl.h
rename to services/platform/ios/haptic_feedback_impl.h
index 96dffcc..4b1d864 100644
--- a/sky/services/platform/ios/haptic_feedback_impl.h
+++ b/services/platform/ios/haptic_feedback_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_PLATFORM_IOS_HAPTIC_FEEDBACK_IMPL_H_
-#define SKY_SERVICES_PLATFORM_IOS_HAPTIC_FEEDBACK_IMPL_H_
+#ifndef FLUTTER_SERVICES_PLATFORM_IOS_HAPTIC_FEEDBACK_IMPL_H_
+#define FLUTTER_SERVICES_PLATFORM_IOS_HAPTIC_FEEDBACK_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/platform/haptic_feedback.mojom.h"
+#include "flutter/services/platform/haptic_feedback.mojom.h"
namespace flutter {
namespace platform {
@@ -29,4 +29,4 @@
} // namespace platform
} // namespace flutter
-#endif // SKY_SERVICES_PLATFORM_IOS_HAPTIC_FEEDBACK_IMPL_H_
+#endif // FLUTTER_SERVICES_PLATFORM_IOS_HAPTIC_FEEDBACK_IMPL_H_
diff --git a/sky/services/platform/ios/haptic_feedback_impl.mm b/services/platform/ios/haptic_feedback_impl.mm
similarity index 90%
rename from sky/services/platform/ios/haptic_feedback_impl.mm
rename to services/platform/ios/haptic_feedback_impl.mm
index 0450edb..0049e50 100644
--- a/sky/services/platform/ios/haptic_feedback_impl.mm
+++ b/services/platform/ios/haptic_feedback_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/platform/ios/haptic_feedback_impl.h"
+#include "flutter/services/platform/ios/haptic_feedback_impl.h"
#include <AudioToolbox/AudioToolbox.h>
namespace flutter {
diff --git a/sky/services/platform/ios/path_provider_impl.h b/services/platform/ios/path_provider_impl.h
similarity index 76%
rename from sky/services/platform/ios/path_provider_impl.h
rename to services/platform/ios/path_provider_impl.h
index 2392ddb..5e9c12d 100644
--- a/sky/services/platform/ios/path_provider_impl.h
+++ b/services/platform/ios/path_provider_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_PLATFORM_IOS_PATH_PROVIDER_IMPL_H_
-#define SKY_SERVICES_PLATFORM_IOS_PATH_PROVIDER_IMPL_H_
+#ifndef FLUTTER_SERVICES_PLATFORM_IOS_PATH_PROVIDER_IMPL_H_
+#define FLUTTER_SERVICES_PLATFORM_IOS_PATH_PROVIDER_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/platform/path_provider.mojom.h"
+#include "flutter/services/platform/path_provider.mojom.h"
namespace flutter {
namespace platform {
@@ -32,4 +32,4 @@
} // namespace platform
} // namespace flutter
-#endif // SKY_SERVICES_PLATFORM_IOS_PATH_PROVIDER_IMPL_H_
+#endif // FLUTTER_SERVICES_PLATFORM_IOS_PATH_PROVIDER_IMPL_H_
diff --git a/sky/services/platform/ios/path_provider_impl.mm b/services/platform/ios/path_provider_impl.mm
similarity index 94%
rename from sky/services/platform/ios/path_provider_impl.mm
rename to services/platform/ios/path_provider_impl.mm
index 9ab21a9..eb3140c 100644
--- a/sky/services/platform/ios/path_provider_impl.mm
+++ b/services/platform/ios/path_provider_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/platform/ios/path_provider_impl.h"
+#include "flutter/services/platform/ios/path_provider_impl.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include <Foundation/Foundation.h>
diff --git a/sky/services/platform/ios/system_chrome_impl.h b/services/platform/ios/system_chrome_impl.h
similarity index 85%
rename from sky/services/platform/ios/system_chrome_impl.h
rename to services/platform/ios/system_chrome_impl.h
index 8a0ef6d..42a540f 100644
--- a/sky/services/platform/ios/system_chrome_impl.h
+++ b/services/platform/ios/system_chrome_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_PLATFORM_IOS_SYSTEM_CHROME_IMPL_H_
-#define SKY_SERVICES_PLATFORM_IOS_SYSTEM_CHROME_IMPL_H_
+#ifndef FLUTTER_SERVICES_PLATFORM_IOS_SYSTEM_CHROME_IMPL_H_
+#define FLUTTER_SERVICES_PLATFORM_IOS_SYSTEM_CHROME_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/platform/system_chrome.mojom.h"
+#include "flutter/services/platform/system_chrome.mojom.h"
namespace flutter {
namespace platform {
@@ -48,4 +48,4 @@
} // namespace platform
} // namespace flutter
-#endif // SKY_SERVICES_PLATFORM_IOS_SYSTEM_CHROME_IMPL_H_
+#endif // FLUTTER_SERVICES_PLATFORM_IOS_SYSTEM_CHROME_IMPL_H_
diff --git a/sky/services/platform/ios/system_chrome_impl.mm b/services/platform/ios/system_chrome_impl.mm
similarity index 98%
rename from sky/services/platform/ios/system_chrome_impl.mm
rename to services/platform/ios/system_chrome_impl.mm
index 4082bbc..6117a80 100644
--- a/sky/services/platform/ios/system_chrome_impl.mm
+++ b/services/platform/ios/system_chrome_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/platform/ios/system_chrome_impl.h"
+#include "flutter/services/platform/ios/system_chrome_impl.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include <UIKit/UIApplication.h>
#include <UIKit/UIKit.h>
diff --git a/sky/services/platform/ios/system_sound_impl.h b/services/platform/ios/system_sound_impl.h
similarity index 73%
rename from sky/services/platform/ios/system_sound_impl.h
rename to services/platform/ios/system_sound_impl.h
index 37867f0..709bb38 100644
--- a/sky/services/platform/ios/system_sound_impl.h
+++ b/services/platform/ios/system_sound_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_PLATFORM_IOS_SYSTEM_SOUND_IMPL_H_
-#define SKY_SERVICES_PLATFORM_IOS_SYSTEM_SOUND_IMPL_H_
+#ifndef FLUTTER_SERVICES_PLATFORM_IOS_SYSTEM_SOUND_IMPL_H_
+#define FLUTTER_SERVICES_PLATFORM_IOS_SYSTEM_SOUND_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/platform/system_sound.mojom.h"
+#include "flutter/services/platform/system_sound.mojom.h"
namespace flutter {
namespace platform {
@@ -29,4 +29,4 @@
} // namespace platform
} // namespace flutter
-#endif // SKY_SERVICES_PLATFORM_IOS_SYSTEM_SOUND_IMPL_H_
+#endif // FLUTTER_SERVICES_PLATFORM_IOS_SYSTEM_SOUND_IMPL_H_
diff --git a/sky/services/platform/ios/system_sound_impl.mm b/services/platform/ios/system_sound_impl.mm
similarity index 94%
rename from sky/services/platform/ios/system_sound_impl.mm
rename to services/platform/ios/system_sound_impl.mm
index 7cfaec0..92bdc2e 100644
--- a/sky/services/platform/ios/system_sound_impl.mm
+++ b/services/platform/ios/system_sound_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/platform/ios/system_sound_impl.h"
+#include "flutter/services/platform/ios/system_sound_impl.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include <UIKit/UIKit.h>
diff --git a/sky/services/platform/ios/url_launcher_impl.h b/services/platform/ios/url_launcher_impl.h
similarity index 74%
rename from sky/services/platform/ios/url_launcher_impl.h
rename to services/platform/ios/url_launcher_impl.h
index fcf7bdf..0ae7d3a 100644
--- a/sky/services/platform/ios/url_launcher_impl.h
+++ b/services/platform/ios/url_launcher_impl.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_PLATFORM_IOS_URL_LAUNCHER_IMPL_H_
-#define SKY_SERVICES_PLATFORM_IOS_URL_LAUNCHER_IMPL_H_
+#ifndef FLUTTER_SERVICES_PLATFORM_IOS_URL_LAUNCHER_IMPL_H_
+#define FLUTTER_SERVICES_PLATFORM_IOS_URL_LAUNCHER_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "sky/services/platform/url_launcher.mojom.h"
+#include "flutter/services/platform/url_launcher.mojom.h"
namespace flutter {
namespace platform {
@@ -30,4 +30,4 @@
} // namespace platform
} // namespace flutter
-#endif // SKY_SERVICES_PLATFORM_IOS_URL_LAUNCHER_IMPL_H_
+#endif // FLUTTER_SERVICES_PLATFORM_IOS_URL_LAUNCHER_IMPL_H_
diff --git a/sky/services/platform/ios/url_launcher_impl.mm b/services/platform/ios/url_launcher_impl.mm
similarity index 93%
rename from sky/services/platform/ios/url_launcher_impl.mm
rename to services/platform/ios/url_launcher_impl.mm
index fca3b09..0251bdf 100644
--- a/sky/services/platform/ios/url_launcher_impl.mm
+++ b/services/platform/ios/url_launcher_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/platform/ios/url_launcher_impl.h"
+#include "flutter/services/platform/ios/url_launcher_impl.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include <UIKit/UIKit.h>
diff --git a/sky/services/platform/path_provider.mojom b/services/platform/path_provider.mojom
similarity index 100%
rename from sky/services/platform/path_provider.mojom
rename to services/platform/path_provider.mojom
diff --git a/sky/services/platform/src/org/domokit/platform/HapticFeedbackImpl.java b/services/platform/src/org/domokit/platform/HapticFeedbackImpl.java
similarity index 100%
rename from sky/services/platform/src/org/domokit/platform/HapticFeedbackImpl.java
rename to services/platform/src/org/domokit/platform/HapticFeedbackImpl.java
diff --git a/sky/services/platform/src/org/domokit/platform/PathProviderImpl.java b/services/platform/src/org/domokit/platform/PathProviderImpl.java
similarity index 100%
rename from sky/services/platform/src/org/domokit/platform/PathProviderImpl.java
rename to services/platform/src/org/domokit/platform/PathProviderImpl.java
diff --git a/sky/services/platform/src/org/domokit/platform/SystemChromeImpl.java b/services/platform/src/org/domokit/platform/SystemChromeImpl.java
similarity index 100%
rename from sky/services/platform/src/org/domokit/platform/SystemChromeImpl.java
rename to services/platform/src/org/domokit/platform/SystemChromeImpl.java
diff --git a/sky/services/platform/src/org/domokit/platform/SystemSoundImpl.java b/services/platform/src/org/domokit/platform/SystemSoundImpl.java
similarity index 100%
rename from sky/services/platform/src/org/domokit/platform/SystemSoundImpl.java
rename to services/platform/src/org/domokit/platform/SystemSoundImpl.java
diff --git a/sky/services/platform/src/org/domokit/platform/UrlLauncherImpl.java b/services/platform/src/org/domokit/platform/UrlLauncherImpl.java
similarity index 100%
rename from sky/services/platform/src/org/domokit/platform/UrlLauncherImpl.java
rename to services/platform/src/org/domokit/platform/UrlLauncherImpl.java
diff --git a/sky/services/platform/system_chrome.mojom b/services/platform/system_chrome.mojom
similarity index 100%
rename from sky/services/platform/system_chrome.mojom
rename to services/platform/system_chrome.mojom
diff --git a/sky/services/platform/system_sound.mojom b/services/platform/system_sound.mojom
similarity index 100%
rename from sky/services/platform/system_sound.mojom
rename to services/platform/system_sound.mojom
diff --git a/sky/services/platform/url_launcher.mojom b/services/platform/url_launcher.mojom
similarity index 100%
rename from sky/services/platform/url_launcher.mojom
rename to services/platform/url_launcher.mojom
diff --git a/sky/services/pointer/BUILD.gn b/services/pointer/BUILD.gn
similarity index 100%
rename from sky/services/pointer/BUILD.gn
rename to services/pointer/BUILD.gn
diff --git a/sky/services/pointer/pointer.mojom b/services/pointer/pointer.mojom
similarity index 100%
rename from sky/services/pointer/pointer.mojom
rename to services/pointer/pointer.mojom
diff --git a/sky/services/rasterizer/BUILD.gn b/services/rasterizer/BUILD.gn
similarity index 100%
rename from sky/services/rasterizer/BUILD.gn
rename to services/rasterizer/BUILD.gn
diff --git a/sky/services/rasterizer/rasterizer.mojom b/services/rasterizer/rasterizer.mojom
similarity index 100%
rename from sky/services/rasterizer/rasterizer.mojom
rename to services/rasterizer/rasterizer.mojom
diff --git a/sky/services/raw_keyboard/BUILD.gn b/services/raw_keyboard/BUILD.gn
similarity index 88%
rename from sky/services/raw_keyboard/BUILD.gn
rename to services/raw_keyboard/BUILD.gn
index eb59423..9fa13f6 100644
--- a/sky/services/raw_keyboard/BUILD.gn
+++ b/services/raw_keyboard/BUILD.gn
@@ -10,7 +10,7 @@
]
deps = [
- "//sky/services/engine:interfaces"
+ "//flutter/services/engine:interfaces"
]
}
@@ -28,7 +28,7 @@
"//base:base_java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//sky/services/engine:interfaces_java",
+ "//flutter/services/engine:interfaces_java",
":interfaces_java",
]
}
diff --git a/sky/services/raw_keyboard/raw_keyboard.mojom b/services/raw_keyboard/raw_keyboard.mojom
similarity index 88%
rename from sky/services/raw_keyboard/raw_keyboard.mojom
rename to services/raw_keyboard/raw_keyboard.mojom
index 8468e75..9719787 100644
--- a/sky/services/raw_keyboard/raw_keyboard.mojom
+++ b/services/raw_keyboard/raw_keyboard.mojom
@@ -5,7 +5,7 @@
[DartPackage="sky_services"]
module raw_keyboard;
-import "sky/services/engine/input_event.mojom";
+import "flutter/services/engine/input_event.mojom";
interface RawKeyboardListener {
OnKey(sky.InputEvent event);
diff --git a/sky/services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceImpl.java b/services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceImpl.java
similarity index 100%
rename from sky/services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceImpl.java
rename to services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceImpl.java
diff --git a/sky/services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceState.java b/services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceState.java
similarity index 100%
rename from sky/services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceState.java
rename to services/raw_keyboard/src/org/domokit/raw_keyboard/RawKeyboardServiceState.java
diff --git a/sky/services/semantics/BUILD.gn b/services/semantics/BUILD.gn
similarity index 100%
rename from sky/services/semantics/BUILD.gn
rename to services/semantics/BUILD.gn
diff --git a/sky/services/semantics/semantics.mojom b/services/semantics/semantics.mojom
similarity index 100%
rename from sky/services/semantics/semantics.mojom
rename to services/semantics/semantics.mojom
diff --git a/sky/services/vsync/BUILD.gn b/services/vsync/BUILD.gn
similarity index 100%
rename from sky/services/vsync/BUILD.gn
rename to services/vsync/BUILD.gn
diff --git a/sky/services/vsync/ios/vsync_provider_ios_impl.h b/services/vsync/ios/vsync_provider_ios_impl.h
similarity index 83%
rename from sky/services/vsync/ios/vsync_provider_ios_impl.h
rename to services/vsync/ios/vsync_provider_ios_impl.h
index 5183640..658283b 100644
--- a/sky/services/vsync/ios/vsync_provider_ios_impl.h
+++ b/services/vsync/ios/vsync_provider_ios_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_VSYNC_IOS_VSYNCPROVIDERIOSIMPL_H_
-#define SKY_SERVICES_VSYNC_IOS_VSYNCPROVIDERIOSIMPL_H_
+#ifndef FLUTTER_SERVICES_VSYNC_IOS_VSYNCPROVIDERIOSIMPL_H_
+#define FLUTTER_SERVICES_VSYNC_IOS_VSYNCPROVIDERIOSIMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
@@ -37,4 +37,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_VSYNC_IOS_VSYNCPROVIDERIOSIMPL_H_
+#endif // FLUTTER_SERVICES_VSYNC_IOS_VSYNCPROVIDERIOSIMPL_H_
diff --git a/sky/services/vsync/ios/vsync_provider_ios_impl.mm b/services/vsync/ios/vsync_provider_ios_impl.mm
similarity index 96%
rename from sky/services/vsync/ios/vsync_provider_ios_impl.mm
rename to services/vsync/ios/vsync_provider_ios_impl.mm
index c8cfebd..f425755 100644
--- a/sky/services/vsync/ios/vsync_provider_ios_impl.mm
+++ b/services/vsync/ios/vsync_provider_ios_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/vsync/ios/vsync_provider_ios_impl.h"
+#include "flutter/services/vsync/ios/vsync_provider_ios_impl.h"
#include "base/trace_event/trace_event.h"
#include <Foundation/Foundation.h>
diff --git a/sky/services/vsync/mac/vsync_provider_mac_impl.cc b/services/vsync/mac/vsync_provider_mac_impl.cc
similarity index 96%
rename from sky/services/vsync/mac/vsync_provider_mac_impl.cc
rename to services/vsync/mac/vsync_provider_mac_impl.cc
index f43e2a9..31d97bd 100644
--- a/sky/services/vsync/mac/vsync_provider_mac_impl.cc
+++ b/services/vsync/mac/vsync_provider_mac_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/services/vsync/mac/vsync_provider_mac_impl.h"
+#include "flutter/services/vsync/mac/vsync_provider_mac_impl.h"
#include "base/trace_event/trace_event.h"
#include <mach/mach_time.h>
diff --git a/sky/services/vsync/mac/vsync_provider_mac_impl.h b/services/vsync/mac/vsync_provider_mac_impl.h
similarity index 84%
rename from sky/services/vsync/mac/vsync_provider_mac_impl.h
rename to services/vsync/mac/vsync_provider_mac_impl.h
index 2fa636c..c1aa021 100644
--- a/sky/services/vsync/mac/vsync_provider_mac_impl.h
+++ b/services/vsync/mac/vsync_provider_mac_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKY_SERVICES_VSYNC_MAC_VSYNCPROVIDERMACIMPL_H_
-#define SKY_SERVICES_VSYNC_MAC_VSYNCPROVIDERMACIMPL_H_
+#ifndef FLUTTER_SERVICES_VSYNC_MAC_VSYNCPROVIDERMACIMPL_H_
+#define FLUTTER_SERVICES_VSYNC_MAC_VSYNCPROVIDERMACIMPL_H_
#include <vector>
@@ -40,4 +40,4 @@
} // namespace services
} // namespace sky
-#endif // SKY_SERVICES_VSYNC_MAC_VSYNCPROVIDERMACIMPL_H_
+#endif // FLUTTER_SERVICES_VSYNC_MAC_VSYNCPROVIDERMACIMPL_H_
diff --git a/sky/services/vsync/src/org/domokit/vsync/VSyncProviderImpl.java b/services/vsync/src/org/domokit/vsync/VSyncProviderImpl.java
similarity index 100%
rename from sky/services/vsync/src/org/domokit/vsync/VSyncProviderImpl.java
rename to services/vsync/src/org/domokit/vsync/VSyncProviderImpl.java
diff --git a/skia/ext/event_tracer_impl.cc b/skia/ext/event_tracer_impl.cc
index f6e12f0..3bad52d 100644
--- a/skia/ext/event_tracer_impl.cc
+++ b/skia/ext/event_tracer_impl.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/trace_event/trace_event.h"
-#include "skia/ext/event_tracer_impl.h"
+#include "flutter/skia/ext/event_tracer_impl.h"
#include "third_party/skia/include/utils/SkEventTracer.h"
namespace skia {
diff --git a/skia/ext/event_tracer_impl.h b/skia/ext/event_tracer_impl.h
index 31acd9b..6ee6dbdc 100644
--- a/skia/ext/event_tracer_impl.h
+++ b/skia/ext/event_tracer_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKIA_EXT_TRACE_EVENT_H_
-#define SKIA_EXT_TRACE_EVENT_H_
+#ifndef FLUTTER_SKIA_EXT_TRACE_EVENT_H_
+#define FLUTTER_SKIA_EXT_TRACE_EVENT_H_
#include "SkPreConfig.h"
diff --git a/sky/BUILD.gn b/sky/BUILD.gn
index bb8a6e5..2240543 100644
--- a/sky/BUILD.gn
+++ b/sky/BUILD.gn
@@ -2,27 +2,27 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//sky/engine/bindings/bindings.gni")
+import("//flutter/sky/engine/bindings/bindings.gni")
group("sky") {
testonly = true
deps = [
- "//sky/engine/platform:platform_unittests($host_toolchain)",
- "//sky/engine/wtf:unittests($host_toolchain)",
- "//sky/packages",
- "//sky/shell",
+ "//flutter/sky/engine/platform:platform_unittests($host_toolchain)",
+ "//flutter/sky/engine/wtf:unittests($host_toolchain)",
+ "//flutter/sky/packages",
+ "//flutter/sky/shell",
]
if (dart_host_toolchain == host_toolchain) {
- deps += [ "//sky/tools/sky_snapshot($dart_host_toolchain)" ]
+ deps += [ "//flutter/sky/tools/sky_snapshot($dart_host_toolchain)" ]
}
if (is_linux || is_android) {
- deps += [ "//sky/shell/platform/mojo" ]
+ deps += [ "//flutter/sky/shell/platform/mojo" ]
}
if (is_android) {
- deps += [ "//sky/services/activity" ]
+ deps += [ "//flutter/services/activity" ]
}
}
diff --git a/sky/dist/BUILD.gn b/sky/dist/BUILD.gn
index 3818ddc..d80e582 100644
--- a/sky/dist/BUILD.gn
+++ b/sky/dist/BUILD.gn
@@ -13,8 +13,8 @@
]
deps = [
- "//sky/shell",
- "//sky/shell/platform/mojo",
+ "//flutter/sky/shell",
+ "//flutter/sky/shell/platform/mojo",
]
} else if (is_mac) {
sources = [
@@ -22,7 +22,7 @@
]
deps = [
- "//sky/shell",
+ "//flutter/sky/shell",
]
} else if (!is_ios) {
sources = [
@@ -33,9 +33,9 @@
]
deps = [
- "//sky/shell",
- "//sky/shell/platform/mojo",
- "//sky/shell/platform/mojo",
+ "//flutter/sky/shell",
+ "//flutter/sky/shell/platform/mojo",
+ "//flutter/sky/shell/platform/mojo",
"//third_party/icu:icudata",
]
} else {
@@ -44,12 +44,12 @@
}
sky_snapshot_dir =
- get_label_info("//sky/tools/sky_snapshot($host_toolchain)", "root_out_dir")
+ get_label_info("//flutter/sky/tools/sky_snapshot($host_toolchain)", "root_out_dir")
sources += [ "$sky_snapshot_dir/sky_snapshot" ]
deps += [
- "//sky/tools/sky_snapshot($host_toolchain)",
+ "//flutter/sky/tools/sky_snapshot($host_toolchain)",
]
outputs = [ "$root_dist_dir/shell/{{source_file_part}}" ]
@@ -57,7 +57,7 @@
if (is_android) {
action("sky_engine") {
- script = "//sky/tools/dist_dart_pkg.py"
+ script = "//flutter/sky/tools/dist_dart_pkg.py"
source = "$root_gen_dir/dart-pkg/sky_engine"
dest = "$root_dist_dir/packages/sky_engine"
@@ -73,12 +73,12 @@
]
deps = [
- "//sky/packages/sky_engine",
+ "//flutter/sky/packages/sky_engine",
]
}
action("sky_services") {
- script = "//sky/tools/dist_dart_pkg.py"
+ script = "//flutter/sky/tools/dist_dart_pkg.py"
source = "$root_gen_dir/dart-pkg/sky_services"
dest = "$root_dist_dir/packages/sky_services"
@@ -94,7 +94,7 @@
]
deps = [
- "//sky/packages/sky_services",
+ "//flutter/sky/packages/sky_services",
]
}
}
diff --git a/sky/engine/BUILD.gn b/sky/engine/BUILD.gn
index 96b1f37..5c4b4a7 100644
--- a/sky/engine/BUILD.gn
+++ b/sky/engine/BUILD.gn
@@ -10,7 +10,7 @@
import("//build/config/gcc/gcc_version.gni")
}
-visibility = [ "//sky/*" ]
+visibility = [ "//flutter/sky/*" ]
# features ---------------------------------------------------------------------
@@ -48,8 +48,8 @@
group("engine") {
deps = [
- "//sky/engine/platform",
- "//sky/engine/public/sky",
- "//sky/engine/web",
+ "//flutter/sky/engine/platform",
+ "//flutter/sky/engine/public/sky",
+ "//flutter/sky/engine/web",
]
}
diff --git a/sky/engine/bindings/BUILD.gn b/sky/engine/bindings/BUILD.gn
index 8b426b5..cd61a83 100644
--- a/sky/engine/bindings/BUILD.gn
+++ b/sky/engine/bindings/BUILD.gn
@@ -5,8 +5,8 @@
import("//flutter/lib/jni/dart_jni.gni")
import("//flutter/lib/ui/dart_ui.gni")
import("//mojo/dart/packages/mojo/sdk_ext_sources.gni")
-import("//sky/engine/bindings/bindings.gni")
-import("//sky/engine/core/core.gni")
+import("//flutter/sky/engine/bindings/bindings.gni")
+import("//flutter/sky/engine/core/core.gni")
source_set("bindings") {
sources = [
@@ -38,10 +38,10 @@
"//mojo/public/cpp/system",
"//mojo/public/interfaces/application",
"//mojo/public/platform/dart:mojo_internal_impl",
- "//sky/engine/core:prerequisites",
- "//sky/engine/platform:platform",
- "//sky/engine/wtf",
- "//sky/services/engine:interfaces",
+ "//flutter/sky/engine/core:prerequisites",
+ "//flutter/sky/engine/platform:platform",
+ "//flutter/sky/engine/wtf",
+ "//flutter/services/engine:interfaces",
]
if (is_android) {
diff --git a/sky/engine/bindings/bindings.gni b/sky/engine/bindings/bindings.gni
index b308cb6..4d8946b 100644
--- a/sky/engine/bindings/bindings.gni
+++ b/sky/engine/bindings/bindings.gni
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//mojo/dart/packages/mojo/sdk_ext_sources.gni")
-import("//sky/engine/config.gni")
+import("//flutter/sky/engine/config.gni")
bindings_output_dir = "$root_gen_dir/sky/bindings"
diff --git a/sky/engine/bindings/dart_mojo_internal.cc b/sky/engine/bindings/dart_mojo_internal.cc
index b131435..bd06d5d 100644
--- a/sky/engine/bindings/dart_mojo_internal.cc
+++ b/sky/engine/bindings/dart_mojo_internal.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/bindings/dart_mojo_internal.h"
+#include "flutter/sky/engine/bindings/dart_mojo_internal.h"
#include "dart/runtime/include/dart_api.h"
#include "lib/tonic/logging/dart_error.h"
diff --git a/sky/engine/bindings/dart_runtime_hooks.cc b/sky/engine/bindings/dart_runtime_hooks.cc
index dcb3eb6..b7defb7 100644
--- a/sky/engine/bindings/dart_runtime_hooks.cc
+++ b/sky/engine/bindings/dart_runtime_hooks.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/bindings/dart_runtime_hooks.h"
+#include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
#include <stdio.h>
#include <stdlib.h>
@@ -20,8 +20,8 @@
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/scopes/dart_api_scope.h"
#include "lib/tonic/scopes/dart_isolate_scope.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#if defined(OS_ANDROID)
#include <android/log.h>
diff --git a/sky/engine/bindings/dart_ui.cc b/sky/engine/bindings/dart_ui.cc
index f513a40..516e88f 100644
--- a/sky/engine/bindings/dart_ui.cc
+++ b/sky/engine/bindings/dart_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/bindings/dart_ui.h"
+#include "flutter/sky/engine/bindings/dart_ui.h"
#include "flutter/lib/ui/compositing/scene.h"
#include "flutter/lib/ui/compositing/scene_builder.h"
@@ -18,11 +18,11 @@
#include "flutter/lib/ui/painting/picture_recorder.h"
#include "lib/tonic/converter/dart_converter.h"
#include "lib/tonic/logging/dart_error.h"
-#include "sky/engine/bindings/dart_runtime_hooks.h"
-#include "sky/engine/bindings/mojo_services.h"
-#include "sky/engine/core/text/Paragraph.h"
-#include "sky/engine/core/text/ParagraphBuilder.h"
-#include "sky/engine/core/window/window.h"
+#include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
+#include "flutter/sky/engine/bindings/mojo_services.h"
+#include "flutter/sky/engine/core/text/Paragraph.h"
+#include "flutter/sky/engine/core/text/ParagraphBuilder.h"
+#include "flutter/sky/engine/core/window/window.h"
using tonic::ToDart;
diff --git a/sky/engine/bindings/flutter_dart_state.cc b/sky/engine/bindings/flutter_dart_state.cc
index 157bd36..6eaba33 100644
--- a/sky/engine/bindings/flutter_dart_state.cc
+++ b/sky/engine/bindings/flutter_dart_state.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/bindings/flutter_dart_state.h"
+#include "flutter/sky/engine/bindings/flutter_dart_state.h"
#include "lib/tonic/converter/dart_converter.h"
-#include "sky/engine/bindings/mojo_services.h"
+#include "flutter/sky/engine/bindings/mojo_services.h"
#ifdef OS_ANDROID
#include "flutter/lib/jni/dart_jni.h"
diff --git a/sky/engine/bindings/mojo_services.cc b/sky/engine/bindings/mojo_services.cc
index 6755567..2dba444 100644
--- a/sky/engine/bindings/mojo_services.cc
+++ b/sky/engine/bindings/mojo_services.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/bindings/mojo_services.h"
+#include "flutter/sky/engine/bindings/mojo_services.h"
#include "lib/tonic/converter/dart_converter.h"
#include "lib/tonic/logging/dart_error.h"
@@ -10,7 +10,7 @@
#include "flutter/tonic/dart_state.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "sky/engine/bindings/flutter_dart_state.h"
+#include "flutter/sky/engine/bindings/flutter_dart_state.h"
namespace blink {
namespace {
diff --git a/sky/engine/bindings/mojo_services.h b/sky/engine/bindings/mojo_services.h
index c181241..8865494 100644
--- a/sky/engine/bindings/mojo_services.h
+++ b/sky/engine/bindings/mojo_services.h
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
-#include "sky/services/engine/sky_engine.mojom.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
namespace mojo {
class ApplicationConnection;
diff --git a/sky/engine/core/BUILD.gn b/sky/engine/core/BUILD.gn
index 86f0347..bcdc3a0 100644
--- a/sky/engine/core/BUILD.gn
+++ b/sky/engine/core/BUILD.gn
@@ -2,18 +2,18 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//sky/engine/core/core.gni")
+import("//flutter/sky/engine/core/core.gni")
import("//mojo/dart/embedder/embedder.gni")
-visibility = [ "//sky/engine/*", "//sky/shell/*" ]
+visibility = [ "//flutter/sky/engine/*", "//flutter/sky/shell/*" ]
source_set("libraries") {
public_deps = [
"//base",
- "//flow",
+ "//flutter/flow",
"//flutter/lib/ui",
"//flutter/tonic",
- "//glue",
+ "//flutter/glue",
"//lib/ftl",
"//lib/tonic",
"//mojo/application",
@@ -24,8 +24,8 @@
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
"//mojo/public/platform/dart:mojo_internal_impl",
- "//skia",
- "//sky/engine/wtf",
+ "//flutter/skia",
+ "//flutter/sky/engine/wtf",
"//third_party/iccjpeg",
"//third_party/libpng",
"//third_party/qcms",
@@ -42,14 +42,14 @@
source_set("prerequisites") {
deps = [
":libraries",
- "//sky/engine/platform",
+ "//flutter/sky/engine/platform",
]
forward_dependent_configs_from = [ ":libraries" ]
direct_dependent_configs = [
- "//sky/engine:config",
- "//sky/engine:inside_blink",
+ "//flutter/sky/engine:config",
+ "//flutter/sky/engine:inside_blink",
"//build/config/compiler:wexit_time_destructors",
]
}
@@ -81,10 +81,10 @@
"//dart/runtime/vm:libdart_platform",
"//flutter/assets",
"//mojo/services/navigation/interfaces",
- "//sky/engine/bindings",
- "//sky/engine/platform",
- "//sky/services/engine:interfaces",
- "//sky/services/pointer:interfaces",
+ "//flutter/sky/engine/bindings",
+ "//flutter/sky/engine/platform",
+ "//flutter/services/engine:interfaces",
+ "//flutter/services/pointer:interfaces",
]
if (!flutter_product_mode) {
@@ -107,6 +107,6 @@
# core and core_generated are really the same thing.
allow_circular_includes_from = [
- "//sky/engine/bindings",
+ "//flutter/sky/engine/bindings",
]
}
diff --git a/sky/engine/core/Init.cpp b/sky/engine/core/Init.cpp
index f9f37b8..7371c79 100644
--- a/sky/engine/core/Init.cpp
+++ b/sky/engine/core/Init.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/Init.h"
+#include "flutter/sky/engine/core/Init.h"
-#include "sky/engine/platform/Partitions.h"
-#include "sky/engine/wtf/text/StringImpl.h"
-#include "sky/engine/wtf/text/StringStatics.h"
+#include "flutter/sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/StringStatics.h"
namespace blink {
diff --git a/sky/engine/core/editing/CompositionUnderline.h b/sky/engine/core/editing/CompositionUnderline.h
index 3737a88..516a0cd 100644
--- a/sky/engine/core/editing/CompositionUnderline.h
+++ b/sky/engine/core/editing/CompositionUnderline.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_CORE_EDITING_COMPOSITIONUNDERLINE_H_
#define SKY_ENGINE_CORE_EDITING_COMPOSITIONUNDERLINE_H_
-#include "sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
namespace blink {
diff --git a/sky/engine/core/editing/CompositionUnderlineRangeFilter.cpp b/sky/engine/core/editing/CompositionUnderlineRangeFilter.cpp
index 8c724b3..803899f 100644
--- a/sky/engine/core/editing/CompositionUnderlineRangeFilter.cpp
+++ b/sky/engine/core/editing/CompositionUnderlineRangeFilter.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/editing/CompositionUnderlineRangeFilter.h"
+#include "flutter/sky/engine/core/editing/CompositionUnderlineRangeFilter.h"
namespace blink {
diff --git a/sky/engine/core/editing/CompositionUnderlineRangeFilter.h b/sky/engine/core/editing/CompositionUnderlineRangeFilter.h
index 1fe7bab..f58817d 100644
--- a/sky/engine/core/editing/CompositionUnderlineRangeFilter.h
+++ b/sky/engine/core/editing/CompositionUnderlineRangeFilter.h
@@ -5,9 +5,9 @@
#ifndef SKY_ENGINE_CORE_EDITING_COMPOSITIONUNDERLINERANGEFILTER_H_
#define SKY_ENGINE_CORE_EDITING_COMPOSITIONUNDERLINERANGEFILTER_H_
-#include "sky/engine/core/editing/CompositionUnderline.h"
-#include "sky/engine/wtf/NotFound.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/core/editing/CompositionUnderline.h"
+#include "flutter/sky/engine/wtf/NotFound.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/core/editing/PositionWithAffinity.cpp b/sky/engine/core/editing/PositionWithAffinity.cpp
index 3df5f74..9e82c46 100644
--- a/sky/engine/core/editing/PositionWithAffinity.cpp
+++ b/sky/engine/core/editing/PositionWithAffinity.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/editing/PositionWithAffinity.h"
+#include "flutter/sky/engine/core/editing/PositionWithAffinity.h"
namespace blink {
diff --git a/sky/engine/core/rendering/BidiRun.h b/sky/engine/core/rendering/BidiRun.h
index 14aa2ab..07c0485 100644
--- a/sky/engine/core/rendering/BidiRun.h
+++ b/sky/engine/core/rendering/BidiRun.h
@@ -24,9 +24,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_BIDIRUN_H_
#define SKY_ENGINE_CORE_RENDERING_BIDIRUN_H_
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/platform/text/BidiResolver.h"
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
namespace blink {
diff --git a/sky/engine/core/rendering/BidiRunForLine.cpp b/sky/engine/core/rendering/BidiRunForLine.cpp
index e00ef0e..ff24b68 100644
--- a/sky/engine/core/rendering/BidiRunForLine.cpp
+++ b/sky/engine/core/rendering/BidiRunForLine.cpp
@@ -21,9 +21,9 @@
*
*/
-#include "sky/engine/core/rendering/BidiRunForLine.h"
+#include "flutter/sky/engine/core/rendering/BidiRunForLine.h"
-#include "sky/engine/core/rendering/InlineIterator.h"
+#include "flutter/sky/engine/core/rendering/InlineIterator.h"
namespace blink {
diff --git a/sky/engine/core/rendering/BidiRunForLine.h b/sky/engine/core/rendering/BidiRunForLine.h
index 108ef23..3c3674d 100644
--- a/sky/engine/core/rendering/BidiRunForLine.h
+++ b/sky/engine/core/rendering/BidiRunForLine.h
@@ -24,8 +24,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_BIDIRUNFORLINE_H_
#define SKY_ENGINE_CORE_RENDERING_BIDIRUNFORLINE_H_
-#include "sky/engine/core/rendering/line/TrailingObjects.h"
-#include "sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/core/rendering/line/TrailingObjects.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
namespace blink {
diff --git a/sky/engine/core/rendering/ClipPathOperation.h b/sky/engine/core/rendering/ClipPathOperation.h
index b58d796..1807f07 100644
--- a/sky/engine/core/rendering/ClipPathOperation.h
+++ b/sky/engine/core/rendering/ClipPathOperation.h
@@ -30,11 +30,11 @@
#ifndef SKY_ENGINE_CORE_RENDERING_CLIPPATHOPERATION_H_
#define SKY_ENGINE_CORE_RENDERING_CLIPPATHOPERATION_H_
-#include "sky/engine/platform/graphics/Path.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/graphics/Path.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/core/rendering/ClipRect.cpp b/sky/engine/core/rendering/ClipRect.cpp
index 22e7579..d0a562b 100644
--- a/sky/engine/core/rendering/ClipRect.cpp
+++ b/sky/engine/core/rendering/ClipRect.cpp
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/ClipRect.h"
+#include "flutter/sky/engine/core/rendering/ClipRect.h"
-#include "sky/engine/core/rendering/HitTestLocation.h"
+#include "flutter/sky/engine/core/rendering/HitTestLocation.h"
namespace blink {
diff --git a/sky/engine/core/rendering/ClipRect.h b/sky/engine/core/rendering/ClipRect.h
index 62e6ba7..efc86d0 100644
--- a/sky/engine/core/rendering/ClipRect.h
+++ b/sky/engine/core/rendering/ClipRect.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_CLIPRECT_H_
#define SKY_ENGINE_CORE_RENDERING_CLIPRECT_H_
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/ClipRects.h b/sky/engine/core/rendering/ClipRects.h
index f1502e5..6b4fcda 100644
--- a/sky/engine/core/rendering/ClipRects.h
+++ b/sky/engine/core/rendering/ClipRects.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_CLIPRECTS_H_
#define SKY_ENGINE_CORE_RENDERING_CLIPRECTS_H_
-#include "sky/engine/core/rendering/ClipRect.h"
+#include "flutter/sky/engine/core/rendering/ClipRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/ClipRectsCache.h b/sky/engine/core/rendering/ClipRectsCache.h
index 657d783..5553d52 100644
--- a/sky/engine/core/rendering/ClipRectsCache.h
+++ b/sky/engine/core/rendering/ClipRectsCache.h
@@ -5,7 +5,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_CLIPRECTSCACHE_H_
#define SKY_ENGINE_CORE_RENDERING_CLIPRECTSCACHE_H_
-#include "sky/engine/core/rendering/ClipRects.h"
+#include "flutter/sky/engine/core/rendering/ClipRects.h"
namespace blink {
diff --git a/sky/engine/core/rendering/GapRects.h b/sky/engine/core/rendering/GapRects.h
index 678b1ba..21b9663 100644
--- a/sky/engine/core/rendering/GapRects.h
+++ b/sky/engine/core/rendering/GapRects.h
@@ -23,7 +23,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_GAPRECTS_H_
#define SKY_ENGINE_CORE_RENDERING_GAPRECTS_H_
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/HitTestLocation.cpp b/sky/engine/core/rendering/HitTestLocation.cpp
index ca2afd4..d7e4901 100644
--- a/sky/engine/core/rendering/HitTestLocation.cpp
+++ b/sky/engine/core/rendering/HitTestLocation.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "sky/engine/core/rendering/HitTestLocation.h"
+#include "flutter/sky/engine/core/rendering/HitTestLocation.h"
namespace blink {
diff --git a/sky/engine/core/rendering/HitTestLocation.h b/sky/engine/core/rendering/HitTestLocation.h
index bb15c0f..5a10f16 100644
--- a/sky/engine/core/rendering/HitTestLocation.h
+++ b/sky/engine/core/rendering/HitTestLocation.h
@@ -22,14 +22,14 @@
#ifndef SKY_ENGINE_CORE_RENDERING_HITTESTLOCATION_H_
#define SKY_ENGINE_CORE_RENDERING_HITTESTLOCATION_H_
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/platform/geometry/RoundedRect.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/ListHashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/HitTestResult.cpp b/sky/engine/core/rendering/HitTestResult.cpp
index c8c6379..e377d89 100644
--- a/sky/engine/core/rendering/HitTestResult.cpp
+++ b/sky/engine/core/rendering/HitTestResult.cpp
@@ -19,10 +19,10 @@
*
*/
-#include "sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/RenderBox.h"
-#include "sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
namespace blink {
diff --git a/sky/engine/core/rendering/HitTestResult.h b/sky/engine/core/rendering/HitTestResult.h
index acfcb65..02ecfea 100644
--- a/sky/engine/core/rendering/HitTestResult.h
+++ b/sky/engine/core/rendering/HitTestResult.h
@@ -22,17 +22,17 @@
#ifndef SKY_ENGINE_CORE_RENDERING_HITTESTRESULT_H_
#define SKY_ENGINE_CORE_RENDERING_HITTESTRESULT_H_
-#include "sky/engine/core/rendering/HitTestLocation.h"
-#include "sky/engine/core/rendering/HitTestRequest.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/platform/heap/Handle.h"
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/ListHashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/core/rendering/HitTestLocation.h"
+#include "flutter/sky/engine/core/rendering/HitTestRequest.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/heap/Handle.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/HitTestingTransformState.cpp b/sky/engine/core/rendering/HitTestingTransformState.cpp
index e9d0dc4..bc6f228 100644
--- a/sky/engine/core/rendering/HitTestingTransformState.cpp
+++ b/sky/engine/core/rendering/HitTestingTransformState.cpp
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/HitTestingTransformState.h"
+#include "flutter/sky/engine/core/rendering/HitTestingTransformState.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/HitTestingTransformState.h b/sky/engine/core/rendering/HitTestingTransformState.h
index cef4123..d4eaf51 100644
--- a/sky/engine/core/rendering/HitTestingTransformState.h
+++ b/sky/engine/core/rendering/HitTestingTransformState.h
@@ -26,13 +26,13 @@
#ifndef SKY_ENGINE_CORE_RENDERING_HITTESTINGTRANSFORMSTATE_H_
#define SKY_ENGINE_CORE_RENDERING_HITTESTINGTRANSFORMSTATE_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/InlineBox.cpp b/sky/engine/core/rendering/InlineBox.cpp
index f82fd63..b464cc3 100644
--- a/sky/engine/core/rendering/InlineBox.cpp
+++ b/sky/engine/core/rendering/InlineBox.cpp
@@ -17,15 +17,15 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/InlineBox.h"
+#include "flutter/sky/engine/core/rendering/InlineBox.h"
-#include "sky/engine/core/rendering/InlineFlowBox.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RootInlineBox.h"
-#include "sky/engine/platform/Partitions.h"
-#include "sky/engine/platform/fonts/FontMetrics.h"
+#include "flutter/sky/engine/core/rendering/InlineFlowBox.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RootInlineBox.h"
+#include "flutter/sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/platform/fonts/FontMetrics.h"
#ifndef NDEBUG
#include <stdio.h>
diff --git a/sky/engine/core/rendering/InlineBox.h b/sky/engine/core/rendering/InlineBox.h
index 16a447f..67aac48 100644
--- a/sky/engine/core/rendering/InlineBox.h
+++ b/sky/engine/core/rendering/InlineBox.h
@@ -21,9 +21,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_INLINEBOX_H_
#define SKY_ENGINE_CORE_RENDERING_INLINEBOX_H_
-#include "sky/engine/core/rendering/RenderBoxModelObject.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/core/rendering/RenderBoxModelObject.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
namespace blink {
diff --git a/sky/engine/core/rendering/InlineFlowBox.cpp b/sky/engine/core/rendering/InlineFlowBox.cpp
index 765acb1..8de7319 100644
--- a/sky/engine/core/rendering/InlineFlowBox.cpp
+++ b/sky/engine/core/rendering/InlineFlowBox.cpp
@@ -17,19 +17,19 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/InlineFlowBox.h"
+#include "flutter/sky/engine/core/rendering/InlineFlowBox.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/RootInlineBox.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/RootInlineBox.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
#include <math.h>
diff --git a/sky/engine/core/rendering/InlineFlowBox.h b/sky/engine/core/rendering/InlineFlowBox.h
index 9f90a8d..0760340 100644
--- a/sky/engine/core/rendering/InlineFlowBox.h
+++ b/sky/engine/core/rendering/InlineFlowBox.h
@@ -21,10 +21,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_INLINEFLOWBOX_H_
#define SKY_ENGINE_CORE_RENDERING_INLINEFLOWBOX_H_
-#include "sky/engine/core/rendering/InlineBox.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RenderOverflow.h"
-#include "sky/engine/core/rendering/style/ShadowData.h"
+#include "flutter/sky/engine/core/rendering/InlineBox.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RenderOverflow.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowData.h"
namespace blink {
diff --git a/sky/engine/core/rendering/InlineIterator.h b/sky/engine/core/rendering/InlineIterator.h
index 6287c92..7422071 100644
--- a/sky/engine/core/rendering/InlineIterator.h
+++ b/sky/engine/core/rendering/InlineIterator.h
@@ -23,12 +23,12 @@
#ifndef SKY_ENGINE_CORE_RENDERING_INLINEITERATOR_H_
#define SKY_ENGINE_CORE_RENDERING_INLINEITERATOR_H_
-#include "sky/engine/core/rendering/BidiRun.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/core/rendering/line/TrailingObjects.h"
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/core/rendering/BidiRun.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/core/rendering/line/TrailingObjects.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
namespace blink {
diff --git a/sky/engine/core/rendering/InlineTextBox.cpp b/sky/engine/core/rendering/InlineTextBox.cpp
index 389bce2..c86b76f 100644
--- a/sky/engine/core/rendering/InlineTextBox.cpp
+++ b/sky/engine/core/rendering/InlineTextBox.cpp
@@ -20,23 +20,23 @@
*
*/
-#include "sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/editing/CompositionUnderline.h"
-#include "sky/engine/core/editing/CompositionUnderlineRangeFilter.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderTheme.h"
-#include "sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/platform/animation/UnitBezier.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/GlyphBuffer.h"
-#include "sky/engine/platform/fonts/WidthIterator.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/core/editing/CompositionUnderline.h"
+#include "flutter/sky/engine/core/editing/CompositionUnderlineRangeFilter.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderTheme.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/platform/animation/UnitBezier.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/GlyphBuffer.h"
+#include "flutter/sky/engine/platform/fonts/WidthIterator.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
#include <algorithm>
diff --git a/sky/engine/core/rendering/InlineTextBox.h b/sky/engine/core/rendering/InlineTextBox.h
index 7403b42..16b0666 100644
--- a/sky/engine/core/rendering/InlineTextBox.h
+++ b/sky/engine/core/rendering/InlineTextBox.h
@@ -23,12 +23,12 @@
#ifndef SKY_ENGINE_CORE_RENDERING_INLINETEXTBOX_H_
#define SKY_ENGINE_CORE_RENDERING_INLINETEXTBOX_H_
-#include "sky/engine/core/editing/CompositionUnderline.h"
-#include "sky/engine/core/rendering/InlineBox.h"
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/core/editing/CompositionUnderline.h"
+#include "flutter/sky/engine/core/rendering/InlineBox.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/wtf/Forward.h"
namespace blink {
diff --git a/sky/engine/core/rendering/LayerPaintingInfo.h b/sky/engine/core/rendering/LayerPaintingInfo.h
index 132041a..f20ae86 100644
--- a/sky/engine/core/rendering/LayerPaintingInfo.h
+++ b/sky/engine/core/rendering/LayerPaintingInfo.h
@@ -45,8 +45,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LAYERPAINTINGINFO_H_
#define SKY_ENGINE_CORE_RENDERING_LAYERPAINTINGINFO_H_
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/OrderIterator.cpp b/sky/engine/core/rendering/OrderIterator.cpp
index 69fd9a2..08073fa 100644
--- a/sky/engine/core/rendering/OrderIterator.cpp
+++ b/sky/engine/core/rendering/OrderIterator.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/OrderIterator.h"
+#include "flutter/sky/engine/core/rendering/OrderIterator.h"
-#include "sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
namespace blink {
diff --git a/sky/engine/core/rendering/OrderIterator.h b/sky/engine/core/rendering/OrderIterator.h
index ab95ac0..bdbfdf8 100644
--- a/sky/engine/core/rendering/OrderIterator.h
+++ b/sky/engine/core/rendering/OrderIterator.h
@@ -32,7 +32,7 @@
#define SKY_ENGINE_CORE_RENDERING_ORDERITERATOR_H_
#include <set>
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace blink {
diff --git a/sky/engine/core/rendering/PaintInfo.h b/sky/engine/core/rendering/PaintInfo.h
index bc5d223..5ed9740 100644
--- a/sky/engine/core/rendering/PaintInfo.h
+++ b/sky/engine/core/rendering/PaintInfo.h
@@ -27,12 +27,12 @@
#define SKY_ENGINE_CORE_RENDERING_PAINTINFO_H_
#include <limits>
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
namespace blink {
diff --git a/sky/engine/core/rendering/PointerEventsHitRules.cpp b/sky/engine/core/rendering/PointerEventsHitRules.cpp
index 4e4da69..e64b3e7 100644
--- a/sky/engine/core/rendering/PointerEventsHitRules.cpp
+++ b/sky/engine/core/rendering/PointerEventsHitRules.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/PointerEventsHitRules.h"
+#include "flutter/sky/engine/core/rendering/PointerEventsHitRules.h"
namespace blink {
diff --git a/sky/engine/core/rendering/PointerEventsHitRules.h b/sky/engine/core/rendering/PointerEventsHitRules.h
index 70e9847..075f304 100644
--- a/sky/engine/core/rendering/PointerEventsHitRules.h
+++ b/sky/engine/core/rendering/PointerEventsHitRules.h
@@ -20,8 +20,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_POINTEREVENTSHITRULES_H_
#define SKY_ENGINE_CORE_RENDERING_POINTEREVENTSHITRULES_H_
-#include "sky/engine/core/rendering/HitTestRequest.h"
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/HitTestRequest.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
index 8b13b3b..865d8db 100644
--- a/sky/engine/core/rendering/RenderBlock.cpp
+++ b/sky/engine/core/rendering/RenderBlock.cpp
@@ -21,25 +21,25 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/HitTestLocation.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/InlineIterator.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderFlexibleBox.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/TemporaryChange.h"
+#include "flutter/sky/engine/core/rendering/HitTestLocation.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/InlineIterator.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderFlexibleBox.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/TemporaryChange.h"
using namespace WTF;
using namespace Unicode;
diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
index 36d4200..075c940 100644
--- a/sky/engine/core/rendering/RenderBlock.h
+++ b/sky/engine/core/rendering/RenderBlock.h
@@ -23,15 +23,15 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_
-#include "sky/engine/core/rendering/GapRects.h"
-#include "sky/engine/core/rendering/RenderBox.h"
-#include "sky/engine/core/rendering/RenderLineBoxList.h"
-#include "sky/engine/core/rendering/RootInlineBox.h"
-#include "sky/engine/core/rendering/style/ShapeValue.h"
-#include "sky/engine/platform/text/TextBreakIterator.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/ListHashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/core/rendering/GapRects.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/RenderLineBoxList.h"
+#include "flutter/sky/engine/core/rendering/RootInlineBox.h"
+#include "flutter/sky/engine/core/rendering/style/ShapeValue.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index 9aef3a4..5454a3f 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -23,22 +23,22 @@
*
*/
-#include "sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
#include <math.h>
#include <algorithm>
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/HitTestingTransformState.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderFlexibleBox.h"
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/HitTestingTransformState.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderFlexibleBox.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
index ab8106b..91cdbe0 100644
--- a/sky/engine/core/rendering/RenderBox.h
+++ b/sky/engine/core/rendering/RenderBox.h
@@ -23,8 +23,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_
-#include "sky/engine/core/rendering/RenderBoxModelObject.h"
-#include "sky/engine/core/rendering/RenderOverflow.h"
+#include "flutter/sky/engine/core/rendering/RenderBoxModelObject.h"
+#include "flutter/sky/engine/core/rendering/RenderOverflow.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderBoxModelObject.cpp b/sky/engine/core/rendering/RenderBoxModelObject.cpp
index 12f019a..d6d7df0 100644
--- a/sky/engine/core/rendering/RenderBoxModelObject.cpp
+++ b/sky/engine/core/rendering/RenderBoxModelObject.cpp
@@ -23,20 +23,20 @@
*
*/
-#include "sky/engine/core/rendering/RenderBoxModelObject.h"
+#include "flutter/sky/engine/core/rendering/RenderBoxModelObject.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/DrawLooperBuilder.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
-#include "sky/engine/platform/graphics/Path.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/DrawLooperBuilder.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/platform/graphics/Path.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderBoxModelObject.h b/sky/engine/core/rendering/RenderBoxModelObject.h
index 085966c..b963a4e 100644
--- a/sky/engine/core/rendering/RenderBoxModelObject.h
+++ b/sky/engine/core/rendering/RenderBoxModelObject.h
@@ -24,9 +24,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERBOXMODELOBJECT_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERBOXMODELOBJECT_H_
-#include "sky/engine/core/rendering/RenderObject.h"
-#include "sky/engine/core/rendering/style/ShadowData.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowData.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderFlexibleBox.cpp b/sky/engine/core/rendering/RenderFlexibleBox.cpp
index 903dde2..9b94964 100644
--- a/sky/engine/core/rendering/RenderFlexibleBox.cpp
+++ b/sky/engine/core/rendering/RenderFlexibleBox.cpp
@@ -28,13 +28,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderFlexibleBox.h"
+#include "flutter/sky/engine/core/rendering/RenderFlexibleBox.h"
#include <limits>
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderFlexibleBox.h b/sky/engine/core/rendering/RenderFlexibleBox.h
index 649700f..33d6f00 100644
--- a/sky/engine/core/rendering/RenderFlexibleBox.h
+++ b/sky/engine/core/rendering/RenderFlexibleBox.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERFLEXIBLEBOX_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERFLEXIBLEBOX_H_
-#include "sky/engine/core/rendering/OrderIterator.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/OrderIterator.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderGeometryMap.cpp b/sky/engine/core/rendering/RenderGeometryMap.cpp
index 8ee602f..392640b 100644
--- a/sky/engine/core/rendering/RenderGeometryMap.cpp
+++ b/sky/engine/core/rendering/RenderGeometryMap.cpp
@@ -23,12 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/wtf/TemporaryChange.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/wtf/TemporaryChange.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderGeometryMap.h b/sky/engine/core/rendering/RenderGeometryMap.h
index 81fb730..7fc1b3e 100644
--- a/sky/engine/core/rendering/RenderGeometryMap.h
+++ b/sky/engine/core/rendering/RenderGeometryMap.h
@@ -26,13 +26,13 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERGEOMETRYMAP_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERGEOMETRYMAP_H_
-#include "sky/engine/core/rendering/RenderGeometryMapStep.h"
-#include "sky/engine/core/rendering/RenderObject.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/geometry/LayoutSize.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMapStep.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderGeometryMapStep.h b/sky/engine/core/rendering/RenderGeometryMapStep.h
index deb6b0a..2fae106 100644
--- a/sky/engine/core/rendering/RenderGeometryMapStep.h
+++ b/sky/engine/core/rendering/RenderGeometryMapStep.h
@@ -27,9 +27,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERGEOMETRYMAPSTEP_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERGEOMETRYMAPSTEP_H_
-#include "sky/engine/platform/geometry/LayoutSize.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderInline.cpp b/sky/engine/core/rendering/RenderInline.cpp
index 32f5b83..d520be7 100644
--- a/sky/engine/core/rendering/RenderInline.cpp
+++ b/sky/engine/core/rendering/RenderInline.cpp
@@ -20,19 +20,19 @@
*
*/
-#include "sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/StyleInheritedData.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/Region.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/style/StyleInheritedData.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/Region.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderInline.h b/sky/engine/core/rendering/RenderInline.h
index 8f07ba1..563cf57 100644
--- a/sky/engine/core/rendering/RenderInline.h
+++ b/sky/engine/core/rendering/RenderInline.h
@@ -23,9 +23,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERINLINE_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERINLINE_H_
-#include "sky/engine/core/rendering/InlineFlowBox.h"
-#include "sky/engine/core/rendering/RenderBoxModelObject.h"
-#include "sky/engine/core/rendering/RenderLineBoxList.h"
+#include "flutter/sky/engine/core/rendering/InlineFlowBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBoxModelObject.h"
+#include "flutter/sky/engine/core/rendering/RenderLineBoxList.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
index bc66f64..50fea28 100644
--- a/sky/engine/core/rendering/RenderLayer.cpp
+++ b/sky/engine/core/rendering/RenderLayer.cpp
@@ -41,27 +41,27 @@
* version of this file under any of the LGPL, the MPL or the GPL.
*/
-#include "sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/HitTestRequest.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/HitTestingTransformState.h"
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderTreeAsText.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/Partitions.h"
-#include "sky/engine/platform/geometry/FloatPoint3D.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
-#include "sky/engine/platform/transforms/ScaleTransformOperation.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
-#include "sky/engine/platform/transforms/TranslateTransformOperation.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/core/rendering/HitTestRequest.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/HitTestingTransformState.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderTreeAsText.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint3D.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/platform/transforms/ScaleTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/platform/transforms/TranslateTransformOperation.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h
index 80a393c..7430887 100644
--- a/sky/engine/core/rendering/RenderLayer.h
+++ b/sky/engine/core/rendering/RenderLayer.h
@@ -45,13 +45,13 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_
-#include "sky/engine/core/rendering/LayerPaintingInfo.h"
-#include "sky/engine/core/rendering/RenderBox.h"
-#include "sky/engine/core/rendering/RenderLayerClipper.h"
-#include "sky/engine/core/rendering/RenderLayerStackingNode.h"
-#include "sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
-#include "sky/engine/public/platform/WebBlendMode.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/core/rendering/LayerPaintingInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerClipper.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerStackingNode.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
+#include "flutter/sky/engine/public/platform/WebBlendMode.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayerClipper.cpp b/sky/engine/core/rendering/RenderLayerClipper.cpp
index e2ca95c..34af475 100644
--- a/sky/engine/core/rendering/RenderLayerClipper.cpp
+++ b/sky/engine/core/rendering/RenderLayerClipper.cpp
@@ -41,10 +41,10 @@
* version of this file under any of the LGPL, the MPL or the GPL.
*/
-#include "sky/engine/core/rendering/RenderLayerClipper.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerClipper.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayerClipper.h b/sky/engine/core/rendering/RenderLayerClipper.h
index 3841ff5..883dbf8 100644
--- a/sky/engine/core/rendering/RenderLayerClipper.h
+++ b/sky/engine/core/rendering/RenderLayerClipper.h
@@ -45,8 +45,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERLAYERCLIPPER_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERLAYERCLIPPER_H_
-#include "sky/engine/core/rendering/ClipRectsCache.h"
-#include "sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/ClipRectsCache.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayerStackingNode.cpp b/sky/engine/core/rendering/RenderLayerStackingNode.cpp
index db9696c..2267740 100644
--- a/sky/engine/core/rendering/RenderLayerStackingNode.cpp
+++ b/sky/engine/core/rendering/RenderLayerStackingNode.cpp
@@ -41,11 +41,11 @@
* version of this file under any of the LGPL, the MPL or the GPL.
*/
-#include "sky/engine/core/rendering/RenderLayerStackingNode.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerStackingNode.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayerStackingNode.h b/sky/engine/core/rendering/RenderLayerStackingNode.h
index 967b4ed..03d6d38 100644
--- a/sky/engine/core/rendering/RenderLayerStackingNode.h
+++ b/sky/engine/core/rendering/RenderLayerStackingNode.h
@@ -45,10 +45,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERLAYERSTACKINGNODE_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERLAYERSTACKINGNODE_H_
-#include "sky/engine/core/rendering/RenderBox.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp b/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp
index 38b6eb7..ea4928d 100644
--- a/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp
+++ b/sky/engine/core/rendering/RenderLayerStackingNodeIterator.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderLayerStackingNode.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderLayerStackingNode.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLayerStackingNodeIterator.h b/sky/engine/core/rendering/RenderLayerStackingNodeIterator.h
index c40b81e..5e81f83 100644
--- a/sky/engine/core/rendering/RenderLayerStackingNodeIterator.h
+++ b/sky/engine/core/rendering/RenderLayerStackingNodeIterator.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERLAYERSTACKINGNODEITERATOR_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERLAYERSTACKINGNODEITERATOR_H_
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLineBoxList.cpp b/sky/engine/core/rendering/RenderLineBoxList.cpp
index bd10427..8748592 100644
--- a/sky/engine/core/rendering/RenderLineBoxList.cpp
+++ b/sky/engine/core/rendering/RenderLineBoxList.cpp
@@ -26,14 +26,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderLineBoxList.h"
+#include "flutter/sky/engine/core/rendering/RenderLineBoxList.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/RootInlineBox.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/RootInlineBox.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderLineBoxList.h b/sky/engine/core/rendering/RenderLineBoxList.h
index bad094f..8df45e6 100644
--- a/sky/engine/core/rendering/RenderLineBoxList.h
+++ b/sky/engine/core/rendering/RenderLineBoxList.h
@@ -30,7 +30,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERLINEBOXLIST_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERLINEBOXLIST_H_
-#include "sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index ff304a7..7079353 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -24,26 +24,26 @@
*
*/
-#include "sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
#include <algorithm>
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/RenderFlexibleBox.h"
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/core/rendering/RenderTheme.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/platform/Partitions.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/wtf/RefCountedLeakCounter.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/RenderFlexibleBox.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/core/rendering/RenderTheme.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/wtf/RefCountedLeakCounter.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#ifndef NDEBUG
#include <stdio.h>
#endif
diff --git a/sky/engine/core/rendering/RenderObject.h b/sky/engine/core/rendering/RenderObject.h
index 01abf22..1ac81a2 100644
--- a/sky/engine/core/rendering/RenderObject.h
+++ b/sky/engine/core/rendering/RenderObject.h
@@ -26,15 +26,15 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_
#define SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_
-#include "sky/engine/core/editing/PositionWithAffinity.h"
-#include "sky/engine/core/rendering/HitTestRequest.h"
-#include "sky/engine/core/rendering/RenderObjectChildList.h"
-#include "sky/engine/core/rendering/SubtreeLayoutScope.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/core/rendering/style/StyleInheritedData.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/core/editing/PositionWithAffinity.h"
+#include "flutter/sky/engine/core/rendering/HitTestRequest.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectChildList.h"
+#include "flutter/sky/engine/core/rendering/SubtreeLayoutScope.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/StyleInheritedData.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderObjectChildList.cpp b/sky/engine/core/rendering/RenderObjectChildList.cpp
index 2501352..39f05c7 100644
--- a/sky/engine/core/rendering/RenderObjectChildList.cpp
+++ b/sky/engine/core/rendering/RenderObjectChildList.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderObjectChildList.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectChildList.h"
-#include "sky/engine/core/rendering/RenderObject.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderObjectChildList.h b/sky/engine/core/rendering/RenderObjectChildList.h
index 6c7646c..271ed97 100644
--- a/sky/engine/core/rendering/RenderObjectChildList.h
+++ b/sky/engine/core/rendering/RenderObjectChildList.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDEROBJECTCHILDLIST_H_
#define SKY_ENGINE_CORE_RENDERING_RENDEROBJECTCHILDLIST_H_
-#include "sky/engine/platform/heap/Handle.h"
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/platform/heap/Handle.h"
+#include "flutter/sky/engine/wtf/Forward.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderObjectInlines.h b/sky/engine/core/rendering/RenderObjectInlines.h
index 6bcccff..60b8e8e 100644
--- a/sky/engine/core/rendering/RenderObjectInlines.h
+++ b/sky/engine/core/rendering/RenderObjectInlines.h
@@ -5,7 +5,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDEROBJECTINLINES_H_
#define SKY_ENGINE_CORE_RENDERING_RENDEROBJECTINLINES_H_
-#include "sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderOverflow.h b/sky/engine/core/rendering/RenderOverflow.h
index 9a6b61f..85fac54 100644
--- a/sky/engine/core/rendering/RenderOverflow.h
+++ b/sky/engine/core/rendering/RenderOverflow.h
@@ -21,7 +21,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDEROVERFLOW_H_
#define SKY_ENGINE_CORE_RENDERING_RENDEROVERFLOW_H_
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink
{
diff --git a/sky/engine/core/rendering/RenderOverflowTest.cpp b/sky/engine/core/rendering/RenderOverflowTest.cpp
index 16b4621..9da427a 100644
--- a/sky/engine/core/rendering/RenderOverflowTest.cpp
+++ b/sky/engine/core/rendering/RenderOverflowTest.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderOverflow.h"
+#include "flutter/sky/engine/core/rendering/RenderOverflow.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/core/rendering/RenderParagraph.cpp b/sky/engine/core/rendering/RenderParagraph.cpp
index 3049b7f..3269d54 100644
--- a/sky/engine/core/rendering/RenderParagraph.cpp
+++ b/sky/engine/core/rendering/RenderParagraph.cpp
@@ -2,26 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/BidiRunForLine.h"
-#include "sky/engine/core/rendering/InlineIterator.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/TextRunConstructor.h"
-#include "sky/engine/core/rendering/VerticalPositionCache.h"
-#include "sky/engine/core/rendering/line/BreakingContextInlineHeaders.h"
-#include "sky/engine/core/rendering/line/LineLayoutState.h"
-#include "sky/engine/core/rendering/line/LineWidth.h"
-#include "sky/engine/core/rendering/line/RenderTextInfo.h"
-#include "sky/engine/core/rendering/line/WordMeasurement.h"
-#include "sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/text/BidiResolver.h"
-#include "sky/engine/wtf/RefCountedLeakCounter.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/core/rendering/BidiRunForLine.h"
+#include "flutter/sky/engine/core/rendering/InlineIterator.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/TextRunConstructor.h"
+#include "flutter/sky/engine/core/rendering/VerticalPositionCache.h"
+#include "flutter/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h"
+#include "flutter/sky/engine/core/rendering/line/LineLayoutState.h"
+#include "flutter/sky/engine/core/rendering/line/LineWidth.h"
+#include "flutter/sky/engine/core/rendering/line/RenderTextInfo.h"
+#include "flutter/sky/engine/core/rendering/line/WordMeasurement.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/wtf/RefCountedLeakCounter.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderParagraph.h b/sky/engine/core/rendering/RenderParagraph.h
index 23488f6..ac6ad05 100644
--- a/sky/engine/core/rendering/RenderParagraph.h
+++ b/sky/engine/core/rendering/RenderParagraph.h
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERPARAGRAPH_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERPARAGRAPH_H_
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/line/TrailingObjects.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/line/TrailingObjects.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderReplaced.cpp b/sky/engine/core/rendering/RenderReplaced.cpp
index ef4d2b5..5f9b778 100644
--- a/sky/engine/core/rendering/RenderReplaced.cpp
+++ b/sky/engine/core/rendering/RenderReplaced.cpp
@@ -21,13 +21,13 @@
*
*/
-#include "sky/engine/core/rendering/RenderReplaced.h"
+#include "flutter/sky/engine/core/rendering/RenderReplaced.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderReplaced.h b/sky/engine/core/rendering/RenderReplaced.h
index 5f33b36..2c17bfa 100644
--- a/sky/engine/core/rendering/RenderReplaced.h
+++ b/sky/engine/core/rendering/RenderReplaced.h
@@ -22,7 +22,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERREPLACED_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERREPLACED_H_
-#include "sky/engine/core/rendering/RenderBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBox.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderText.cpp b/sky/engine/core/rendering/RenderText.cpp
index f369b8c..5acc52f 100644
--- a/sky/engine/core/rendering/RenderText.cpp
+++ b/sky/engine/core/rendering/RenderText.cpp
@@ -22,24 +22,24 @@
*
*/
-#include "sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/core/rendering/break_lines.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/TextRunConstructor.h"
-#include "sky/engine/core/text/TextBox.h"
-#include "sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/text/BidiResolver.h"
-#include "sky/engine/platform/text/TextBreakIterator.h"
-#include "sky/engine/platform/text/TextRunIterator.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/core/rendering/break_lines.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/TextRunConstructor.h"
+#include "flutter/sky/engine/core/text/TextBox.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/platform/text/TextRunIterator.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
using namespace WTF;
using namespace Unicode;
diff --git a/sky/engine/core/rendering/RenderText.h b/sky/engine/core/rendering/RenderText.h
index 1f128d3..54f7844 100644
--- a/sky/engine/core/rendering/RenderText.h
+++ b/sky/engine/core/rendering/RenderText.h
@@ -25,11 +25,11 @@
#include <vector>
-#include "sky/engine/core/rendering/RenderObject.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/text/TextPath.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/text/TextPath.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
namespace blink {
class InlineTextBox;
diff --git a/sky/engine/core/rendering/RenderTheme.cpp b/sky/engine/core/rendering/RenderTheme.cpp
index 518546e..4827af0 100644
--- a/sky/engine/core/rendering/RenderTheme.cpp
+++ b/sky/engine/core/rendering/RenderTheme.cpp
@@ -19,17 +19,17 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/RenderTheme.h"
+#include "flutter/sky/engine/core/rendering/RenderTheme.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/platform/FloatConversion.h"
-#include "sky/engine/platform/fonts/FontSelector.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
-#include "sky/engine/platform/text/StringTruncator.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/platform/FloatConversion.h"
+#include "flutter/sky/engine/platform/fonts/FontSelector.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/platform/text/StringTruncator.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
// The methods in this file are shared by all themes on every platform.
diff --git a/sky/engine/core/rendering/RenderTheme.h b/sky/engine/core/rendering/RenderTheme.h
index 18c0c2f..9729e8c 100644
--- a/sky/engine/core/rendering/RenderTheme.h
+++ b/sky/engine/core/rendering/RenderTheme.h
@@ -23,10 +23,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERTHEME_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERTHEME_H_
-#include "sky/engine/core/rendering/RenderObject.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderTreeAsText.cpp b/sky/engine/core/rendering/RenderTreeAsText.cpp
index ece0ce5..c79a28a 100644
--- a/sky/engine/core/rendering/RenderTreeAsText.cpp
+++ b/sky/engine/core/rendering/RenderTreeAsText.cpp
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/RenderTreeAsText.h"
+#include "flutter/sky/engine/core/rendering/RenderTreeAsText.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/wtf/HexNumber.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/wtf/HexNumber.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderTreeAsText.h b/sky/engine/core/rendering/RenderTreeAsText.h
index 3bf1efa..075a4dd 100644
--- a/sky/engine/core/rendering/RenderTreeAsText.h
+++ b/sky/engine/core/rendering/RenderTreeAsText.h
@@ -25,9 +25,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERTREEASTEXT_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERTREEASTEXT_H_
-#include "sky/engine/platform/text/TextStream.h"
+#include "flutter/sky/engine/platform/text/TextStream.h"
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Forward.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderView.cpp b/sky/engine/core/rendering/RenderView.cpp
index 0f7d6cb..b1b9dd4 100644
--- a/sky/engine/core/rendering/RenderView.cpp
+++ b/sky/engine/core/rendering/RenderView.cpp
@@ -18,14 +18,14 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/RenderGeometryMap.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RenderView.h b/sky/engine/core/rendering/RenderView.h
index 663da8c..6383c2d 100644
--- a/sky/engine/core/rendering/RenderView.h
+++ b/sky/engine/core/rendering/RenderView.h
@@ -22,8 +22,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_RENDERVIEW_H_
#define SKY_ENGINE_CORE_RENDERING_RENDERVIEW_H_
-#include "sky/engine/core/rendering/RenderFlexibleBox.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/core/rendering/RenderFlexibleBox.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RootInlineBox.cpp b/sky/engine/core/rendering/RootInlineBox.cpp
index d7503f6..24d7526 100644
--- a/sky/engine/core/rendering/RootInlineBox.cpp
+++ b/sky/engine/core/rendering/RootInlineBox.cpp
@@ -17,17 +17,17 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/core/rendering/RootInlineBox.h"
+#include "flutter/sky/engine/core/rendering/RootInlineBox.h"
-#include "sky/engine/core/rendering/HitTestResult.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/VerticalPositionCache.h"
-#include "sky/engine/platform/text/BidiResolver.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/core/rendering/HitTestResult.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/rendering/VerticalPositionCache.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/core/rendering/RootInlineBox.h b/sky/engine/core/rendering/RootInlineBox.h
index f27786a..95d47ff 100644
--- a/sky/engine/core/rendering/RootInlineBox.h
+++ b/sky/engine/core/rendering/RootInlineBox.h
@@ -21,8 +21,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_ROOTINLINEBOX_H_
#define SKY_ENGINE_CORE_RENDERING_ROOTINLINEBOX_H_
-#include "sky/engine/core/rendering/InlineFlowBox.h"
-#include "sky/engine/platform/text/BidiContext.h"
+#include "flutter/sky/engine/core/rendering/InlineFlowBox.h"
+#include "flutter/sky/engine/platform/text/BidiContext.h"
namespace blink {
diff --git a/sky/engine/core/rendering/ScrollAlignment.cpp b/sky/engine/core/rendering/ScrollAlignment.cpp
index 3af4b5d..5ecfe3d 100644
--- a/sky/engine/core/rendering/ScrollAlignment.cpp
+++ b/sky/engine/core/rendering/ScrollAlignment.cpp
@@ -41,9 +41,9 @@
* version of this file under any of the LGPL, the MPL or the GPL.
*/
-#include "sky/engine/core/rendering/ScrollAlignment.h"
+#include "flutter/sky/engine/core/rendering/ScrollAlignment.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/SubtreeLayoutScope.cpp b/sky/engine/core/rendering/SubtreeLayoutScope.cpp
index 53908b2..d1940a5 100644
--- a/sky/engine/core/rendering/SubtreeLayoutScope.cpp
+++ b/sky/engine/core/rendering/SubtreeLayoutScope.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/SubtreeLayoutScope.h"
+#include "flutter/sky/engine/core/rendering/SubtreeLayoutScope.h"
-#include "sky/engine/core/rendering/RenderObject.h"
+#include "flutter/sky/engine/core/rendering/RenderObject.h"
namespace blink {
diff --git a/sky/engine/core/rendering/SubtreeLayoutScope.h b/sky/engine/core/rendering/SubtreeLayoutScope.h
index b1b9901..7f94465 100644
--- a/sky/engine/core/rendering/SubtreeLayoutScope.h
+++ b/sky/engine/core/rendering/SubtreeLayoutScope.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_SUBTREELAYOUTSCOPE_H_
#define SKY_ENGINE_CORE_RENDERING_SUBTREELAYOUTSCOPE_H_
-#include "sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
// This is the way to mark a subtree as needing layout during layout,
// e.g. for the purposes of doing a multipass layout.
diff --git a/sky/engine/core/rendering/TextRunConstructor.cpp b/sky/engine/core/rendering/TextRunConstructor.cpp
index 875dda3..b8cff5a 100644
--- a/sky/engine/core/rendering/TextRunConstructor.cpp
+++ b/sky/engine/core/rendering/TextRunConstructor.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/TextRunConstructor.h"
+#include "flutter/sky/engine/core/rendering/TextRunConstructor.h"
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/platform/text/BidiTextRun.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/platform/text/BidiTextRun.h"
namespace blink {
diff --git a/sky/engine/core/rendering/TextRunConstructor.h b/sky/engine/core/rendering/TextRunConstructor.h
index 69a1f89..9eb99a1 100644
--- a/sky/engine/core/rendering/TextRunConstructor.h
+++ b/sky/engine/core/rendering/TextRunConstructor.h
@@ -36,10 +36,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_TEXTRUNCONSTRUCTOR_H_
#define SKY_ENGINE_CORE_RENDERING_TEXTRUNCONSTRUCTOR_H_
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/core/rendering/VerticalPositionCache.h b/sky/engine/core/rendering/VerticalPositionCache.h
index 30097fd..4ca8522 100644
--- a/sky/engine/core/rendering/VerticalPositionCache.h
+++ b/sky/engine/core/rendering/VerticalPositionCache.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_VERTICALPOSITIONCACHE_H_
#define SKY_ENGINE_CORE_RENDERING_VERTICALPOSITIONCACHE_H_
-#include "sky/engine/platform/fonts/FontBaseline.h"
-#include "sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/platform/fonts/FontBaseline.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
namespace blink {
diff --git a/sky/engine/core/rendering/break_lines.cpp b/sky/engine/core/rendering/break_lines.cpp
index c85d145..7bb60fe 100644
--- a/sky/engine/core/rendering/break_lines.cpp
+++ b/sky/engine/core/rendering/break_lines.cpp
@@ -24,12 +24,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/break_lines.h"
+#include "flutter/sky/engine/core/rendering/break_lines.h"
-#include "sky/engine/platform/text/TextBreakIterator.h"
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/core/rendering/break_lines.h b/sky/engine/core/rendering/break_lines.h
index 873d685..4d2722f 100644
--- a/sky/engine/core/rendering/break_lines.h
+++ b/sky/engine/core/rendering/break_lines.h
@@ -21,7 +21,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_BREAK_LINES_H_
#define SKY_ENGINE_CORE_RENDERING_BREAK_LINES_H_
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/BreakingContext.cpp b/sky/engine/core/rendering/line/BreakingContext.cpp
index 6d2776c..c7f023e 100644
--- a/sky/engine/core/rendering/line/BreakingContext.cpp
+++ b/sky/engine/core/rendering/line/BreakingContext.cpp
@@ -21,7 +21,7 @@
*
*/
-#include "sky/engine/core/rendering/line/BreakingContextInlineHeaders.h"
+#include "flutter/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h b/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
index c11eea0..915a51b 100644
--- a/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
+++ b/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
@@ -24,19 +24,19 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_BREAKINGCONTEXTINLINEHEADERS_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_BREAKINGCONTEXTINLINEHEADERS_H_
-#include "sky/engine/core/rendering/InlineIterator.h"
-#include "sky/engine/core/rendering/InlineTextBox.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderObjectInlines.h"
-#include "sky/engine/core/rendering/TextRunConstructor.h"
-#include "sky/engine/core/rendering/break_lines.h"
-#include "sky/engine/core/rendering/line/LineBreaker.h"
-#include "sky/engine/core/rendering/line/LineInfo.h"
-#include "sky/engine/core/rendering/line/LineWidth.h"
-#include "sky/engine/core/rendering/line/RenderTextInfo.h"
-#include "sky/engine/core/rendering/line/TrailingObjects.h"
-#include "sky/engine/core/rendering/line/WordMeasurement.h"
+#include "flutter/sky/engine/core/rendering/InlineIterator.h"
+#include "flutter/sky/engine/core/rendering/InlineTextBox.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderLayer.h"
+#include "flutter/sky/engine/core/rendering/RenderObjectInlines.h"
+#include "flutter/sky/engine/core/rendering/TextRunConstructor.h"
+#include "flutter/sky/engine/core/rendering/break_lines.h"
+#include "flutter/sky/engine/core/rendering/line/LineBreaker.h"
+#include "flutter/sky/engine/core/rendering/line/LineInfo.h"
+#include "flutter/sky/engine/core/rendering/line/LineWidth.h"
+#include "flutter/sky/engine/core/rendering/line/RenderTextInfo.h"
+#include "flutter/sky/engine/core/rendering/line/TrailingObjects.h"
+#include "flutter/sky/engine/core/rendering/line/WordMeasurement.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/LineBreaker.cpp b/sky/engine/core/rendering/line/LineBreaker.cpp
index 214270d..af50c6c 100644
--- a/sky/engine/core/rendering/line/LineBreaker.cpp
+++ b/sky/engine/core/rendering/line/LineBreaker.cpp
@@ -20,9 +20,9 @@
*
*/
-#include "sky/engine/core/rendering/line/LineBreaker.h"
+#include "flutter/sky/engine/core/rendering/line/LineBreaker.h"
-#include "sky/engine/core/rendering/line/BreakingContextInlineHeaders.h"
+#include "flutter/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/LineBreaker.h b/sky/engine/core/rendering/line/LineBreaker.h
index 37d8bff..db15b9a 100644
--- a/sky/engine/core/rendering/line/LineBreaker.h
+++ b/sky/engine/core/rendering/line/LineBreaker.h
@@ -23,9 +23,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_LINEBREAKER_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_LINEBREAKER_H_
-#include "sky/engine/core/rendering/InlineIterator.h"
-#include "sky/engine/core/rendering/line/LineInfo.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/core/rendering/InlineIterator.h"
+#include "flutter/sky/engine/core/rendering/line/LineInfo.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/LineInfo.h b/sky/engine/core/rendering/line/LineInfo.h
index 0c12a0d..fbfcf05 100644
--- a/sky/engine/core/rendering/line/LineInfo.h
+++ b/sky/engine/core/rendering/line/LineInfo.h
@@ -24,7 +24,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_LINEINFO_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_LINEINFO_H_
-#include "sky/engine/core/rendering/line/LineWidth.h"
+#include "flutter/sky/engine/core/rendering/line/LineWidth.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/LineLayoutState.h b/sky/engine/core/rendering/line/LineLayoutState.h
index f4f04d8..5dca6c1 100644
--- a/sky/engine/core/rendering/line/LineLayoutState.h
+++ b/sky/engine/core/rendering/line/LineLayoutState.h
@@ -24,8 +24,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_LINELAYOUTSTATE_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_LINELAYOUTSTATE_H_
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/LineWidth.cpp b/sky/engine/core/rendering/line/LineWidth.cpp
index 2d483a6..189934a 100644
--- a/sky/engine/core/rendering/line/LineWidth.cpp
+++ b/sky/engine/core/rendering/line/LineWidth.cpp
@@ -27,10 +27,10 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/line/LineWidth.h"
+#include "flutter/sky/engine/core/rendering/line/LineWidth.h"
-#include "sky/engine/core/rendering/RenderBlock.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderBlock.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/LineWidth.h b/sky/engine/core/rendering/line/LineWidth.h
index ed839fa..eea2707 100644
--- a/sky/engine/core/rendering/line/LineWidth.h
+++ b/sky/engine/core/rendering/line/LineWidth.h
@@ -30,7 +30,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_LINEWIDTH_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_LINEWIDTH_H_
-#include "sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/RenderTextInfo.h b/sky/engine/core/rendering/line/RenderTextInfo.h
index 7ad0bb0..4288fd6 100644
--- a/sky/engine/core/rendering/line/RenderTextInfo.h
+++ b/sky/engine/core/rendering/line/RenderTextInfo.h
@@ -23,7 +23,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_RENDERTEXTINFO_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_RENDERTEXTINFO_H_
-#include "sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/TrailingObjects.cpp b/sky/engine/core/rendering/line/TrailingObjects.cpp
index 1460dab..279507c 100644
--- a/sky/engine/core/rendering/line/TrailingObjects.cpp
+++ b/sky/engine/core/rendering/line/TrailingObjects.cpp
@@ -21,9 +21,9 @@
*
*/
-#include "sky/engine/core/rendering/line/TrailingObjects.h"
+#include "flutter/sky/engine/core/rendering/line/TrailingObjects.h"
-#include "sky/engine/core/rendering/InlineIterator.h"
+#include "flutter/sky/engine/core/rendering/InlineIterator.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/TrailingObjects.h b/sky/engine/core/rendering/line/TrailingObjects.h
index 767771f..d6ed8a0 100644
--- a/sky/engine/core/rendering/line/TrailingObjects.h
+++ b/sky/engine/core/rendering/line/TrailingObjects.h
@@ -24,7 +24,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_TRAILINGOBJECTS_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_TRAILINGOBJECTS_H_
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/core/rendering/line/WordMeasurement.h b/sky/engine/core/rendering/line/WordMeasurement.h
index 1f53977..1f9c875 100644
--- a/sky/engine/core/rendering/line/WordMeasurement.h
+++ b/sky/engine/core/rendering/line/WordMeasurement.h
@@ -24,8 +24,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_WORDMEASUREMENT_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_WORDMEASUREMENT_H_
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/AppliedTextDecoration.cpp b/sky/engine/core/rendering/style/AppliedTextDecoration.cpp
index 19b7d90..01ebbb6 100644
--- a/sky/engine/core/rendering/style/AppliedTextDecoration.cpp
+++ b/sky/engine/core/rendering/style/AppliedTextDecoration.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/rendering/style/AppliedTextDecoration.h"
+#include "flutter/sky/engine/core/rendering/style/AppliedTextDecoration.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/AppliedTextDecoration.h b/sky/engine/core/rendering/style/AppliedTextDecoration.h
index 697e519..dc7a00d 100644
--- a/sky/engine/core/rendering/style/AppliedTextDecoration.h
+++ b/sky/engine/core/rendering/style/AppliedTextDecoration.h
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_APPLIEDTEXTDECORATION_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_APPLIEDTEXTDECORATION_H_
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/StyleColor.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/StyleColor.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/BorderData.h b/sky/engine/core/rendering/style/BorderData.h
index 0aee567..2ba6d42 100644
--- a/sky/engine/core/rendering/style/BorderData.h
+++ b/sky/engine/core/rendering/style/BorderData.h
@@ -25,9 +25,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_BORDERDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_BORDERDATA_H_
-#include "sky/engine/core/rendering/style/BorderValue.h"
-#include "sky/engine/platform/LengthSize.h"
-#include "sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/core/rendering/style/BorderValue.h"
+#include "flutter/sky/engine/platform/LengthSize.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/BorderValue.h b/sky/engine/core/rendering/style/BorderValue.h
index b3e7a5d..c78acbd 100644
--- a/sky/engine/core/rendering/style/BorderValue.h
+++ b/sky/engine/core/rendering/style/BorderValue.h
@@ -25,9 +25,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_BORDERVALUE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_BORDERVALUE_H_
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/StyleColor.h"
-#include "sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/StyleColor.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/CollapsedBorderValue.h b/sky/engine/core/rendering/style/CollapsedBorderValue.h
index a90d80c..7372f18 100644
--- a/sky/engine/core/rendering/style/CollapsedBorderValue.h
+++ b/sky/engine/core/rendering/style/CollapsedBorderValue.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_COLLAPSEDBORDERVALUE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_COLLAPSEDBORDERVALUE_H_
-#include "sky/engine/core/rendering/style/BorderValue.h"
+#include "flutter/sky/engine/core/rendering/style/BorderValue.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/CounterDirectives.cpp b/sky/engine/core/rendering/style/CounterDirectives.cpp
index 960a8f79..7bb043c 100644
--- a/sky/engine/core/rendering/style/CounterDirectives.cpp
+++ b/sky/engine/core/rendering/style/CounterDirectives.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "sky/engine/core/rendering/style/CounterDirectives.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/core/rendering/style/CounterDirectives.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/CounterDirectives.h b/sky/engine/core/rendering/style/CounterDirectives.h
index 5154086..ba7d751 100644
--- a/sky/engine/core/rendering/style/CounterDirectives.h
+++ b/sky/engine/core/rendering/style/CounterDirectives.h
@@ -25,11 +25,11 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_COUNTERDIRECTIVES_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_COUNTERDIRECTIVES_H_
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/AtomicStringHash.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/AtomicStringHash.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/DataEquivalency.h b/sky/engine/core/rendering/style/DataEquivalency.h
index 2f17bc2..9d5f95c 100644
--- a/sky/engine/core/rendering/style/DataEquivalency.h
+++ b/sky/engine/core/rendering/style/DataEquivalency.h
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_DATAEQUIVALENCY_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_DATAEQUIVALENCY_H_
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/DataRef.h b/sky/engine/core/rendering/style/DataRef.h
index 00f1ad0..b2bb9fa 100644
--- a/sky/engine/core/rendering/style/DataRef.h
+++ b/sky/engine/core/rendering/style/DataRef.h
@@ -24,7 +24,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_DATAREF_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_DATAREF_H_
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/FillLayer.cpp b/sky/engine/core/rendering/style/FillLayer.cpp
index 1ef5023..fae1db7 100644
--- a/sky/engine/core/rendering/style/FillLayer.cpp
+++ b/sky/engine/core/rendering/style/FillLayer.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/core/rendering/style/FillLayer.h"
+#include "flutter/sky/engine/core/rendering/style/FillLayer.h"
-#include "sky/engine/core/rendering/style/DataEquivalency.h"
+#include "flutter/sky/engine/core/rendering/style/DataEquivalency.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/FillLayer.h b/sky/engine/core/rendering/style/FillLayer.h
index 9bdc1a0..c824221 100644
--- a/sky/engine/core/rendering/style/FillLayer.h
+++ b/sky/engine/core/rendering/style/FillLayer.h
@@ -25,12 +25,12 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_FILLLAYER_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_FILLLAYER_H_
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/StyleImage.h"
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/LengthSize.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/StyleImage.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/LengthSize.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/OutlineValue.h b/sky/engine/core/rendering/style/OutlineValue.h
index f7ee326..d2dfd2c 100644
--- a/sky/engine/core/rendering/style/OutlineValue.h
+++ b/sky/engine/core/rendering/style/OutlineValue.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_OUTLINEVALUE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_OUTLINEVALUE_H_
-#include "sky/engine/core/rendering/style/BorderValue.h"
+#include "flutter/sky/engine/core/rendering/style/BorderValue.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/OutlineValueTest.cpp b/sky/engine/core/rendering/style/OutlineValueTest.cpp
index 4406d88..3548e6c 100644
--- a/sky/engine/core/rendering/style/OutlineValueTest.cpp
+++ b/sky/engine/core/rendering/style/OutlineValueTest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/rendering/style/OutlineValue.h"
+#include "flutter/sky/engine/core/rendering/style/OutlineValue.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/core/rendering/style/RenderStyle.cpp b/sky/engine/core/rendering/style/RenderStyle.cpp
index 3865a4c..59f4ddb 100644
--- a/sky/engine/core/rendering/style/RenderStyle.cpp
+++ b/sky/engine/core/rendering/style/RenderStyle.cpp
@@ -20,20 +20,20 @@
*
*/
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
#include <algorithm>
-#include "sky/engine/core/rendering/RenderTheme.h"
-#include "sky/engine/core/rendering/style/AppliedTextDecoration.h"
-#include "sky/engine/core/rendering/style/DataEquivalency.h"
-#include "sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/core/rendering/style/StyleImage.h"
-#include "sky/engine/core/rendering/style/StyleInheritedData.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/fonts/FontSelector.h"
-#include "sky/engine/platform/geometry/FloatRoundedRect.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/core/rendering/RenderTheme.h"
+#include "flutter/sky/engine/core/rendering/style/AppliedTextDecoration.h"
+#include "flutter/sky/engine/core/rendering/style/DataEquivalency.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/core/rendering/style/StyleImage.h"
+#include "flutter/sky/engine/core/rendering/style/StyleInheritedData.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/fonts/FontSelector.h"
+#include "flutter/sky/engine/platform/geometry/FloatRoundedRect.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
index caba5f3..4bd0115 100644
--- a/sky/engine/core/rendering/style/RenderStyle.h
+++ b/sky/engine/core/rendering/style/RenderStyle.h
@@ -25,41 +25,41 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
-#include "sky/engine/core/rendering/style/BorderValue.h"
-#include "sky/engine/core/rendering/style/CounterDirectives.h"
-#include "sky/engine/core/rendering/style/DataRef.h"
-#include "sky/engine/core/rendering/style/OutlineValue.h"
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/ShapeValue.h"
-#include "sky/engine/core/rendering/style/StyleBackgroundData.h"
-#include "sky/engine/core/rendering/style/StyleBoxData.h"
-#include "sky/engine/core/rendering/style/StyleDifference.h"
-#include "sky/engine/core/rendering/style/StyleFilterData.h"
-#include "sky/engine/core/rendering/style/StyleFlexibleBoxData.h"
-#include "sky/engine/core/rendering/style/StyleInheritedData.h"
-#include "sky/engine/core/rendering/style/StyleRareInheritedData.h"
-#include "sky/engine/core/rendering/style/StyleRareNonInheritedData.h"
-#include "sky/engine/core/rendering/style/StyleSurroundData.h"
-#include "sky/engine/core/rendering/style/StyleTransformData.h"
-#include "sky/engine/core/rendering/style/StyleVisualData.h"
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/LengthBox.h"
-#include "sky/engine/platform/LengthSize.h"
-#include "sky/engine/platform/fonts/FontBaseline.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/geometry/FloatRoundedRect.h"
-#include "sky/engine/platform/geometry/LayoutBoxExtent.h"
-#include "sky/engine/platform/geometry/RoundedRect.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/platform/text/UnicodeBidi.h"
-#include "sky/engine/platform/transforms/TransformOperations.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/core/rendering/style/BorderValue.h"
+#include "flutter/sky/engine/core/rendering/style/CounterDirectives.h"
+#include "flutter/sky/engine/core/rendering/style/DataRef.h"
+#include "flutter/sky/engine/core/rendering/style/OutlineValue.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/ShapeValue.h"
+#include "flutter/sky/engine/core/rendering/style/StyleBackgroundData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleBoxData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleDifference.h"
+#include "flutter/sky/engine/core/rendering/style/StyleFilterData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleFlexibleBoxData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleInheritedData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleRareInheritedData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleRareNonInheritedData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleSurroundData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleTransformData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleVisualData.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/LengthBox.h"
+#include "flutter/sky/engine/platform/LengthSize.h"
+#include "flutter/sky/engine/platform/fonts/FontBaseline.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/geometry/FloatRoundedRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutBoxExtent.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/UnicodeBidi.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperations.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
template<typename T, typename U> inline bool compareEqual(const T& t, const U& u) { return t == static_cast<T>(u); }
diff --git a/sky/engine/core/rendering/style/ShadowData.cpp b/sky/engine/core/rendering/style/ShadowData.cpp
index 97d047e..403f04f 100644
--- a/sky/engine/core/rendering/style/ShadowData.cpp
+++ b/sky/engine/core/rendering/style/ShadowData.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/core/rendering/style/ShadowData.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowData.h"
-#include "sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/ShadowData.h b/sky/engine/core/rendering/style/ShadowData.h
index 62d6e95..86577d4 100644
--- a/sky/engine/core/rendering/style/ShadowData.h
+++ b/sky/engine/core/rendering/style/ShadowData.h
@@ -25,8 +25,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_SHADOWDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_SHADOWDATA_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/ShadowList.cpp b/sky/engine/core/rendering/style/ShadowList.cpp
index 6acb805..dc2e81c 100644
--- a/sky/engine/core/rendering/style/ShadowList.cpp
+++ b/sky/engine/core/rendering/style/ShadowList.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/ShadowList.h b/sky/engine/core/rendering/style/ShadowList.h
index 75d3b1d..368d962 100644
--- a/sky/engine/core/rendering/style/ShadowList.h
+++ b/sky/engine/core/rendering/style/ShadowList.h
@@ -31,12 +31,12 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_SHADOWLIST_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_SHADOWLIST_H_
-#include "sky/engine/core/rendering/style/ShadowData.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/platform/graphics/DrawLooperBuilder.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowData.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/graphics/DrawLooperBuilder.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/ShapeValue.h b/sky/engine/core/rendering/style/ShapeValue.h
index 754eb2e..5121c89 100644
--- a/sky/engine/core/rendering/style/ShapeValue.h
+++ b/sky/engine/core/rendering/style/ShapeValue.h
@@ -30,9 +30,9 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_SHAPEVALUE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_SHAPEVALUE_H_
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/StyleImage.h"
-#include "sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/StyleImage.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleBackgroundData.cpp b/sky/engine/core/rendering/style/StyleBackgroundData.cpp
index f2bd708..1624490 100644
--- a/sky/engine/core/rendering/style/StyleBackgroundData.cpp
+++ b/sky/engine/core/rendering/style/StyleBackgroundData.cpp
@@ -19,10 +19,10 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleBackgroundData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleBackgroundData.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleBackgroundData.h b/sky/engine/core/rendering/style/StyleBackgroundData.h
index 130df68..4cd8f85 100644
--- a/sky/engine/core/rendering/style/StyleBackgroundData.h
+++ b/sky/engine/core/rendering/style/StyleBackgroundData.h
@@ -25,11 +25,11 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEBACKGROUNDDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEBACKGROUNDDATA_H_
-#include "sky/engine/core/rendering/style/FillLayer.h"
-#include "sky/engine/core/rendering/style/OutlineValue.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/core/rendering/style/FillLayer.h"
+#include "flutter/sky/engine/core/rendering/style/OutlineValue.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleBoxData.cpp b/sky/engine/core/rendering/style/StyleBoxData.cpp
index ede4441..dbac9fe 100644
--- a/sky/engine/core/rendering/style/StyleBoxData.cpp
+++ b/sky/engine/core/rendering/style/StyleBoxData.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleBoxData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleBoxData.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleBoxData.h b/sky/engine/core/rendering/style/StyleBoxData.h
index 7092364..03f7d8a 100644
--- a/sky/engine/core/rendering/style/StyleBoxData.h
+++ b/sky/engine/core/rendering/style/StyleBoxData.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEBOXDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEBOXDATA_H_
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleColor.h b/sky/engine/core/rendering/style/StyleColor.h
index fdcfefe..ce09033 100644
--- a/sky/engine/core/rendering/style/StyleColor.h
+++ b/sky/engine/core/rendering/style/StyleColor.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLECOLOR_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLECOLOR_H_
-#include "sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleDifference.h b/sky/engine/core/rendering/style/StyleDifference.h
index 9833fde..09ffc26 100644
--- a/sky/engine/core/rendering/style/StyleDifference.h
+++ b/sky/engine/core/rendering/style/StyleDifference.h
@@ -5,7 +5,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEDIFFERENCE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEDIFFERENCE_H_
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleFilterData.cpp b/sky/engine/core/rendering/style/StyleFilterData.cpp
index 2d55079..3b9ab6d 100644
--- a/sky/engine/core/rendering/style/StyleFilterData.cpp
+++ b/sky/engine/core/rendering/style/StyleFilterData.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/core/rendering/style/StyleFilterData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleFilterData.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleFilterData.h b/sky/engine/core/rendering/style/StyleFilterData.h
index 9c467fc..a2ac421 100644
--- a/sky/engine/core/rendering/style/StyleFilterData.h
+++ b/sky/engine/core/rendering/style/StyleFilterData.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEFILTERDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEFILTERDATA_H_
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleFlexibleBoxData.cpp b/sky/engine/core/rendering/style/StyleFlexibleBoxData.cpp
index 4c21295..58f31fa 100644
--- a/sky/engine/core/rendering/style/StyleFlexibleBoxData.cpp
+++ b/sky/engine/core/rendering/style/StyleFlexibleBoxData.cpp
@@ -23,9 +23,9 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleFlexibleBoxData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleFlexibleBoxData.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleFlexibleBoxData.h b/sky/engine/core/rendering/style/StyleFlexibleBoxData.h
index 8d575e5..2bb32e6 100644
--- a/sky/engine/core/rendering/style/StyleFlexibleBoxData.h
+++ b/sky/engine/core/rendering/style/StyleFlexibleBoxData.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEFLEXIBLEBOXDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEFLEXIBLEBOXDATA_H_
-#include "sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/Length.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleImage.h b/sky/engine/core/rendering/style/StyleImage.h
index 31e364d..e074db9 100644
--- a/sky/engine/core/rendering/style/StyleImage.h
+++ b/sky/engine/core/rendering/style/StyleImage.h
@@ -24,12 +24,12 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEIMAGE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEIMAGE_H_
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/geometry/LayoutSize.h"
-#include "sky/engine/platform/graphics/Image.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/platform/graphics/Image.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleInheritedData.cpp b/sky/engine/core/rendering/style/StyleInheritedData.cpp
index f5cac51..8076bd8 100644
--- a/sky/engine/core/rendering/style/StyleInheritedData.cpp
+++ b/sky/engine/core/rendering/style/StyleInheritedData.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleInheritedData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleInheritedData.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleInheritedData.h b/sky/engine/core/rendering/style/StyleInheritedData.h
index e1bdb52..c128cac 100644
--- a/sky/engine/core/rendering/style/StyleInheritedData.h
+++ b/sky/engine/core/rendering/style/StyleInheritedData.h
@@ -25,12 +25,12 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEINHERITEDDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEINHERITEDDATA_H_
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleRareInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
index 18f4786..19379c8 100644
--- a/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
+++ b/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
@@ -19,14 +19,14 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleRareInheritedData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleRareInheritedData.h"
-#include "sky/engine/core/rendering/style/AppliedTextDecoration.h"
-#include "sky/engine/core/rendering/style/DataEquivalency.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/core/rendering/style/StyleImage.h"
+#include "flutter/sky/engine/core/rendering/style/AppliedTextDecoration.h"
+#include "flutter/sky/engine/core/rendering/style/DataEquivalency.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/core/rendering/style/StyleImage.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleRareInheritedData.h b/sky/engine/core/rendering/style/StyleRareInheritedData.h
index 0445b6a..8ca69f2 100644
--- a/sky/engine/core/rendering/style/StyleRareInheritedData.h
+++ b/sky/engine/core/rendering/style/StyleRareInheritedData.h
@@ -25,14 +25,14 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLERAREINHERITEDDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLERAREINHERITEDDATA_H_
-#include "sky/engine/core/rendering/style/DataRef.h"
-#include "sky/engine/core/rendering/style/StyleColor.h"
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefVector.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/core/rendering/style/DataRef.h"
+#include "flutter/sky/engine/core/rendering/style/StyleColor.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefVector.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
index 8b5eaf5..25922cc 100644
--- a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -19,13 +19,13 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleRareNonInheritedData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleRareNonInheritedData.h"
-#include "sky/engine/core/rendering/style/DataEquivalency.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/core/rendering/style/ShadowList.h"
-#include "sky/engine/core/rendering/style/StyleFilterData.h"
-#include "sky/engine/core/rendering/style/StyleTransformData.h"
+#include "flutter/sky/engine/core/rendering/style/DataEquivalency.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/ShadowList.h"
+#include "flutter/sky/engine/core/rendering/style/StyleFilterData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleTransformData.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleRareNonInheritedData.h b/sky/engine/core/rendering/style/StyleRareNonInheritedData.h
index c1176e8..1d95802 100644
--- a/sky/engine/core/rendering/style/StyleRareNonInheritedData.h
+++ b/sky/engine/core/rendering/style/StyleRareNonInheritedData.h
@@ -25,17 +25,17 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLERARENONINHERITEDDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLERARENONINHERITEDDATA_H_
-#include "sky/engine/core/rendering/ClipPathOperation.h"
-#include "sky/engine/core/rendering/style/CounterDirectives.h"
-#include "sky/engine/core/rendering/style/DataRef.h"
-#include "sky/engine/core/rendering/style/FillLayer.h"
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/core/rendering/style/ShapeValue.h"
-#include "sky/engine/core/rendering/style/StyleColor.h"
-#include "sky/engine/platform/LengthPoint.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/core/rendering/ClipPathOperation.h"
+#include "flutter/sky/engine/core/rendering/style/CounterDirectives.h"
+#include "flutter/sky/engine/core/rendering/style/DataRef.h"
+#include "flutter/sky/engine/core/rendering/style/FillLayer.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/core/rendering/style/ShapeValue.h"
+#include "flutter/sky/engine/core/rendering/style/StyleColor.h"
+#include "flutter/sky/engine/platform/LengthPoint.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleSurroundData.cpp b/sky/engine/core/rendering/style/StyleSurroundData.cpp
index 815e1b3..fe65046 100644
--- a/sky/engine/core/rendering/style/StyleSurroundData.cpp
+++ b/sky/engine/core/rendering/style/StyleSurroundData.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleSurroundData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleSurroundData.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleSurroundData.h b/sky/engine/core/rendering/style/StyleSurroundData.h
index a0be8ab..ad3826a 100644
--- a/sky/engine/core/rendering/style/StyleSurroundData.h
+++ b/sky/engine/core/rendering/style/StyleSurroundData.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLESURROUNDDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLESURROUNDDATA_H_
-#include "sky/engine/core/rendering/style/BorderData.h"
-#include "sky/engine/platform/LengthBox.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/core/rendering/style/BorderData.h"
+#include "flutter/sky/engine/platform/LengthBox.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleTransformData.cpp b/sky/engine/core/rendering/style/StyleTransformData.cpp
index 7f6f687..13c5f39 100644
--- a/sky/engine/core/rendering/style/StyleTransformData.cpp
+++ b/sky/engine/core/rendering/style/StyleTransformData.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleTransformData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleTransformData.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleTransformData.h b/sky/engine/core/rendering/style/StyleTransformData.h
index 7701fb6..085deb1 100644
--- a/sky/engine/core/rendering/style/StyleTransformData.h
+++ b/sky/engine/core/rendering/style/StyleTransformData.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLETRANSFORMDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLETRANSFORMDATA_H_
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/transforms/TransformOperations.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperations.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleVisualData.cpp b/sky/engine/core/rendering/style/StyleVisualData.cpp
index f0f6825..632a173 100644
--- a/sky/engine/core/rendering/style/StyleVisualData.cpp
+++ b/sky/engine/core/rendering/style/StyleVisualData.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/core/rendering/style/StyleVisualData.h"
+#include "flutter/sky/engine/core/rendering/style/StyleVisualData.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
namespace blink {
diff --git a/sky/engine/core/rendering/style/StyleVisualData.h b/sky/engine/core/rendering/style/StyleVisualData.h
index b72aa6c..c5e9e81 100644
--- a/sky/engine/core/rendering/style/StyleVisualData.h
+++ b/sky/engine/core/rendering/style/StyleVisualData.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_STYLEVISUALDATA_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_STYLEVISUALDATA_H_
-#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
-#include "sky/engine/platform/LengthBox.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyleConstants.h"
+#include "flutter/sky/engine/platform/LengthBox.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/core/script/dart_controller.cc b/sky/engine/core/script/dart_controller.cc
index 33f7157..94af211 100644
--- a/sky/engine/core/script/dart_controller.cc
+++ b/sky/engine/core/script/dart_controller.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/script/dart_controller.h"
+#include "flutter/sky/engine/core/script/dart_controller.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "flutter/tonic/dart_debugger.h"
@@ -11,7 +11,7 @@
#include "flutter/tonic/dart_library_loader.h"
#include "flutter/tonic/dart_snapshot_loader.h"
#include "flutter/tonic/dart_state.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "lib/tonic/dart_class_library.h"
#include "lib/tonic/dart_message_handler.h"
#include "lib/tonic/dart_wrappable.h"
@@ -20,15 +20,15 @@
#include "lib/tonic/scopes/dart_api_scope.h"
#include "lib/tonic/scopes/dart_isolate_scope.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "sky/engine/bindings/dart_mojo_internal.h"
-#include "sky/engine/bindings/dart_runtime_hooks.h"
-#include "sky/engine/bindings/dart_ui.h"
-#include "sky/engine/core/script/dart_init.h"
-#include "sky/engine/core/script/dart_service_isolate.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/platform/sky_settings.h"
-#include "sky/engine/wtf/MakeUnique.h"
+#include "flutter/sky/engine/bindings/dart_mojo_internal.h"
+#include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
+#include "flutter/sky/engine/bindings/dart_ui.h"
+#include "flutter/sky/engine/core/script/dart_init.h"
+#include "flutter/sky/engine/core/script/dart_service_isolate.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/sky_settings.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
#ifdef OS_ANDROID
#include "flutter/lib/jni/dart_jni.h"
diff --git a/sky/engine/core/script/dart_init.cc b/sky/engine/core/script/dart_init.cc
index e2f1f87..62976c0 100644
--- a/sky/engine/core/script/dart_init.cc
+++ b/sky/engine/core/script/dart_init.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/script/dart_init.h"
+#include "flutter/sky/engine/core/script/dart_init.h"
#include <dlfcn.h>
#include <fcntl.h>
@@ -21,7 +21,7 @@
#include "flutter/tonic/dart_library_loader.h"
#include "flutter/tonic/dart_snapshot_loader.h"
#include "flutter/tonic/dart_state.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "lib/ftl/files/eintr_wrapper.h"
#include "lib/ftl/files/unique_fd.h"
#include "lib/ftl/logging.h"
@@ -34,14 +34,14 @@
#include "lib/tonic/scopes/dart_isolate_scope.h"
#include "lib/tonic/typed_data/uint8_list.h"
#include "mojo/public/platform/dart/dart_handle_watcher.h"
-#include "sky/engine/bindings/dart_mojo_internal.h"
-#include "sky/engine/bindings/dart_runtime_hooks.h"
-#include "sky/engine/bindings/dart_ui.h"
-#include "sky/engine/core/script/dart_service_isolate.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/core/start_up.h"
-#include "sky/engine/public/platform/sky_settings.h"
-#include "sky/engine/wtf/MakeUnique.h"
+#include "flutter/sky/engine/bindings/dart_mojo_internal.h"
+#include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
+#include "flutter/sky/engine/bindings/dart_ui.h"
+#include "flutter/sky/engine/core/script/dart_service_isolate.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/core/start_up.h"
+#include "flutter/sky/engine/public/platform/sky_settings.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
#ifdef OS_ANDROID
#include "flutter/lib/jni/dart_jni.h"
diff --git a/sky/engine/core/script/dart_init.h b/sky/engine/core/script/dart_init.h
index 993efb8..fee3cdc 100644
--- a/sky/engine/core/script/dart_init.h
+++ b/sky/engine/core/script/dart_init.h
@@ -7,7 +7,7 @@
#include "dart/runtime/include/dart_api.h"
#include "lib/ftl/functional/closure.h"
-#include "sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
#include <memory>
#include <string>
diff --git a/sky/engine/core/script/dart_service_isolate.cc b/sky/engine/core/script/dart_service_isolate.cc
index a827f26..93e6b30 100644
--- a/sky/engine/core/script/dart_service_isolate.cc
+++ b/sky/engine/core/script/dart_service_isolate.cc
@@ -11,7 +11,7 @@
#include "lib/tonic/logging/dart_error.h"
#include "lib/tonic/dart_library_natives.h"
#include "lib/ftl/logging.h"
-#include "sky/engine/core/script/embedder_resources.h"
+#include "flutter/sky/engine/core/script/embedder_resources.h"
#define RETURN_ERROR_HANDLE(handle) \
if (Dart_IsError(handle)) { \
diff --git a/sky/engine/core/script/embedder_resources.cc b/sky/engine/core/script/embedder_resources.cc
index a96677a..daf28e3 100644
--- a/sky/engine/core/script/embedder_resources.cc
+++ b/sky/engine/core/script/embedder_resources.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/script/embedder_resources.h"
+#include "flutter/sky/engine/core/script/embedder_resources.h"
#include <string.h>
diff --git a/sky/engine/core/script/ui_dart_state.cc b/sky/engine/core/script/ui_dart_state.cc
index a81fc47..141ef4d 100644
--- a/sky/engine/core/script/ui_dart_state.cc
+++ b/sky/engine/core/script/ui_dart_state.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/core/window/window.h"
+#include "flutter/sky/engine/core/window/window.h"
namespace blink {
diff --git a/sky/engine/core/script/ui_dart_state.h b/sky/engine/core/script/ui_dart_state.h
index 8ca7160..1c5b546 100644
--- a/sky/engine/core/script/ui_dart_state.h
+++ b/sky/engine/core/script/ui_dart_state.h
@@ -5,9 +5,9 @@
#ifndef SKY_ENGINE_CORE_SCRIPT_UI_DART_STATE_H_
#define SKY_ENGINE_CORE_SCRIPT_UI_DART_STATE_H_
-#include "sky/engine/bindings/flutter_dart_state.h"
-#include "sky/engine/platform/fonts/FontSelector.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/bindings/flutter_dart_state.h"
+#include "flutter/sky/engine/platform/fonts/FontSelector.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
class Window;
diff --git a/sky/engine/core/start_up.cc b/sky/engine/core/start_up.cc
index 308a1aa..aff9717 100644
--- a/sky/engine/core/start_up.cc
+++ b/sky/engine/core/start_up.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/start_up.h"
+#include "flutter/sky/engine/core/start_up.h"
namespace blink {
diff --git a/sky/engine/core/text/Paragraph.cpp b/sky/engine/core/text/Paragraph.cpp
index ad2ac4b..6cce13e 100644
--- a/sky/engine/core/text/Paragraph.cpp
+++ b/sky/engine/core/text/Paragraph.cpp
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/text/ParagraphBuilder.h"
+#include "flutter/sky/engine/core/text/ParagraphBuilder.h"
#include "lib/tonic/dart_args.h"
#include "lib/tonic/dart_binding_macros.h"
#include "lib/tonic/dart_library_natives.h"
#include "lib/ftl/tasks/task_runner.h"
#include "lib/tonic/converter/dart_converter.h"
-#include "sky/engine/core/rendering/PaintInfo.h"
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/text/TextBoundaries.h"
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/core/rendering/PaintInfo.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/text/TextBoundaries.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
using tonic::ToDart;
diff --git a/sky/engine/core/text/Paragraph.h b/sky/engine/core/text/Paragraph.h
index 8a5293f..81017ae 100644
--- a/sky/engine/core/text/Paragraph.h
+++ b/sky/engine/core/text/Paragraph.h
@@ -7,8 +7,8 @@
#include "flutter/lib/ui/painting/canvas.h"
#include "lib/tonic/dart_wrappable.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/text/TextBox.h"
+#include "flutter/sky/engine/core/rendering/RenderView.h"
+#include "flutter/sky/engine/core/text/TextBox.h"
namespace tonic {
class DartLibraryNatives;
diff --git a/sky/engine/core/text/ParagraphBuilder.cpp b/sky/engine/core/text/ParagraphBuilder.cpp
index a0da68f..8ff7480 100644
--- a/sky/engine/core/text/ParagraphBuilder.cpp
+++ b/sky/engine/core/text/ParagraphBuilder.cpp
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/text/ParagraphBuilder.h"
+#include "flutter/sky/engine/core/text/ParagraphBuilder.h"
#include "lib/tonic/dart_args.h"
#include "lib/tonic/dart_binding_macros.h"
#include "lib/tonic/dart_library_natives.h"
#include "lib/ftl/tasks/task_runner.h"
#include "lib/tonic/converter/dart_converter.h"
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderParagraph.h"
-#include "sky/engine/core/rendering/RenderText.h"
-#include "sky/engine/core/rendering/style/RenderStyle.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/platform/text/LocaleToScriptMapping.h"
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/core/rendering/RenderInline.h"
+#include "flutter/sky/engine/core/rendering/RenderParagraph.h"
+#include "flutter/sky/engine/core/rendering/RenderText.h"
+#include "flutter/sky/engine/core/rendering/style/RenderStyle.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/platform/text/LocaleToScriptMapping.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
namespace blink {
namespace {
diff --git a/sky/engine/core/text/ParagraphBuilder.h b/sky/engine/core/text/ParagraphBuilder.h
index d070b04..4363fc5 100644
--- a/sky/engine/core/text/ParagraphBuilder.h
+++ b/sky/engine/core/text/ParagraphBuilder.h
@@ -7,7 +7,7 @@
#include "lib/tonic/dart_wrappable.h"
#include "lib/tonic/typed_data/int32_list.h"
-#include "sky/engine/core/text/Paragraph.h"
+#include "flutter/sky/engine/core/text/Paragraph.h"
namespace tonic {
class DartLibraryNatives;
diff --git a/sky/engine/core/text/TextBox.cpp b/sky/engine/core/text/TextBox.cpp
index 1986902..66df01b 100644
--- a/sky/engine/core/text/TextBox.cpp
+++ b/sky/engine/core/text/TextBox.cpp
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/text/TextBox.h"
+#include "flutter/sky/engine/core/text/TextBox.h"
#include "lib/ftl/logging.h"
#include "lib/tonic/dart_class_library.h"
#include "lib/tonic/logging/dart_error.h"
-#include "sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
using namespace blink;
diff --git a/sky/engine/core/text/TextBox.h b/sky/engine/core/text/TextBox.h
index b19781f..38ea9b1 100644
--- a/sky/engine/core/text/TextBox.h
+++ b/sky/engine/core/text/TextBox.h
@@ -7,7 +7,7 @@
#include "dart/runtime/include/dart_api.h"
#include "lib/tonic/converter/dart_converter.h"
-#include "sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
#include "third_party/skia/include/core/SkRect.h"
namespace blink {
diff --git a/sky/engine/core/window/window.cc b/sky/engine/core/window/window.cc
index 0db8395..50788ad 100644
--- a/sky/engine/core/window/window.cc
+++ b/sky/engine/core/window/window.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/core/window/window.h"
+#include "flutter/sky/engine/core/window/window.h"
#include "flutter/lib/ui/compositing/scene.h"
#include "lib/tonic/converter/dart_converter.h"
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/dart_library_natives.h"
-#include "sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
using tonic::DartInvokeField;
using tonic::StdStringToDart;
diff --git a/sky/engine/core/window/window.h b/sky/engine/core/window/window.h
index d342752..433f6dc 100644
--- a/sky/engine/core/window/window.h
+++ b/sky/engine/core/window/window.h
@@ -7,9 +7,9 @@
#include "lib/ftl/time/time_point.h"
#include "lib/tonic/dart_persistent_value.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/services/engine/sky_engine.mojom.h"
-#include "sky/services/pointer/pointer.mojom.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
+#include "flutter/services/pointer/pointer.mojom.h"
namespace tonic {
class DartLibraryNatives;
diff --git a/sky/engine/platform/BUILD.gn b/sky/engine/platform/BUILD.gn
index df37c0b..7a28f40 100644
--- a/sky/engine/platform/BUILD.gn
+++ b/sky/engine/platform/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
-import("//sky/engine/config.gni")
+import("//flutter/sky/engine/config.gni")
import("//testing/test.gni")
source_set("platform") {
@@ -283,8 +283,8 @@
}
configs += [
- "//sky/engine:config",
- "//sky/engine:non_test_config",
+ "//flutter/sky/engine:config",
+ "//flutter/sky/engine:non_test_config",
]
defines = [
@@ -303,13 +303,13 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/services/network/interfaces",
- "//skia",
- "//sky/engine/wtf",
+ "//flutter/skia",
+ "//flutter/sky/engine/wtf",
"//third_party/harfbuzz-ng",
]
forward_dependent_configs_from = [
- "//skia",
+ "//flutter/skia",
]
if (is_android) {
@@ -356,18 +356,18 @@
"transforms/TransformationMatrixTest.cpp",
]
- configs += [ "//sky/engine:config" ]
+ configs += [ "//flutter/sky/engine:config" ]
deps = [
":platform",
"//base",
"//base/allocator",
"//base/test:test_support",
- "//skia",
+ "//flutter/skia",
"//testing/gmock",
"//testing/gtest",
- "//sky/engine/wtf",
- "//sky/engine/wtf:test_support",
+ "//flutter/sky/engine/wtf",
+ "//flutter/sky/engine/wtf:test_support",
]
# TODO(abarth): This is a lie - this test is not embedded in an environment
diff --git a/sky/engine/platform/CalculationValue.h b/sky/engine/platform/CalculationValue.h
index ebf90ec..549b1ed 100644
--- a/sky/engine/platform/CalculationValue.h
+++ b/sky/engine/platform/CalculationValue.h
@@ -31,11 +31,11 @@
#ifndef SKY_ENGINE_PLATFORM_CALCULATIONVALUE_H_
#define SKY_ENGINE_PLATFORM_CALCULATIONVALUE_H_
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/platform/Decimal.cpp b/sky/engine/platform/Decimal.cpp
index 75dc8b2..ba78d2b 100644
--- a/sky/engine/platform/Decimal.cpp
+++ b/sky/engine/platform/Decimal.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/Decimal.h"
+#include "flutter/sky/engine/platform/Decimal.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
#include <float.h>
#include <algorithm>
diff --git a/sky/engine/platform/Decimal.h b/sky/engine/platform/Decimal.h
index c6faed9..f65480d 100644
--- a/sky/engine/platform/Decimal.h
+++ b/sky/engine/platform/Decimal.h
@@ -32,9 +32,9 @@
#define SKY_ENGINE_PLATFORM_DECIMAL_H_
#include <stdint.h>
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/DecimalTest.cpp b/sky/engine/platform/DecimalTest.cpp
index 5548d36..ea4fe4a 100644
--- a/sky/engine/platform/DecimalTest.cpp
+++ b/sky/engine/platform/DecimalTest.cpp
@@ -28,12 +28,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/Decimal.h"
+#include "flutter/sky/engine/platform/Decimal.h"
#include <float.h>
#include <gtest/gtest.h>
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
namespace blink {
diff --git a/sky/engine/platform/Language.cpp b/sky/engine/platform/Language.cpp
index fea50d2..cc891c7 100644
--- a/sky/engine/platform/Language.cpp
+++ b/sky/engine/platform/Language.cpp
@@ -23,10 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/Language.h"
+#include "flutter/sky/engine/platform/Language.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/Language.h b/sky/engine/platform/Language.h
index 3c8d48c..19b2db6 100644
--- a/sky/engine/platform/Language.h
+++ b/sky/engine/platform/Language.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_PLATFORM_LANGUAGE_H_
#define SKY_ENGINE_PLATFORM_LANGUAGE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/LayoutUnit.h b/sky/engine/platform/LayoutUnit.h
index c3273d2..81c652f 100644
--- a/sky/engine/platform/LayoutUnit.h
+++ b/sky/engine/platform/LayoutUnit.h
@@ -34,9 +34,9 @@
#include <limits.h>
#include <stdlib.h>
#include <limits>
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/SaturatedArithmetic.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/SaturatedArithmetic.h"
namespace blink {
diff --git a/sky/engine/platform/LayoutUnitTest.cpp b/sky/engine/platform/LayoutUnitTest.cpp
index 8f67319..f4c0d7d 100644
--- a/sky/engine/platform/LayoutUnitTest.cpp
+++ b/sky/engine/platform/LayoutUnitTest.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
#include <gtest/gtest.h>
#include <limits.h>
diff --git a/sky/engine/platform/Length.cpp b/sky/engine/platform/Length.cpp
index 3bcd3b3..9a3a9ce 100644
--- a/sky/engine/platform/Length.cpp
+++ b/sky/engine/platform/Length.cpp
@@ -22,13 +22,13 @@
*
*/
-#include "sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/Length.h"
-#include "sky/engine/platform/CalculationValue.h"
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/CalculationValue.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
using namespace WTF;
diff --git a/sky/engine/platform/Length.h b/sky/engine/platform/Length.h
index 628ccb2..9cd4fc6 100644
--- a/sky/engine/platform/Length.h
+++ b/sky/engine/platform/Length.h
@@ -24,14 +24,14 @@
#define SKY_ENGINE_PLATFORM_LENGTH_H_
#include <cstring>
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/LengthBox.cpp b/sky/engine/platform/LengthBox.cpp
index 783c20d..e3362b3 100644
--- a/sky/engine/platform/LengthBox.cpp
+++ b/sky/engine/platform/LengthBox.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/LengthBox.h"
+#include "flutter/sky/engine/platform/LengthBox.h"
namespace blink {
diff --git a/sky/engine/platform/LengthBox.h b/sky/engine/platform/LengthBox.h
index 0ef57bd..2296e56 100644
--- a/sky/engine/platform/LengthBox.h
+++ b/sky/engine/platform/LengthBox.h
@@ -22,9 +22,9 @@
#ifndef SKY_ENGINE_PLATFORM_LENGTHBOX_H_
#define SKY_ENGINE_PLATFORM_LENGTHBOX_H_
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
namespace blink {
diff --git a/sky/engine/platform/LengthFunctions.cpp b/sky/engine/platform/LengthFunctions.cpp
index e211cd1..91cb98e 100644
--- a/sky/engine/platform/LengthFunctions.cpp
+++ b/sky/engine/platform/LengthFunctions.cpp
@@ -21,10 +21,10 @@
Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/LengthSize.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/LengthSize.h"
namespace blink {
diff --git a/sky/engine/platform/LengthFunctions.h b/sky/engine/platform/LengthFunctions.h
index 462e83c..4d27894 100644
--- a/sky/engine/platform/LengthFunctions.h
+++ b/sky/engine/platform/LengthFunctions.h
@@ -24,7 +24,7 @@
#ifndef SKY_ENGINE_PLATFORM_LENGTHFUNCTIONS_H_
#define SKY_ENGINE_PLATFORM_LENGTHFUNCTIONS_H_
-#include "sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
namespace blink {
diff --git a/sky/engine/platform/LengthPoint.h b/sky/engine/platform/LengthPoint.h
index e6c5898..94680a6 100644
--- a/sky/engine/platform/LengthPoint.h
+++ b/sky/engine/platform/LengthPoint.h
@@ -30,7 +30,7 @@
#ifndef SKY_ENGINE_PLATFORM_LENGTHPOINT_H_
#define SKY_ENGINE_PLATFORM_LENGTHPOINT_H_
-#include "sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/Length.h"
namespace blink {
diff --git a/sky/engine/platform/LengthSize.h b/sky/engine/platform/LengthSize.h
index 9e15357..c81e32a 100644
--- a/sky/engine/platform/LengthSize.h
+++ b/sky/engine/platform/LengthSize.h
@@ -21,7 +21,7 @@
#ifndef SKY_ENGINE_PLATFORM_LENGTHSIZE_H_
#define SKY_ENGINE_PLATFORM_LENGTHSIZE_H_
-#include "sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/Length.h"
namespace blink {
diff --git a/sky/engine/platform/NotImplemented.h b/sky/engine/platform/NotImplemented.h
index 9bc8124..03934d3 100644
--- a/sky/engine/platform/NotImplemented.h
+++ b/sky/engine/platform/NotImplemented.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_PLATFORM_NOTIMPLEMENTED_H_
#define SKY_ENGINE_PLATFORM_NOTIMPLEMENTED_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
#define notImplemented() ((void)0)
diff --git a/sky/engine/platform/Partitions.cpp b/sky/engine/platform/Partitions.cpp
index 4d56bad..551b057 100644
--- a/sky/engine/platform/Partitions.cpp
+++ b/sky/engine/platform/Partitions.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/platform/Partitions.h"
namespace blink {
diff --git a/sky/engine/platform/Partitions.h b/sky/engine/platform/Partitions.h
index 18e8bb9..db83050 100644
--- a/sky/engine/platform/Partitions.h
+++ b/sky/engine/platform/Partitions.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_PLATFORM_PARTITIONS_H_
#define SKY_ENGINE_PLATFORM_PARTITIONS_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
namespace blink {
diff --git a/sky/engine/platform/PurgeableVector.cpp b/sky/engine/platform/PurgeableVector.cpp
index b52f6dc..53c1d5f 100644
--- a/sky/engine/platform/PurgeableVector.cpp
+++ b/sky/engine/platform/PurgeableVector.cpp
@@ -28,13 +28,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/PurgeableVector.h"
+#include "flutter/sky/engine/platform/PurgeableVector.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/platform/WebDiscardableMemory.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/WebDiscardableMemory.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
#include <cstring>
diff --git a/sky/engine/platform/PurgeableVector.h b/sky/engine/platform/PurgeableVector.h
index a892337..da88d12 100644
--- a/sky/engine/platform/PurgeableVector.h
+++ b/sky/engine/platform/PurgeableVector.h
@@ -31,10 +31,10 @@
#ifndef SKY_ENGINE_PLATFORM_PURGEABLEVECTOR_H_
#define SKY_ENGINE_PLATFORM_PURGEABLEVECTOR_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/PurgeableVectorTest.cpp b/sky/engine/platform/PurgeableVectorTest.cpp
index fd864cd..42a6f20 100644
--- a/sky/engine/platform/PurgeableVectorTest.cpp
+++ b/sky/engine/platform/PurgeableVectorTest.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/PurgeableVector.h"
+#include "flutter/sky/engine/platform/PurgeableVector.h"
-#include "sky/engine/platform/TestingPlatformSupport.h"
-#include "sky/engine/public/platform/WebDiscardableMemory.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/TestingPlatformSupport.h"
+#include "flutter/sky/engine/public/platform/WebDiscardableMemory.h"
+#include "flutter/sky/engine/wtf/Vector.h"
#include <algorithm>
#include <cstdlib>
diff --git a/sky/engine/platform/SharedBuffer.cpp b/sky/engine/platform/SharedBuffer.cpp
index 93fd41a..cdf135e 100644
--- a/sky/engine/platform/SharedBuffer.cpp
+++ b/sky/engine/platform/SharedBuffer.cpp
@@ -24,16 +24,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/SharedBuffer.h"
+#include "flutter/sky/engine/platform/SharedBuffer.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/unicode/UTF8.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/unicode/UTF8.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#undef SHARED_BUFFER_STATS
#ifdef SHARED_BUFFER_STATS
-#include "sky/engine/wtf/DataLog.h"
+#include "flutter/sky/engine/wtf/DataLog.h"
#endif
namespace blink {
diff --git a/sky/engine/platform/SharedBuffer.h b/sky/engine/platform/SharedBuffer.h
index 3b00a78..52e46a0 100644
--- a/sky/engine/platform/SharedBuffer.h
+++ b/sky/engine/platform/SharedBuffer.h
@@ -27,12 +27,12 @@
#ifndef SKY_ENGINE_PLATFORM_SHAREDBUFFER_H_
#define SKY_ENGINE_PLATFORM_SHAREDBUFFER_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/PurgeableVector.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/PurgeableVector.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include "third_party/skia/include/core/SkData.h"
namespace blink {
diff --git a/sky/engine/platform/TestingPlatformSupport.cpp b/sky/engine/platform/TestingPlatformSupport.cpp
index c19d18a..056e1c6 100644
--- a/sky/engine/platform/TestingPlatformSupport.cpp
+++ b/sky/engine/platform/TestingPlatformSupport.cpp
@@ -29,7 +29,7 @@
*/
-#include "sky/engine/platform/TestingPlatformSupport.h"
+#include "flutter/sky/engine/platform/TestingPlatformSupport.h"
namespace blink {
diff --git a/sky/engine/platform/TestingPlatformSupport.h b/sky/engine/platform/TestingPlatformSupport.h
index 5ec2b1f..e9183ca 100644
--- a/sky/engine/platform/TestingPlatformSupport.h
+++ b/sky/engine/platform/TestingPlatformSupport.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_TESTINGPLATFORMSUPPORT_H_
#define SKY_ENGINE_PLATFORM_TESTINGPLATFORMSUPPORT_H_
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/platform/WebDiscardableMemory.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/WebDiscardableMemory.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/animation/AnimationUtilities.h b/sky/engine/platform/animation/AnimationUtilities.h
index dfee1cb..4d236e8 100644
--- a/sky/engine/platform/animation/AnimationUtilities.h
+++ b/sky/engine/platform/animation/AnimationUtilities.h
@@ -26,12 +26,12 @@
#ifndef SKY_ENGINE_PLATFORM_ANIMATION_ANIMATIONUTILITIES_H_
#define SKY_ENGINE_PLATFORM_ANIMATION_ANIMATIONUTILITIES_H_
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/IntPoint.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/IntPoint.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
namespace blink {
diff --git a/sky/engine/platform/animation/AnimationValue.h b/sky/engine/platform/animation/AnimationValue.h
index 20c165b..5a28874 100644
--- a/sky/engine/platform/animation/AnimationValue.h
+++ b/sky/engine/platform/animation/AnimationValue.h
@@ -27,11 +27,11 @@
#ifndef SKY_ENGINE_PLATFORM_ANIMATION_ANIMATIONVALUE_H_
#define SKY_ENGINE_PLATFORM_ANIMATION_ANIMATIONVALUE_H_
-#include "sky/engine/platform/animation/TimingFunction.h"
-#include "sky/engine/platform/transforms/TransformOperations.h"
+#include "flutter/sky/engine/platform/animation/TimingFunction.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperations.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/platform/animation/KeyframeValueList.cpp b/sky/engine/platform/animation/KeyframeValueList.cpp
index a073689..3e9ed26 100644
--- a/sky/engine/platform/animation/KeyframeValueList.cpp
+++ b/sky/engine/platform/animation/KeyframeValueList.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/animation/KeyframeValueList.h"
+#include "flutter/sky/engine/platform/animation/KeyframeValueList.h"
namespace blink {
diff --git a/sky/engine/platform/animation/KeyframeValueList.h b/sky/engine/platform/animation/KeyframeValueList.h
index 148f508..a3a0384 100644
--- a/sky/engine/platform/animation/KeyframeValueList.h
+++ b/sky/engine/platform/animation/KeyframeValueList.h
@@ -27,11 +27,11 @@
#ifndef SKY_ENGINE_PLATFORM_ANIMATION_KEYFRAMEVALUELIST_H_
#define SKY_ENGINE_PLATFORM_ANIMATION_KEYFRAMEVALUELIST_H_
-#include "sky/engine/platform/animation/AnimationValue.h"
+#include "flutter/sky/engine/platform/animation/AnimationValue.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/animation/TimingFunction.cpp b/sky/engine/platform/animation/TimingFunction.cpp
index 2ed6af1..c6b32e3 100644
--- a/sky/engine/platform/animation/TimingFunction.cpp
+++ b/sky/engine/platform/animation/TimingFunction.cpp
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/animation/TimingFunction.h"
+#include "flutter/sky/engine/platform/animation/TimingFunction.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/animation/TimingFunction.h b/sky/engine/platform/animation/TimingFunction.h
index bf17317..6329e6b 100644
--- a/sky/engine/platform/animation/TimingFunction.h
+++ b/sky/engine/platform/animation/TimingFunction.h
@@ -26,15 +26,15 @@
#define SKY_ENGINE_PLATFORM_ANIMATION_TIMINGFUNCTION_H_
#include <algorithm>
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/platform/animation/UnitBezier.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/platform/animation/UnitBezier.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/animation/TimingFunctionTest.cpp b/sky/engine/platform/animation/TimingFunctionTest.cpp
index 6e6a167..1a6c1c8 100644
--- a/sky/engine/platform/animation/TimingFunctionTest.cpp
+++ b/sky/engine/platform/animation/TimingFunctionTest.cpp
@@ -28,13 +28,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/animation/TimingFunction.h"
+#include "flutter/sky/engine/platform/animation/TimingFunction.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <sstream>
#include <string>
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
// Macro is only used to allow the use of streams.
// Can be removed if a pretty failure message isn't needed.
diff --git a/sky/engine/platform/animation/UnitBezier.h b/sky/engine/platform/animation/UnitBezier.h
index 81c28b0..7957e6d 100644
--- a/sky/engine/platform/animation/UnitBezier.h
+++ b/sky/engine/platform/animation/UnitBezier.h
@@ -27,8 +27,8 @@
#define SKY_ENGINE_PLATFORM_ANIMATION_UNITBEZIER_H_
#include <math.h>
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/platform/animation/UnitBezierTest.cpp b/sky/engine/platform/animation/UnitBezierTest.cpp
index 8df71fd..bf2263f 100644
--- a/sky/engine/platform/animation/UnitBezierTest.cpp
+++ b/sky/engine/platform/animation/UnitBezierTest.cpp
@@ -23,7 +23,7 @@
*/
-#include "sky/engine/platform/animation/UnitBezier.h"
+#include "flutter/sky/engine/platform/animation/UnitBezier.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/exported/Platform.cpp b/sky/engine/platform/exported/Platform.cpp
index daa5bb6..503a8fc 100644
--- a/sky/engine/platform/exported/Platform.cpp
+++ b/sky/engine/platform/exported/Platform.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
namespace blink {
diff --git a/sky/engine/platform/exported/WebCString.cpp b/sky/engine/platform/exported/WebCString.cpp
index e9ab290..6abe973 100644
--- a/sky/engine/platform/exported/WebCString.cpp
+++ b/sky/engine/platform/exported/WebCString.cpp
@@ -29,10 +29,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/platform/WebCString.h"
+#include "flutter/sky/engine/public/platform/WebCString.h"
#include <string.h>
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
namespace blink {
diff --git a/sky/engine/platform/exported/WebCommon.cpp b/sky/engine/platform/exported/WebCommon.cpp
index 7f3e90d..af0ad64 100644
--- a/sky/engine/platform/exported/WebCommon.cpp
+++ b/sky/engine/platform/exported/WebCommon.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/platform/exported/linux/WebFontInfo.cpp b/sky/engine/platform/exported/linux/WebFontInfo.cpp
index 6ad7455..6ee68fe 100644
--- a/sky/engine/platform/exported/linux/WebFontInfo.cpp
+++ b/sky/engine/platform/exported/linux/WebFontInfo.cpp
@@ -28,19 +28,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/platform/linux/WebFontInfo.h"
+#include "flutter/sky/engine/public/platform/linux/WebFontInfo.h"
#include <fontconfig/fontconfig.h>
#include <string.h>
#include <unicode/utf16.h>
-#include "sky/engine/public/platform/linux/WebFallbackFont.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/AtomicStringHash.h"
+#include "flutter/sky/engine/public/platform/linux/WebFallbackFont.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/AtomicStringHash.h"
namespace blink {
diff --git a/sky/engine/platform/exported/linux/WebFontRenderStyle.cpp b/sky/engine/platform/exported/linux/WebFontRenderStyle.cpp
index df01f55..5c5d57f 100644
--- a/sky/engine/platform/exported/linux/WebFontRenderStyle.cpp
+++ b/sky/engine/platform/exported/linux/WebFontRenderStyle.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/platform/linux/WebFontRenderStyle.h"
+#include "flutter/sky/engine/public/platform/linux/WebFontRenderStyle.h"
-#include "sky/engine/platform/fonts/FontRenderStyle.h"
+#include "flutter/sky/engine/platform/fonts/FontRenderStyle.h"
using blink::FontRenderStyle;
diff --git a/sky/engine/platform/exported/sky_settings.cc b/sky/engine/platform/exported/sky_settings.cc
index 8ad3f0d..c444a06 100644
--- a/sky/engine/platform/exported/sky_settings.cc
+++ b/sky/engine/platform/exported/sky_settings.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/public/platform/sky_settings.h"
+#include "flutter/sky/engine/public/platform/sky_settings.h"
#include <memory>
diff --git a/sky/engine/platform/fonts/AlternateFontFamily.h b/sky/engine/platform/fonts/AlternateFontFamily.h
index 2fdf64b..8bd0a54 100644
--- a/sky/engine/platform/fonts/AlternateFontFamily.h
+++ b/sky/engine/platform/fonts/AlternateFontFamily.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_ALTERNATEFONTFAMILY_H_
#define SKY_ENGINE_PLATFORM_FONTS_ALTERNATEFONTFAMILY_H_
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/Character.cpp b/sky/engine/platform/fonts/Character.cpp
index 28b2a84..0d2ae59 100644
--- a/sky/engine/platform/fonts/Character.cpp
+++ b/sky/engine/platform/fonts/Character.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/fonts/FontPlatformFeatures.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformFeatures.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
using namespace WTF;
using namespace Unicode;
diff --git a/sky/engine/platform/fonts/Character.h b/sky/engine/platform/fonts/Character.h
index c299c22..5634b32 100644
--- a/sky/engine/platform/fonts/Character.h
+++ b/sky/engine/platform/fonts/Character.h
@@ -31,12 +31,12 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_CHARACTER_H_
#define SKY_ENGINE_PLATFORM_FONTS_CHARACTER_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/platform/text/TextPath.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/TextPath.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/CustomFontData.h b/sky/engine/platform/fonts/CustomFontData.h
index ff39bff..8816e4f 100644
--- a/sky/engine/platform/fonts/CustomFontData.h
+++ b/sky/engine/platform/fonts/CustomFontData.h
@@ -22,10 +22,10 @@
#define SKY_ENGINE_PLATFORM_FONTS_CUSTOMFONTDATA_H_
#include <unicode/uchar.h>
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/Glyph.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/Glyph.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/Font.cpp b/sky/engine/platform/fonts/Font.cpp
index eba0973..f0e8815 100644
--- a/sky/engine/platform/fonts/Font.cpp
+++ b/sky/engine/platform/fonts/Font.cpp
@@ -21,25 +21,25 @@
*
*/
-#include "sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontFallbackList.h"
-#include "sky/engine/platform/fonts/FontPlatformFeatures.h"
-#include "sky/engine/platform/fonts/GlyphBuffer.h"
-#include "sky/engine/platform/fonts/GlyphPageTreeNode.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/WidthIterator.h"
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontFallbackList.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformFeatures.h"
+#include "flutter/sky/engine/platform/fonts/GlyphBuffer.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPageTreeNode.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/WidthIterator.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
using namespace WTF;
using namespace Unicode;
diff --git a/sky/engine/platform/fonts/Font.h b/sky/engine/platform/fonts/Font.h
index 4b776bc..45de7cd 100644
--- a/sky/engine/platform/fonts/Font.h
+++ b/sky/engine/platform/fonts/Font.h
@@ -25,17 +25,17 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONT_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONT_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/FontFallbackList.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/TextBlob.h"
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/platform/text/TextPath.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontFallbackList.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/TextBlob.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/TextPath.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
// "X11/X.h" defines Complex to 0 and conflicts
// with Complex value in CodePath enum.
diff --git a/sky/engine/platform/fonts/FontCache.cpp b/sky/engine/platform/fonts/FontCache.cpp
index 5566871..a3d7448 100644
--- a/sky/engine/platform/fonts/FontCache.cpp
+++ b/sky/engine/platform/fonts/FontCache.cpp
@@ -27,24 +27,24 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/AlternateFontFamily.h"
-#include "sky/engine/platform/fonts/FontCacheClient.h"
-#include "sky/engine/platform/fonts/FontCacheKey.h"
-#include "sky/engine/platform/fonts/FontDataCache.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/FontFallbackList.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/platform/fonts/FontSmoothingMode.h"
-#include "sky/engine/platform/fonts/TextRenderingMode.h"
-#include "sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/ListHashSet.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/AtomicStringHash.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/platform/fonts/AlternateFontFamily.h"
+#include "flutter/sky/engine/platform/fonts/FontCacheClient.h"
+#include "flutter/sky/engine/platform/fonts/FontCacheKey.h"
+#include "flutter/sky/engine/platform/fonts/FontDataCache.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontFallbackList.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/FontSmoothingMode.h"
+#include "flutter/sky/engine/platform/fonts/TextRenderingMode.h"
+#include "flutter/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/AtomicStringHash.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
using namespace WTF;
diff --git a/sky/engine/platform/fonts/FontCache.h b/sky/engine/platform/fonts/FontCache.h
index 9ec3863..00b41d9 100644
--- a/sky/engine/platform/fonts/FontCache.h
+++ b/sky/engine/platform/fonts/FontCache.h
@@ -31,15 +31,15 @@
#define SKY_ENGINE_PLATFORM_FONTS_FONTCACHE_H_
#include <limits.h>
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/FontFaceCreationParams.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/FontFaceCreationParams.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#if OS(ANDROID)
diff --git a/sky/engine/platform/fonts/FontCacheClient.h b/sky/engine/platform/fonts/FontCacheClient.h
index 0375e5e..32fa7e5 100644
--- a/sky/engine/platform/fonts/FontCacheClient.h
+++ b/sky/engine/platform/fonts/FontCacheClient.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTCACHECLIENT_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTCACHECLIENT_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/heap/Handle.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/heap/Handle.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontCacheKey.h b/sky/engine/platform/fonts/FontCacheKey.h
index 5e32f60..3319589 100644
--- a/sky/engine/platform/fonts/FontCacheKey.h
+++ b/sky/engine/platform/fonts/FontCacheKey.h
@@ -31,11 +31,11 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTCACHEKEY_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTCACHEKEY_H_
-#include "sky/engine/platform/fonts/FontFaceCreationParams.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/text/AtomicStringHash.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/platform/fonts/FontFaceCreationParams.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/text/AtomicStringHash.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontCacheTest.cpp b/sky/engine/platform/fonts/FontCacheTest.cpp
index 5f7c5a1..8cfb843 100644
--- a/sky/engine/platform/fonts/FontCacheTest.cpp
+++ b/sky/engine/platform/fonts/FontCacheTest.cpp
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
#include <gtest/gtest.h>
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontCustomPlatformData.h b/sky/engine/platform/fonts/FontCustomPlatformData.h
index 4495df0..655dc6c 100644
--- a/sky/engine/platform/fonts/FontCustomPlatformData.h
+++ b/sky/engine/platform/fonts/FontCustomPlatformData.h
@@ -32,13 +32,13 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTCUSTOMPLATFORMDATA_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTCUSTOMPLATFORMDATA_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/FontOrientation.h"
-#include "sky/engine/platform/fonts/FontWidthVariant.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/FontOrientation.h"
+#include "flutter/sky/engine/platform/fonts/FontWidthVariant.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include "third_party/skia/include/core/SkRefCnt.h"
class SkTypeface;
diff --git a/sky/engine/platform/fonts/FontData.cpp b/sky/engine/platform/fonts/FontData.cpp
index 375a636..1fa14c0 100644
--- a/sky/engine/platform/fonts/FontData.cpp
+++ b/sky/engine/platform/fonts/FontData.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontData.h"
+#include "flutter/sky/engine/platform/fonts/FontData.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontData.h b/sky/engine/platform/fonts/FontData.h
index 7f800a4..8b74c18 100644
--- a/sky/engine/platform/fonts/FontData.h
+++ b/sky/engine/platform/fonts/FontData.h
@@ -26,13 +26,13 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTDATA_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTDATA_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontDataCache.cpp b/sky/engine/platform/fonts/FontDataCache.cpp
index 94276ed..85ef1d7 100644
--- a/sky/engine/platform/fonts/FontDataCache.cpp
+++ b/sky/engine/platform/fonts/FontDataCache.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontDataCache.h"
+#include "flutter/sky/engine/platform/fonts/FontDataCache.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
using namespace WTF;
diff --git a/sky/engine/platform/fonts/FontDataCache.h b/sky/engine/platform/fonts/FontDataCache.h
index 03915a1..c0d61ed 100644
--- a/sky/engine/platform/fonts/FontDataCache.h
+++ b/sky/engine/platform/fonts/FontDataCache.h
@@ -31,10 +31,10 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTDATACACHE_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTDATACACHE_H_
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontDescription.cpp b/sky/engine/platform/fonts/FontDescription.cpp
index 575a08e..fc4119d 100644
--- a/sky/engine/platform/fonts/FontDescription.cpp
+++ b/sky/engine/platform/fonts/FontDescription.cpp
@@ -27,10 +27,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/wtf/text/AtomicStringHash.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/text/AtomicStringHash.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontDescription.h b/sky/engine/platform/fonts/FontDescription.h
index 28eb074..f3a898c 100644
--- a/sky/engine/platform/fonts/FontDescription.h
+++ b/sky/engine/platform/fonts/FontDescription.h
@@ -25,20 +25,20 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTDESCRIPTION_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTDESCRIPTION_H_
-#include "sky/engine/platform/fonts/FixedPitchFontType.h"
-#include "sky/engine/platform/fonts/FontCacheKey.h"
-#include "sky/engine/platform/fonts/FontFamily.h"
-#include "sky/engine/platform/fonts/FontFeatureSettings.h"
-#include "sky/engine/platform/fonts/FontOrientation.h"
-#include "sky/engine/platform/fonts/FontSmoothingMode.h"
-#include "sky/engine/platform/fonts/FontTraits.h"
-#include "sky/engine/platform/fonts/FontWidthVariant.h"
-#include "sky/engine/platform/fonts/TextRenderingMode.h"
-#include "sky/engine/platform/fonts/TypesettingFeatures.h"
-#include "sky/engine/platform/text/NonCJKGlyphOrientation.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/fonts/FixedPitchFontType.h"
+#include "flutter/sky/engine/platform/fonts/FontCacheKey.h"
+#include "flutter/sky/engine/platform/fonts/FontFamily.h"
+#include "flutter/sky/engine/platform/fonts/FontFeatureSettings.h"
+#include "flutter/sky/engine/platform/fonts/FontOrientation.h"
+#include "flutter/sky/engine/platform/fonts/FontSmoothingMode.h"
+#include "flutter/sky/engine/platform/fonts/FontTraits.h"
+#include "flutter/sky/engine/platform/fonts/FontWidthVariant.h"
+#include "flutter/sky/engine/platform/fonts/TextRenderingMode.h"
+#include "flutter/sky/engine/platform/fonts/TypesettingFeatures.h"
+#include "flutter/sky/engine/platform/text/NonCJKGlyphOrientation.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
#include <unicode/uscript.h>
diff --git a/sky/engine/platform/fonts/FontDescriptionTest.cpp b/sky/engine/platform/fonts/FontDescriptionTest.cpp
index d65e232..dd81b59 100644
--- a/sky/engine/platform/fonts/FontDescriptionTest.cpp
+++ b/sky/engine/platform/fonts/FontDescriptionTest.cpp
@@ -24,7 +24,7 @@
*/
-#include "sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/fonts/FontFaceCreationParams.h b/sky/engine/platform/fonts/FontFaceCreationParams.h
index 3097efd..b6376d0 100644
--- a/sky/engine/platform/fonts/FontFaceCreationParams.h
+++ b/sky/engine/platform/fonts/FontFaceCreationParams.h
@@ -31,10 +31,10 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTFACECREATIONPARAMS_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTFACECREATIONPARAMS_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/StringHasher.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/StringHasher.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontFallbackList.cpp b/sky/engine/platform/fonts/FontFallbackList.cpp
index 02c8b24..210bb2d 100644
--- a/sky/engine/platform/fonts/FontFallbackList.cpp
+++ b/sky/engine/platform/fonts/FontFallbackList.cpp
@@ -26,13 +26,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontFallbackList.h"
+#include "flutter/sky/engine/platform/fonts/FontFallbackList.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/FontFamily.h"
-#include "sky/engine/platform/fonts/SegmentedFontData.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontFamily.h"
+#include "flutter/sky/engine/platform/fonts/SegmentedFontData.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontFallbackList.h b/sky/engine/platform/fonts/FontFallbackList.h
index bf2b668..5e07b2e 100644
--- a/sky/engine/platform/fonts/FontFallbackList.h
+++ b/sky/engine/platform/fonts/FontFallbackList.h
@@ -21,11 +21,11 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTFALLBACKLIST_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTFALLBACKLIST_H_
-#include "sky/engine/platform/fonts/FontSelector.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/WidthCache.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/platform/fonts/FontSelector.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/WidthCache.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontFamily.cpp b/sky/engine/platform/fonts/FontFamily.cpp
index 5386e95..192b1c3 100644
--- a/sky/engine/platform/fonts/FontFamily.cpp
+++ b/sky/engine/platform/fonts/FontFamily.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontFamily.h"
+#include "flutter/sky/engine/platform/fonts/FontFamily.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontFamily.h b/sky/engine/platform/fonts/FontFamily.h
index 7761a9a..5bf5642 100644
--- a/sky/engine/platform/fonts/FontFamily.h
+++ b/sky/engine/platform/fonts/FontFamily.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTFAMILY_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTFAMILY_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontFeatureSettings.cpp b/sky/engine/platform/fonts/FontFeatureSettings.cpp
index a7fce92..6712dde 100644
--- a/sky/engine/platform/fonts/FontFeatureSettings.cpp
+++ b/sky/engine/platform/fonts/FontFeatureSettings.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontFeatureSettings.h"
+#include "flutter/sky/engine/platform/fonts/FontFeatureSettings.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontFeatureSettings.h b/sky/engine/platform/fonts/FontFeatureSettings.h
index dfa0604..43d47e1 100644
--- a/sky/engine/platform/fonts/FontFeatureSettings.h
+++ b/sky/engine/platform/fonts/FontFeatureSettings.h
@@ -26,12 +26,12 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTFEATURESETTINGS_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTFEATURESETTINGS_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontMetrics.h b/sky/engine/platform/fonts/FontMetrics.h
index 42d164b..25ad474 100644
--- a/sky/engine/platform/fonts/FontMetrics.h
+++ b/sky/engine/platform/fonts/FontMetrics.h
@@ -20,8 +20,8 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTMETRICS_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTMETRICS_H_
-#include "sky/engine/platform/fonts/FontBaseline.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/fonts/FontBaseline.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontPlatformData.cpp b/sky/engine/platform/fonts/FontPlatformData.cpp
index 799631d..a843a6b 100644
--- a/sky/engine/platform/fonts/FontPlatformData.cpp
+++ b/sky/engine/platform/fonts/FontPlatformData.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include "third_party/skia/include/core/SkTypeface.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontPlatformData.h b/sky/engine/platform/fonts/FontPlatformData.h
index b959867..35ddc96 100644
--- a/sky/engine/platform/fonts/FontPlatformData.h
+++ b/sky/engine/platform/fonts/FontPlatformData.h
@@ -31,16 +31,16 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTPLATFORMDATA_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTPLATFORMDATA_H_
-#include "sky/engine/platform/SharedBuffer.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/FontOrientation.h"
-#include "sky/engine/platform/fonts/FontRenderStyle.h"
-#include "sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/platform/SharedBuffer.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontOrientation.h"
+#include "flutter/sky/engine/platform/fonts/FontRenderStyle.h"
+#include "flutter/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
#include "third_party/skia/include/core/SkPaint.h"
class SkTypeface;
diff --git a/sky/engine/platform/fonts/FontPlatformFeatures.h b/sky/engine/platform/fonts/FontPlatformFeatures.h
index 0585176..4c8234c 100644
--- a/sky/engine/platform/fonts/FontPlatformFeatures.h
+++ b/sky/engine/platform/fonts/FontPlatformFeatures.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTPLATFORMFEATURES_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTPLATFORMFEATURES_H_
-#include "sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontSelector.h b/sky/engine/platform/fonts/FontSelector.h
index 92d4d5e..b87d4d3 100644
--- a/sky/engine/platform/fonts/FontSelector.h
+++ b/sky/engine/platform/fonts/FontSelector.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTSELECTOR_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTSELECTOR_H_
-#include "sky/engine/platform/fonts/FontCacheClient.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/platform/fonts/FontCacheClient.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontTest.cpp b/sky/engine/platform/fonts/FontTest.cpp
index e91dfa7..256d7bf 100644
--- a/sky/engine/platform/fonts/FontTest.cpp
+++ b/sky/engine/platform/fonts/FontTest.cpp
@@ -26,8 +26,8 @@
// Tests for the Font class.
-#include "sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/fonts/FontTraits.h b/sky/engine/platform/fonts/FontTraits.h
index 6a8eb96..a5feaf9 100644
--- a/sky/engine/platform/fonts/FontTraits.h
+++ b/sky/engine/platform/fonts/FontTraits.h
@@ -27,7 +27,7 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTTRAITS_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTTRAITS_H_
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/FontWidthVariant.h b/sky/engine/platform/fonts/FontWidthVariant.h
index 0dbc420..f8b1917 100644
--- a/sky/engine/platform/fonts/FontWidthVariant.h
+++ b/sky/engine/platform/fonts/FontWidthVariant.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_FONTWIDTHVARIANT_H_
#define SKY_ENGINE_PLATFORM_FONTS_FONTWIDTHVARIANT_H_
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/GlyphBuffer.h b/sky/engine/platform/fonts/GlyphBuffer.h
index c9e8a42..fdb39bd 100644
--- a/sky/engine/platform/fonts/GlyphBuffer.h
+++ b/sky/engine/platform/fonts/GlyphBuffer.h
@@ -30,9 +30,9 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_GLYPHBUFFER_H_
#define SKY_ENGINE_PLATFORM_FONTS_GLYPHBUFFER_H_
-#include "sky/engine/platform/fonts/Glyph.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/fonts/Glyph.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/GlyphMetricsMap.h b/sky/engine/platform/fonts/GlyphMetricsMap.h
index 896d2e0..58704a7 100644
--- a/sky/engine/platform/fonts/GlyphMetricsMap.h
+++ b/sky/engine/platform/fonts/GlyphMetricsMap.h
@@ -29,13 +29,13 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_GLYPHMETRICSMAP_H_
#define SKY_ENGINE_PLATFORM_FONTS_GLYPHMETRICSMAP_H_
-#include "sky/engine/platform/fonts/Glyph.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/fonts/Glyph.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/GlyphPage.h b/sky/engine/platform/fonts/GlyphPage.h
index 0be3338..babe32d 100644
--- a/sky/engine/platform/fonts/GlyphPage.h
+++ b/sky/engine/platform/fonts/GlyphPage.h
@@ -31,13 +31,13 @@
#define SKY_ENGINE_PLATFORM_FONTS_GLYPHPAGE_H_
#include <string.h>
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/CustomFontData.h"
-#include "sky/engine/platform/fonts/Glyph.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/CustomFontData.h"
+#include "flutter/sky/engine/platform/fonts/Glyph.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/GlyphPageTreeNode.cpp b/sky/engine/platform/fonts/GlyphPageTreeNode.cpp
index 97ee3c1..0930ce1 100644
--- a/sky/engine/platform/fonts/GlyphPageTreeNode.cpp
+++ b/sky/engine/platform/fonts/GlyphPageTreeNode.cpp
@@ -26,15 +26,15 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/GlyphPageTreeNode.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPageTreeNode.h"
#include <stdio.h>
-#include "sky/engine/platform/fonts/SegmentedFontData.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/fonts/SegmentedFontData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/GlyphPageTreeNode.h b/sky/engine/platform/fonts/GlyphPageTreeNode.h
index 00fce9b..c67762d 100644
--- a/sky/engine/platform/fonts/GlyphPageTreeNode.h
+++ b/sky/engine/platform/fonts/GlyphPageTreeNode.h
@@ -30,12 +30,12 @@
#define SKY_ENGINE_PLATFORM_FONTS_GLYPHPAGETREENODE_H_
#include <string.h>
-#include "sky/engine/platform/fonts/GlyphPage.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPage.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#ifndef NDEBUG
void PLATFORM_EXPORT showGlyphPageTrees();
diff --git a/sky/engine/platform/fonts/GlyphPageTreeNodeTest.cpp b/sky/engine/platform/fonts/GlyphPageTreeNodeTest.cpp
index 4e6845b..a68d619 100644
--- a/sky/engine/platform/fonts/GlyphPageTreeNodeTest.cpp
+++ b/sky/engine/platform/fonts/GlyphPageTreeNodeTest.cpp
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/fonts/GlyphPageTreeNode.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPageTreeNode.h"
#include <gtest/gtest.h>
-#include "sky/engine/platform/fonts/SegmentedFontData.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/SegmentedFontData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/Latin1TextIterator.h b/sky/engine/platform/fonts/Latin1TextIterator.h
index 478703c..7b06f0a 100644
--- a/sky/engine/platform/fonts/Latin1TextIterator.h
+++ b/sky/engine/platform/fonts/Latin1TextIterator.h
@@ -22,7 +22,7 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_LATIN1TEXTITERATOR_H_
#define SKY_ENGINE_PLATFORM_FONTS_LATIN1TEXTITERATOR_H_
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/SegmentedFontData.cpp b/sky/engine/platform/fonts/SegmentedFontData.cpp
index f0f500f..b8579c1 100644
--- a/sky/engine/platform/fonts/SegmentedFontData.cpp
+++ b/sky/engine/platform/fonts/SegmentedFontData.cpp
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/SegmentedFontData.h"
+#include "flutter/sky/engine/platform/fonts/SegmentedFontData.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/SegmentedFontData.h b/sky/engine/platform/fonts/SegmentedFontData.h
index 33219d5..c73ea8d 100644
--- a/sky/engine/platform/fonts/SegmentedFontData.h
+++ b/sky/engine/platform/fonts/SegmentedFontData.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_SEGMENTEDFONTDATA_H_
#define SKY_ENGINE_PLATFORM_FONTS_SEGMENTEDFONTDATA_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/FontData.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/FontData.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/SimpleFontData.cpp b/sky/engine/platform/fonts/SimpleFontData.cpp
index 2a0b53a..71c8387 100644
--- a/sky/engine/platform/fonts/SimpleFontData.cpp
+++ b/sky/engine/platform/fonts/SimpleFontData.cpp
@@ -27,9 +27,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/SimpleFontData.h b/sky/engine/platform/fonts/SimpleFontData.h
index 7fad867..4feb6a2 100644
--- a/sky/engine/platform/fonts/SimpleFontData.h
+++ b/sky/engine/platform/fonts/SimpleFontData.h
@@ -24,20 +24,20 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_SIMPLEFONTDATA_H_
#define SKY_ENGINE_PLATFORM_FONTS_SIMPLEFONTDATA_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/CustomFontData.h"
-#include "sky/engine/platform/fonts/FontBaseline.h"
-#include "sky/engine/platform/fonts/FontData.h"
-#include "sky/engine/platform/fonts/FontMetrics.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/platform/fonts/GlyphMetricsMap.h"
-#include "sky/engine/platform/fonts/GlyphPageTreeNode.h"
-#include "sky/engine/platform/fonts/TypesettingFeatures.h"
-#include "sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/CustomFontData.h"
+#include "flutter/sky/engine/platform/fonts/FontBaseline.h"
+#include "flutter/sky/engine/platform/fonts/FontData.h"
+#include "flutter/sky/engine/platform/fonts/FontMetrics.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/GlyphMetricsMap.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPageTreeNode.h"
+#include "flutter/sky/engine/platform/fonts/TypesettingFeatures.h"
+#include "flutter/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/VDMXParser.cpp b/sky/engine/platform/fonts/VDMXParser.cpp
index d01b06b..619b61a 100644
--- a/sky/engine/platform/fonts/VDMXParser.cpp
+++ b/sky/engine/platform/fonts/VDMXParser.cpp
@@ -28,12 +28,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/VDMXParser.h"
+#include "flutter/sky/engine/platform/fonts/VDMXParser.h"
#include <stdlib.h>
#include <string.h>
-#include "sky/engine/wtf/ByteOrder.h"
+#include "flutter/sky/engine/wtf/ByteOrder.h"
// Buffer helper class
//
diff --git a/sky/engine/platform/fonts/WidthCache.h b/sky/engine/platform/fonts/WidthCache.h
index 8b31ee5..c84a593 100644
--- a/sky/engine/platform/fonts/WidthCache.h
+++ b/sky/engine/platform/fonts/WidthCache.h
@@ -26,13 +26,13 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_WIDTHCACHE_H_
#define SKY_ENGINE_PLATFORM_FONTS_WIDTHCACHE_H_
-#include "sky/engine/platform/geometry/IntRectExtent.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/HashFunctions.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/StringHasher.h"
+#include "flutter/sky/engine/platform/geometry/IntRectExtent.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/HashFunctions.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/StringHasher.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/WidthIterator.cpp b/sky/engine/platform/fonts/WidthIterator.cpp
index 5e74a39..d1bdeae 100644
--- a/sky/engine/platform/fonts/WidthIterator.cpp
+++ b/sky/engine/platform/fonts/WidthIterator.cpp
@@ -20,16 +20,16 @@
*
*/
-#include "sky/engine/platform/fonts/WidthIterator.h"
+#include "flutter/sky/engine/platform/fonts/WidthIterator.h"
-#include "sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/fonts/FontPlatformFeatures.h"
-#include "sky/engine/platform/fonts/GlyphBuffer.h"
-#include "sky/engine/platform/fonts/Latin1TextIterator.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/text/SurrogatePairAwareTextIterator.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformFeatures.h"
+#include "flutter/sky/engine/platform/fonts/GlyphBuffer.h"
+#include "flutter/sky/engine/platform/fonts/Latin1TextIterator.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/text/SurrogatePairAwareTextIterator.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
using namespace WTF;
using namespace Unicode;
diff --git a/sky/engine/platform/fonts/WidthIterator.h b/sky/engine/platform/fonts/WidthIterator.h
index 524f5c4..b326218 100644
--- a/sky/engine/platform/fonts/WidthIterator.h
+++ b/sky/engine/platform/fonts/WidthIterator.h
@@ -23,11 +23,11 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_WIDTHITERATOR_H_
#define SKY_ENGINE_PLATFORM_FONTS_WIDTHITERATOR_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/android/FontCacheAndroid.cpp b/sky/engine/platform/fonts/android/FontCacheAndroid.cpp
index 69c945e..6cd5868 100644
--- a/sky/engine/platform/fonts/android/FontCacheAndroid.cpp
+++ b/sky/engine/platform/fonts/android/FontCacheAndroid.cpp
@@ -28,12 +28,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/Language.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/FontFaceCreationParams.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/Language.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontFaceCreationParams.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
diff --git a/sky/engine/platform/fonts/android/FontCacheAndroidTest.cpp b/sky/engine/platform/fonts/android/FontCacheAndroidTest.cpp
index 8f8da96..c5e281a 100644
--- a/sky/engine/platform/fonts/android/FontCacheAndroidTest.cpp
+++ b/sky/engine/platform/fonts/android/FontCacheAndroidTest.cpp
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
#include <gtest/gtest.h>
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/apple/FontCacheIOS.mm b/sky/engine/platform/fonts/apple/FontCacheIOS.mm
index 07e7314..0166829 100644
--- a/sky/engine/platform/fonts/apple/FontCacheIOS.mm
+++ b/sky/engine/platform/fonts/apple/FontCacheIOS.mm
@@ -38,7 +38,7 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/mac/scoped_nsobject.h"
#include "lib/ftl/macros.h"
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/apple/FontCacheMac.cpp b/sky/engine/platform/fonts/apple/FontCacheMac.cpp
index b19a36f..bf4c69a 100644
--- a/sky/engine/platform/fonts/apple/FontCacheMac.cpp
+++ b/sky/engine/platform/fonts/apple/FontCacheMac.cpp
@@ -29,7 +29,7 @@
*/
#include "lib/ftl/logging.h"
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp b/sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp
index 67a5476..c0fd6af 100644
--- a/sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp
+++ b/sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
#include "third_party/skia/include/core/SkTypeface.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp b/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
index 20643ab..dec3a32 100644
--- a/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
+++ b/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
@@ -28,19 +28,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/fonts/FontPlatformFeatures.h"
-#include "sky/engine/platform/fonts/GlyphBuffer.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformFeatures.h"
+#include "flutter/sky/engine/platform/fonts/GlyphBuffer.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/private/SkTemplates.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include <algorithm>
diff --git a/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.cpp b/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.cpp
index f87925b..5a0ecea 100644
--- a/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.cpp
+++ b/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
#include "hb-ot.h"
#include "hb.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h b/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h
index db4f9b1..0cbf88a 100644
--- a/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h
+++ b/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h
@@ -33,10 +33,10 @@
#include <hb.h>
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp b/sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp
index d674efe..516e816 100644
--- a/sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp
+++ b/sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp
@@ -29,11 +29,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkPoint.h"
@@ -42,7 +42,7 @@
#include "third_party/skia/include/private/SkFixed.h"
#include "hb.h"
-#include "sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp b/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
index e248b2a..cb13b0c 100644
--- a/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
+++ b/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp
@@ -29,22 +29,22 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
#include <unicode/normlzr.h>
#include <unicode/uchar.h>
#include <unicode/uscript.h>
#include "hb.h"
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/fonts/Character.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/fonts/GlyphBuffer.h"
-#include "sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
-#include "sky/engine/platform/text/SurrogatePairAwareTextIterator.h"
-#include "sky/engine/platform/text/TextBreakIterator.h"
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/fonts/Character.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/fonts/GlyphBuffer.h"
+#include "flutter/sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
+#include "flutter/sky/engine/platform/text/SurrogatePairAwareTextIterator.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include <list>
#include <map>
diff --git a/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h b/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h
index 581737c..1fe964e 100644
--- a/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h
+++ b/sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h
@@ -32,14 +32,14 @@
#define SKY_ENGINE_PLATFORM_FONTS_HARFBUZZ_HARFBUZZSHAPER_H_
#include "hb.h"
-#include "sky/engine/platform/geometry/FloatBoxExtent.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/geometry/FloatBoxExtent.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
#include <unicode/uscript.h>
diff --git a/sky/engine/platform/fonts/linux/FontCacheLinux.cpp b/sky/engine/platform/fonts/linux/FontCacheLinux.cpp
index 5a7a37a..451d218 100644
--- a/sky/engine/platform/fonts/linux/FontCacheLinux.cpp
+++ b/sky/engine/platform/fonts/linux/FontCacheLinux.cpp
@@ -23,12 +23,12 @@
*/
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/platform/linux/WebFallbackFont.h"
-#include "sky/engine/public/platform/linux/WebFontInfo.h"
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/linux/WebFallbackFont.h"
+#include "flutter/sky/engine/public/platform/linux/WebFontInfo.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/linux/FontPlatformDataLinux.cpp b/sky/engine/platform/fonts/linux/FontPlatformDataLinux.cpp
index f470975..4132adf 100644
--- a/sky/engine/platform/fonts/linux/FontPlatformDataLinux.cpp
+++ b/sky/engine/platform/fonts/linux/FontPlatformDataLinux.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/public/platform/linux/WebFontRenderStyle.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/public/platform/linux/WebFontRenderStyle.h"
#include "third_party/skia/include/core/SkTypeface.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/opentype/OpenTypeTypes.h b/sky/engine/platform/fonts/opentype/OpenTypeTypes.h
index 65d5060..e88a4c2 100644
--- a/sky/engine/platform/fonts/opentype/OpenTypeTypes.h
+++ b/sky/engine/platform/fonts/opentype/OpenTypeTypes.h
@@ -25,8 +25,8 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_OPENTYPE_OPENTYPETYPES_H_
#define SKY_ENGINE_PLATFORM_FONTS_OPENTYPE_OPENTYPETYPES_H_
-#include "sky/engine/platform/SharedBuffer.h"
-#include "sky/engine/wtf/ByteOrder.h"
+#include "flutter/sky/engine/platform/SharedBuffer.h"
+#include "flutter/sky/engine/wtf/ByteOrder.h"
namespace blink {
namespace OpenType {
diff --git a/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.cpp b/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.cpp
index 378c1f0..634efcd 100644
--- a/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.cpp
+++ b/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.cpp
@@ -22,14 +22,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
+#include "flutter/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h"
-#include "sky/engine/platform/SharedBuffer.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/platform/fonts/GlyphPage.h"
-#include "sky/engine/platform/fonts/opentype/OpenTypeTypes.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/SharedBuffer.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPage.h"
+#include "flutter/sky/engine/platform/fonts/opentype/OpenTypeTypes.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
namespace OpenType {
diff --git a/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h b/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h
index 03b2d5a..1be5de8 100644
--- a/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h
+++ b/sky/engine/platform/fonts/opentype/OpenTypeVerticalData.h
@@ -25,12 +25,12 @@
#ifndef SKY_ENGINE_PLATFORM_FONTS_OPENTYPE_OPENTYPEVERTICALDATA_H_
#define SKY_ENGINE_PLATFORM_FONTS_OPENTYPE_OPENTYPEVERTICALDATA_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/Glyph.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/Glyph.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp
index 9d3a38c..bce985b 100644
--- a/sky/engine/platform/fonts/skia/FontCacheSkia.cpp
+++ b/sky/engine/platform/fonts/skia/FontCacheSkia.cpp
@@ -30,16 +30,16 @@
#include <unicode/locid.h>
-#include "sky/engine/platform/NotImplemented.h"
-#include "sky/engine/platform/fonts/AlternateFontFamily.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/FontFaceCreationParams.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/platform/NotImplemented.h"
+#include "flutter/sky/engine/platform/fonts/AlternateFontFamily.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/FontFaceCreationParams.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
#include "third_party/skia/include/core/SkStream.h"
#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
diff --git a/sky/engine/platform/fonts/skia/FontCustomPlatformDataSkia.cpp b/sky/engine/platform/fonts/skia/FontCustomPlatformDataSkia.cpp
index 37ef321..524ba77 100644
--- a/sky/engine/platform/fonts/skia/FontCustomPlatformDataSkia.cpp
+++ b/sky/engine/platform/fonts/skia/FontCustomPlatformDataSkia.cpp
@@ -30,12 +30,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontCustomPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/FontCustomPlatformData.h"
-#include "sky/engine/platform/SharedBuffer.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/platform/SharedBuffer.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
#include "third_party/skia/include/core/SkStream.h"
#include "third_party/skia/include/core/SkTypeface.h"
diff --git a/sky/engine/platform/fonts/skia/FontPlatformDataSkia.cpp b/sky/engine/platform/fonts/skia/FontPlatformDataSkia.cpp
index c8542d9..aff8870 100644
--- a/sky/engine/platform/fonts/skia/FontPlatformDataSkia.cpp
+++ b/sky/engine/platform/fonts/skia/FontPlatformDataSkia.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/FontPlatformData.h"
+#include "flutter/sky/engine/platform/fonts/FontPlatformData.h"
-#include "sky/engine/platform/fonts/FontCache.h"
+#include "flutter/sky/engine/platform/fonts/FontCache.h"
#include "third_party/skia/src/core/SkEndian.h"
#include "third_party/skia/include/core/SkTypeface.h"
diff --git a/sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp b/sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp
index 415d6c8..cf688c7 100644
--- a/sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp
+++ b/sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp
@@ -28,14 +28,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
#include <unicode/normlzr.h>
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/GlyphPage.h"
-#include "sky/engine/platform/fonts/VDMXParser.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/fonts/FontDescription.h"
+#include "flutter/sky/engine/platform/fonts/GlyphPage.h"
+#include "flutter/sky/engine/platform/fonts/VDMXParser.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkTypeface.h"
diff --git a/sky/engine/platform/geometry/FloatBox.h b/sky/engine/platform/geometry/FloatBox.h
index ac56eb2..8df298f 100644
--- a/sky/engine/platform/geometry/FloatBox.h
+++ b/sky/engine/platform/geometry/FloatBox.h
@@ -31,7 +31,7 @@
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATBOX_H_
#include <cmath>
-#include "sky/engine/platform/geometry/FloatPoint3D.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint3D.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatBoxExtent.h b/sky/engine/platform/geometry/FloatBoxExtent.h
index 89e5aa3..b15d451 100644
--- a/sky/engine/platform/geometry/FloatBoxExtent.h
+++ b/sky/engine/platform/geometry/FloatBoxExtent.h
@@ -30,7 +30,7 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_FLOATBOXEXTENT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATBOXEXTENT_H_
-#include "sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatBoxTest.cpp b/sky/engine/platform/geometry/FloatBoxTest.cpp
index 42a7e36..dd4976d 100644
--- a/sky/engine/platform/geometry/FloatBoxTest.cpp
+++ b/sky/engine/platform/geometry/FloatBoxTest.cpp
@@ -22,9 +22,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatBox.h"
+#include "flutter/sky/engine/platform/geometry/FloatBox.h"
-#include "sky/engine/platform/geometry/FloatBoxTestHelpers.h"
+#include "flutter/sky/engine/platform/geometry/FloatBoxTestHelpers.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/geometry/FloatBoxTestHelpers.cpp b/sky/engine/platform/geometry/FloatBoxTestHelpers.cpp
index ff02e6b..45035e4 100644
--- a/sky/engine/platform/geometry/FloatBoxTestHelpers.cpp
+++ b/sky/engine/platform/geometry/FloatBoxTestHelpers.cpp
@@ -22,9 +22,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatBoxTestHelpers.h"
+#include "flutter/sky/engine/platform/geometry/FloatBoxTestHelpers.h"
-#include "sky/engine/platform/geometry/FloatBox.h"
+#include "flutter/sky/engine/platform/geometry/FloatBox.h"
const static float kTestEpsilon = 1e-6;
void blink::PrintTo(const FloatBox& box, ::std::ostream* os)
diff --git a/sky/engine/platform/geometry/FloatPoint.cpp b/sky/engine/platform/geometry/FloatPoint.cpp
index fe3674f..5bdbd20 100644
--- a/sky/engine/platform/geometry/FloatPoint.cpp
+++ b/sky/engine/platform/geometry/FloatPoint.cpp
@@ -24,13 +24,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
#include <math.h>
#include <limits>
-#include "sky/engine/platform/FloatConversion.h"
-#include "sky/engine/platform/geometry/LayoutPoint.h"
-#include "sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/platform/FloatConversion.h"
+#include "flutter/sky/engine/platform/geometry/LayoutPoint.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
#include "third_party/skia/include/core/SkPoint.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatPoint.h b/sky/engine/platform/geometry/FloatPoint.h
index 5b5766c..1cff3e1 100644
--- a/sky/engine/platform/geometry/FloatPoint.h
+++ b/sky/engine/platform/geometry/FloatPoint.h
@@ -28,9 +28,9 @@
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATPOINT_H_
#include <algorithm>
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/geometry/IntPoint.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/geometry/IntPoint.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
struct SkPoint;
diff --git a/sky/engine/platform/geometry/FloatPoint3D.cpp b/sky/engine/platform/geometry/FloatPoint3D.cpp
index 87ec61f..2b5afc6 100644
--- a/sky/engine/platform/geometry/FloatPoint3D.cpp
+++ b/sky/engine/platform/geometry/FloatPoint3D.cpp
@@ -20,7 +20,7 @@
*/
-#include "sky/engine/platform/geometry/FloatPoint3D.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint3D.h"
#include <math.h>
diff --git a/sky/engine/platform/geometry/FloatPoint3D.h b/sky/engine/platform/geometry/FloatPoint3D.h
index 2d3eba7..7e5bb36 100644
--- a/sky/engine/platform/geometry/FloatPoint3D.h
+++ b/sky/engine/platform/geometry/FloatPoint3D.h
@@ -23,7 +23,7 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_FLOATPOINT3D_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATPOINT3D_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatQuad.cpp b/sky/engine/platform/geometry/FloatQuad.cpp
index 8911288..1ac6288 100644
--- a/sky/engine/platform/geometry/FloatQuad.cpp
+++ b/sky/engine/platform/geometry/FloatQuad.cpp
@@ -28,7 +28,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
#include <algorithm>
#include <limits>
diff --git a/sky/engine/platform/geometry/FloatQuad.h b/sky/engine/platform/geometry/FloatQuad.h
index 6331162..ebf7f3b 100644
--- a/sky/engine/platform/geometry/FloatQuad.h
+++ b/sky/engine/platform/geometry/FloatQuad.h
@@ -29,9 +29,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_FLOATQUAD_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATQUAD_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatRect.cpp b/sky/engine/platform/geometry/FloatRect.cpp
index 13a4bfa..418db90 100644
--- a/sky/engine/platform/geometry/FloatRect.cpp
+++ b/sky/engine/platform/geometry/FloatRect.cpp
@@ -24,12 +24,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/FloatConversion.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/FloatConversion.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
#include "third_party/skia/include/core/SkRect.h"
#include <math.h>
diff --git a/sky/engine/platform/geometry/FloatRect.h b/sky/engine/platform/geometry/FloatRect.h
index 39fc601..515acdf 100644
--- a/sky/engine/platform/geometry/FloatRect.h
+++ b/sky/engine/platform/geometry/FloatRect.h
@@ -27,8 +27,8 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_FLOATRECT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATRECT_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/wtf/Vector.h"
#include "third_party/skia/include/core/SkRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatRoundedRect.cpp b/sky/engine/platform/geometry/FloatRoundedRect.cpp
index ff44d6d..4e092cc 100644
--- a/sky/engine/platform/geometry/FloatRoundedRect.cpp
+++ b/sky/engine/platform/geometry/FloatRoundedRect.cpp
@@ -27,7 +27,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatRoundedRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRoundedRect.h"
#include <algorithm>
diff --git a/sky/engine/platform/geometry/FloatRoundedRect.h b/sky/engine/platform/geometry/FloatRoundedRect.h
index 88ab455..89f05eb 100644
--- a/sky/engine/platform/geometry/FloatRoundedRect.h
+++ b/sky/engine/platform/geometry/FloatRoundedRect.h
@@ -30,9 +30,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_FLOATROUNDEDRECT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATROUNDEDRECT_H_
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatRoundedRectTest.cpp b/sky/engine/platform/geometry/FloatRoundedRectTest.cpp
index 2ea72c2..f799d2a 100644
--- a/sky/engine/platform/geometry/FloatRoundedRectTest.cpp
+++ b/sky/engine/platform/geometry/FloatRoundedRectTest.cpp
@@ -28,7 +28,7 @@
*/
-#include "sky/engine/platform/geometry/FloatRoundedRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRoundedRect.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/geometry/FloatSize.cpp b/sky/engine/platform/geometry/FloatSize.cpp
index 4b0d113..2c42707 100644
--- a/sky/engine/platform/geometry/FloatSize.cpp
+++ b/sky/engine/platform/geometry/FloatSize.cpp
@@ -24,13 +24,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
#include <math.h>
#include <limits>
-#include "sky/engine/platform/FloatConversion.h"
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/platform/FloatConversion.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/FloatSize.h b/sky/engine/platform/geometry/FloatSize.h
index a462927..f414c9a 100644
--- a/sky/engine/platform/geometry/FloatSize.h
+++ b/sky/engine/platform/geometry/FloatSize.h
@@ -28,8 +28,8 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_FLOATSIZE_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_FLOATSIZE_H_
-#include "sky/engine/platform/geometry/IntPoint.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/geometry/IntPoint.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/IntPoint.h b/sky/engine/platform/geometry/IntPoint.h
index bc70b83..1535164 100644
--- a/sky/engine/platform/geometry/IntPoint.h
+++ b/sky/engine/platform/geometry/IntPoint.h
@@ -27,9 +27,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_INTPOINT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_INTPOINT_H_
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/VectorTraits.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/VectorTraits.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/IntRect.cpp b/sky/engine/platform/geometry/IntRect.cpp
index 99f48e5..ddf71ed 100644
--- a/sky/engine/platform/geometry/IntRect.cpp
+++ b/sky/engine/platform/geometry/IntRect.cpp
@@ -23,10 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
#include "third_party/skia/include/core/SkRect.h"
#include <algorithm>
diff --git a/sky/engine/platform/geometry/IntRect.h b/sky/engine/platform/geometry/IntRect.h
index 0b9e90f..025068d 100644
--- a/sky/engine/platform/geometry/IntRect.h
+++ b/sky/engine/platform/geometry/IntRect.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_INTRECT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_INTRECT_H_
-#include "sky/engine/platform/geometry/IntPoint.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/VectorTraits.h"
+#include "flutter/sky/engine/platform/geometry/IntPoint.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/VectorTraits.h"
struct SkRect;
struct SkIRect;
diff --git a/sky/engine/platform/geometry/IntRectExtent.h b/sky/engine/platform/geometry/IntRectExtent.h
index b1651e1..726949d 100644
--- a/sky/engine/platform/geometry/IntRectExtent.h
+++ b/sky/engine/platform/geometry/IntRectExtent.h
@@ -30,7 +30,7 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_INTRECTEXTENT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_INTRECTEXTENT_H_
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/IntSize.h b/sky/engine/platform/geometry/IntSize.h
index 479aff6..54d8424 100644
--- a/sky/engine/platform/geometry/IntSize.h
+++ b/sky/engine/platform/geometry/IntSize.h
@@ -27,8 +27,8 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_INTSIZE_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_INTSIZE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/IntSizeHash.h b/sky/engine/platform/geometry/IntSizeHash.h
index bc9acc9..e26c4c1 100644
--- a/sky/engine/platform/geometry/IntSizeHash.h
+++ b/sky/engine/platform/geometry/IntSizeHash.h
@@ -20,9 +20,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_INTSIZEHASH_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_INTSIZEHASH_H_
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
namespace WTF {
diff --git a/sky/engine/platform/geometry/LayoutBoxExtent.cpp b/sky/engine/platform/geometry/LayoutBoxExtent.cpp
index 6824971..ac4b8d5 100644
--- a/sky/engine/platform/geometry/LayoutBoxExtent.cpp
+++ b/sky/engine/platform/geometry/LayoutBoxExtent.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/LayoutBoxExtent.h"
+#include "flutter/sky/engine/platform/geometry/LayoutBoxExtent.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/LayoutBoxExtent.h b/sky/engine/platform/geometry/LayoutBoxExtent.h
index 900e89e..1a8242c 100644
--- a/sky/engine/platform/geometry/LayoutBoxExtent.h
+++ b/sky/engine/platform/geometry/LayoutBoxExtent.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTBOXEXTENT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTBOXEXTENT_H_
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/LayoutPoint.h b/sky/engine/platform/geometry/LayoutPoint.h
index 88ff0644..19db896 100644
--- a/sky/engine/platform/geometry/LayoutPoint.h
+++ b/sky/engine/platform/geometry/LayoutPoint.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTPOINT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTPOINT_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/LayoutSize.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/LayoutRect.cpp b/sky/engine/platform/geometry/LayoutRect.cpp
index 02eda29..456b106 100644
--- a/sky/engine/platform/geometry/LayoutRect.cpp
+++ b/sky/engine/platform/geometry/LayoutRect.cpp
@@ -28,12 +28,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
#include <stdio.h>
#include <algorithm>
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/LayoutRect.h b/sky/engine/platform/geometry/LayoutRect.h
index 2d4d50f..a64ae43 100644
--- a/sky/engine/platform/geometry/LayoutRect.h
+++ b/sky/engine/platform/geometry/LayoutRect.h
@@ -31,10 +31,10 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTRECT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTRECT_H_
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/geometry/LayoutBoxExtent.h"
-#include "sky/engine/platform/geometry/LayoutPoint.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutBoxExtent.h"
+#include "flutter/sky/engine/platform/geometry/LayoutPoint.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/LayoutSize.h b/sky/engine/platform/geometry/LayoutSize.h
index 8b6ad47..84fcc20 100644
--- a/sky/engine/platform/geometry/LayoutSize.h
+++ b/sky/engine/platform/geometry/LayoutSize.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTSIZE_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_LAYOUTSIZE_H_
-#include "sky/engine/platform/LayoutUnit.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/LayoutUnit.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/Region.cpp b/sky/engine/platform/geometry/Region.cpp
index d1a8a0c..593eabd 100644
--- a/sky/engine/platform/geometry/Region.cpp
+++ b/sky/engine/platform/geometry/Region.cpp
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/Region.h"
+#include "flutter/sky/engine/platform/geometry/Region.h"
#include <stdio.h>
diff --git a/sky/engine/platform/geometry/Region.h b/sky/engine/platform/geometry/Region.h
index 4a5ea0c..8bbee7d 100644
--- a/sky/engine/platform/geometry/Region.h
+++ b/sky/engine/platform/geometry/Region.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_REGION_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_REGION_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/RegionTest.cpp b/sky/engine/platform/geometry/RegionTest.cpp
index 4de2324..7e9e8f9 100644
--- a/sky/engine/platform/geometry/RegionTest.cpp
+++ b/sky/engine/platform/geometry/RegionTest.cpp
@@ -23,7 +23,7 @@
*/
-#include "sky/engine/platform/geometry/Region.h"
+#include "flutter/sky/engine/platform/geometry/Region.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/geometry/RoundedRect.cpp b/sky/engine/platform/geometry/RoundedRect.cpp
index bb29490..cd50294 100644
--- a/sky/engine/platform/geometry/RoundedRect.cpp
+++ b/sky/engine/platform/geometry/RoundedRect.cpp
@@ -25,10 +25,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
#include <algorithm>
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/RoundedRect.h b/sky/engine/platform/geometry/RoundedRect.h
index b046887..b8035e3 100644
--- a/sky/engine/platform/geometry/RoundedRect.h
+++ b/sky/engine/platform/geometry/RoundedRect.h
@@ -27,8 +27,8 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_ROUNDEDRECT_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_ROUNDEDRECT_H_
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/RoundedRectTest.cpp b/sky/engine/platform/geometry/RoundedRectTest.cpp
index ba08d20..7f1f2b7 100644
--- a/sky/engine/platform/geometry/RoundedRectTest.cpp
+++ b/sky/engine/platform/geometry/RoundedRectTest.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
#include <gtest/gtest.h>
-#include "sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
using namespace blink;
diff --git a/sky/engine/platform/geometry/TransformState.cpp b/sky/engine/platform/geometry/TransformState.cpp
index 4f1b513..0d4f514 100644
--- a/sky/engine/platform/geometry/TransformState.cpp
+++ b/sky/engine/platform/geometry/TransformState.cpp
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/geometry/TransformState.h"
+#include "flutter/sky/engine/platform/geometry/TransformState.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace blink {
diff --git a/sky/engine/platform/geometry/TransformState.h b/sky/engine/platform/geometry/TransformState.h
index 57e5ff5..c2e244b 100644
--- a/sky/engine/platform/geometry/TransformState.h
+++ b/sky/engine/platform/geometry/TransformState.h
@@ -26,13 +26,13 @@
#ifndef SKY_ENGINE_PLATFORM_GEOMETRY_TRANSFORMSTATE_H_
#define SKY_ENGINE_PLATFORM_GEOMETRY_TRANSFORMSTATE_H_
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/geometry/LayoutSize.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Color.cpp b/sky/engine/platform/graphics/Color.cpp
index a6dd44c..e710a1d 100644
--- a/sky/engine/platform/graphics/Color.cpp
+++ b/sky/engine/platform/graphics/Color.cpp
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/Decimal.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/HexNumber.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/dtoa.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/platform/Decimal.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/HexNumber.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/dtoa.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Color.h b/sky/engine/platform/graphics/Color.h
index 69e6cf7..a4fe4b8 100644
--- a/sky/engine/platform/graphics/Color.h
+++ b/sky/engine/platform/graphics/Color.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_COLOR_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_COLOR_H_
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/ColorSpace.cpp b/sky/engine/platform/graphics/ColorSpace.cpp
index 7993b52..c280996 100644
--- a/sky/engine/platform/graphics/ColorSpace.cpp
+++ b/sky/engine/platform/graphics/ColorSpace.cpp
@@ -30,9 +30,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/ColorSpace.h"
+#include "flutter/sky/engine/platform/graphics/ColorSpace.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/ColorSpace.h b/sky/engine/platform/graphics/ColorSpace.h
index 7cfb849..2592a82 100644
--- a/sky/engine/platform/graphics/ColorSpace.h
+++ b/sky/engine/platform/graphics/ColorSpace.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_COLORSPACE_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_COLORSPACE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/DashArray.h b/sky/engine/platform/graphics/DashArray.h
index bd738d0..53de519 100644
--- a/sky/engine/platform/graphics/DashArray.h
+++ b/sky/engine/platform/graphics/DashArray.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_DASHARRAY_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_DASHARRAY_H_
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/Vector.h"
typedef float DashArrayElement;
diff --git a/sky/engine/platform/graphics/DrawLooperBuilder.cpp b/sky/engine/platform/graphics/DrawLooperBuilder.cpp
index 7a53a8b..8692b4b 100644
--- a/sky/engine/platform/graphics/DrawLooperBuilder.cpp
+++ b/sky/engine/platform/graphics/DrawLooperBuilder.cpp
@@ -28,12 +28,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/DrawLooperBuilder.h"
+#include "flutter/sky/engine/platform/graphics/DrawLooperBuilder.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkColorFilter.h"
#include "third_party/skia/include/core/SkDrawLooper.h"
diff --git a/sky/engine/platform/graphics/DrawLooperBuilder.h b/sky/engine/platform/graphics/DrawLooperBuilder.h
index 2026cc3..b34d365 100644
--- a/sky/engine/platform/graphics/DrawLooperBuilder.h
+++ b/sky/engine/platform/graphics/DrawLooperBuilder.h
@@ -31,10 +31,10 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_DRAWLOOPERBUILDER_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_DRAWLOOPERBUILDER_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
#include "third_party/skia/include/effects/SkLayerDrawLooper.h"
class SkDrawLooper;
diff --git a/sky/engine/platform/graphics/FrameData.cpp b/sky/engine/platform/graphics/FrameData.cpp
index 9a89d35..79f3dab 100644
--- a/sky/engine/platform/graphics/FrameData.cpp
+++ b/sky/engine/platform/graphics/FrameData.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/FrameData.h"
+#include "flutter/sky/engine/platform/graphics/FrameData.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/FrameData.h b/sky/engine/platform/graphics/FrameData.h
index 30afa00..133466a 100644
--- a/sky/engine/platform/graphics/FrameData.h
+++ b/sky/engine/platform/graphics/FrameData.h
@@ -28,10 +28,10 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_FRAMEDATA_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_FRAMEDATA_H_
-#include "sky/engine/platform/graphics/ImageOrientation.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/VectorTraits.h"
+#include "flutter/sky/engine/platform/graphics/ImageOrientation.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/VectorTraits.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GeneratedImage.cpp b/sky/engine/platform/graphics/GeneratedImage.cpp
index b26708c..ffb08d2 100644
--- a/sky/engine/platform/graphics/GeneratedImage.cpp
+++ b/sky/engine/platform/graphics/GeneratedImage.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/GeneratedImage.h"
+#include "flutter/sky/engine/platform/graphics/GeneratedImage.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GeneratedImage.h b/sky/engine/platform/graphics/GeneratedImage.h
index b3d05e6..8a8e6ac 100644
--- a/sky/engine/platform/graphics/GeneratedImage.h
+++ b/sky/engine/platform/graphics/GeneratedImage.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GENERATEDIMAGE_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GENERATEDIMAGE_H_
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/graphics/Image.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/graphics/Image.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Gradient.cpp b/sky/engine/platform/graphics/Gradient.cpp
index d4e1606..3fce382 100644
--- a/sky/engine/platform/graphics/Gradient.cpp
+++ b/sky/engine/platform/graphics/Gradient.cpp
@@ -25,11 +25,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/Gradient.h"
+#include "flutter/sky/engine/platform/graphics/Gradient.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
diff --git a/sky/engine/platform/graphics/Gradient.h b/sky/engine/platform/graphics/Gradient.h
index 896e728..e2f4b10 100644
--- a/sky/engine/platform/graphics/Gradient.h
+++ b/sky/engine/platform/graphics/Gradient.h
@@ -29,15 +29,15 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GRADIENT_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GRADIENT_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
class SkShader;
diff --git a/sky/engine/platform/graphics/GradientGeneratedImage.cpp b/sky/engine/platform/graphics/GradientGeneratedImage.cpp
index b0becb7..a335d8d 100644
--- a/sky/engine/platform/graphics/GradientGeneratedImage.cpp
+++ b/sky/engine/platform/graphics/GradientGeneratedImage.cpp
@@ -23,10 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/GradientGeneratedImage.h"
+#include "flutter/sky/engine/platform/graphics/GradientGeneratedImage.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GradientGeneratedImage.h b/sky/engine/platform/graphics/GradientGeneratedImage.h
index 73867d9..4a6dc53 100644
--- a/sky/engine/platform/graphics/GradientGeneratedImage.h
+++ b/sky/engine/platform/graphics/GradientGeneratedImage.h
@@ -26,11 +26,11 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GRADIENTGENERATEDIMAGE_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GRADIENTGENERATEDIMAGE_H_
-#include "sky/engine/platform/geometry/IntSize.h"
-#include "sky/engine/platform/graphics/GeneratedImage.h"
-#include "sky/engine/platform/graphics/Gradient.h"
-#include "sky/engine/platform/graphics/Image.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/geometry/IntSize.h"
+#include "flutter/sky/engine/platform/graphics/GeneratedImage.h"
+#include "flutter/sky/engine/platform/graphics/Gradient.h"
+#include "flutter/sky/engine/platform/graphics/Image.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GraphicsContext.cpp b/sky/engine/platform/graphics/GraphicsContext.cpp
index c8e5996..0b988a9 100644
--- a/sky/engine/platform/graphics/GraphicsContext.cpp
+++ b/sky/engine/platform/graphics/GraphicsContext.cpp
@@ -24,16 +24,16 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/geometry/RoundedRect.h"
-#include "sky/engine/platform/graphics/Gradient.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
-#include "sky/engine/platform/text/BidiResolver.h"
-#include "sky/engine/platform/text/TextRunIterator.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/platform/graphics/Gradient.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/platform/text/TextRunIterator.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
#include "third_party/skia/include/core/SkAnnotation.h"
#include "third_party/skia/include/core/SkClipStack.h"
#include "third_party/skia/include/core/SkColorFilter.h"
diff --git a/sky/engine/platform/graphics/GraphicsContext.h b/sky/engine/platform/graphics/GraphicsContext.h
index 1539b07..7c635cd 100644
--- a/sky/engine/platform/graphics/GraphicsContext.h
+++ b/sky/engine/platform/graphics/GraphicsContext.h
@@ -28,20 +28,20 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSCONTEXT_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSCONTEXT_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/DashArray.h"
-#include "sky/engine/platform/graphics/DrawLooperBuilder.h"
-#include "sky/engine/platform/graphics/GraphicsContextState.h"
-#include "sky/engine/platform/graphics/ImageFilter.h"
-#include "sky/engine/platform/graphics/ImageOrientation.h"
-#include "sky/engine/platform/graphics/RegionTracker.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/DashArray.h"
+#include "flutter/sky/engine/platform/graphics/DrawLooperBuilder.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextState.h"
+#include "flutter/sky/engine/platform/graphics/ImageFilter.h"
+#include "flutter/sky/engine/platform/graphics/ImageOrientation.h"
+#include "flutter/sky/engine/platform/graphics/RegionTracker.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
class SkBitmap;
class SkPaint;
diff --git a/sky/engine/platform/graphics/GraphicsContextState.cpp b/sky/engine/platform/graphics/GraphicsContextState.cpp
index b9f0db2..5116ce6 100644
--- a/sky/engine/platform/graphics/GraphicsContextState.cpp
+++ b/sky/engine/platform/graphics/GraphicsContextState.cpp
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/graphics/GraphicsContextState.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextState.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GraphicsContextState.h b/sky/engine/platform/graphics/GraphicsContextState.h
index 78d135a..570bc4e 100644
--- a/sky/engine/platform/graphics/GraphicsContextState.h
+++ b/sky/engine/platform/graphics/GraphicsContextState.h
@@ -29,14 +29,14 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSCONTEXTSTATE_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSCONTEXTSTATE_H_
-#include "sky/engine/platform/graphics/DrawLooperBuilder.h"
-#include "sky/engine/platform/graphics/Gradient.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/platform/graphics/Path.h"
-#include "sky/engine/platform/graphics/Pattern.h"
-#include "sky/engine/platform/graphics/StrokeData.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/graphics/DrawLooperBuilder.h"
+#include "flutter/sky/engine/platform/graphics/Gradient.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/graphics/Path.h"
+#include "flutter/sky/engine/platform/graphics/Pattern.h"
+#include "flutter/sky/engine/platform/graphics/StrokeData.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
#include "third_party/skia/include/core/SkColorFilter.h"
#include "third_party/skia/include/core/SkPaint.h"
diff --git a/sky/engine/platform/graphics/GraphicsContextStateSaver.h b/sky/engine/platform/graphics/GraphicsContextStateSaver.h
index 0b35abe..6703363 100644
--- a/sky/engine/platform/graphics/GraphicsContextStateSaver.h
+++ b/sky/engine/platform/graphics/GraphicsContextStateSaver.h
@@ -29,8 +29,8 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSCONTEXTSTATESAVER_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSCONTEXTSTATESAVER_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GraphicsTypes.cpp b/sky/engine/platform/graphics/GraphicsTypes.cpp
index f881f95..eec7efe 100644
--- a/sky/engine/platform/graphics/GraphicsTypes.cpp
+++ b/sky/engine/platform/graphics/GraphicsTypes.cpp
@@ -24,10 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/GraphicsTypes.h b/sky/engine/platform/graphics/GraphicsTypes.h
index 4862e57..f42da59 100644
--- a/sky/engine/platform/graphics/GraphicsTypes.h
+++ b/sky/engine/platform/graphics/GraphicsTypes.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSTYPES_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_GRAPHICSTYPES_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/public/platform/WebBlendMode.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/public/platform/WebBlendMode.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
diff --git a/sky/engine/platform/graphics/Image.cpp b/sky/engine/platform/graphics/Image.cpp
index bd1b65d..0c401d3 100644
--- a/sky/engine/platform/graphics/Image.cpp
+++ b/sky/engine/platform/graphics/Image.cpp
@@ -24,18 +24,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/Image.h"
+#include "flutter/sky/engine/platform/graphics/Image.h"
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/SharedBuffer.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/graphics/GraphicsContextStateSaver.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/SharedBuffer.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContextStateSaver.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
#include <math.h>
diff --git a/sky/engine/platform/graphics/Image.h b/sky/engine/platform/graphics/Image.h
index 7dc0bb6..81f6c58 100644
--- a/sky/engine/platform/graphics/Image.h
+++ b/sky/engine/platform/graphics/Image.h
@@ -27,16 +27,16 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_IMAGE_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_IMAGE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/platform/graphics/ImageOrientation.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/graphics/ImageOrientation.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include "third_party/skia/include/core/SkXfermode.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/ImageFilter.cpp b/sky/engine/platform/graphics/ImageFilter.cpp
index 24b7d6d..03d1d8a 100644
--- a/sky/engine/platform/graphics/ImageFilter.cpp
+++ b/sky/engine/platform/graphics/ImageFilter.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/graphics/ImageFilter.h"
+#include "flutter/sky/engine/platform/graphics/ImageFilter.h"
#include "third_party/skia/include/core/SkImageFilter.h"
diff --git a/sky/engine/platform/graphics/ImageFilter.h b/sky/engine/platform/graphics/ImageFilter.h
index d399207..f3ddd6b 100644
--- a/sky/engine/platform/graphics/ImageFilter.h
+++ b/sky/engine/platform/graphics/ImageFilter.h
@@ -5,7 +5,7 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_IMAGEFILTER_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_IMAGEFILTER_H_
-#include "sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
class SkImageFilter;
diff --git a/sky/engine/platform/graphics/ImageObserver.cpp b/sky/engine/platform/graphics/ImageObserver.cpp
index d4d8540..4955145 100644
--- a/sky/engine/platform/graphics/ImageObserver.cpp
+++ b/sky/engine/platform/graphics/ImageObserver.cpp
@@ -28,7 +28,7 @@
*/
-#include "sky/engine/platform/graphics/ImageObserver.h"
+#include "flutter/sky/engine/platform/graphics/ImageObserver.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/ImageObserver.h b/sky/engine/platform/graphics/ImageObserver.h
index c0ce7b5..8558575 100644
--- a/sky/engine/platform/graphics/ImageObserver.h
+++ b/sky/engine/platform/graphics/ImageObserver.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_IMAGEOBSERVER_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_IMAGEOBSERVER_H_
-#include "sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/ImageOrientation.cpp b/sky/engine/platform/graphics/ImageOrientation.cpp
index 4ea66ba..c4b7f7e 100644
--- a/sky/engine/platform/graphics/ImageOrientation.cpp
+++ b/sky/engine/platform/graphics/ImageOrientation.cpp
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/ImageOrientation.h"
+#include "flutter/sky/engine/platform/graphics/ImageOrientation.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/ImageOrientation.h b/sky/engine/platform/graphics/ImageOrientation.h
index 2cfc3b5..2012bea 100644
--- a/sky/engine/platform/graphics/ImageOrientation.h
+++ b/sky/engine/platform/graphics/ImageOrientation.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_IMAGEORIENTATION_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_IMAGEORIENTATION_H_
-#include "sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Path.cpp b/sky/engine/platform/graphics/Path.cpp
index 5ac7f78..bf413f7 100644
--- a/sky/engine/platform/graphics/Path.cpp
+++ b/sky/engine/platform/graphics/Path.cpp
@@ -27,15 +27,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/Path.h"
+#include "flutter/sky/engine/platform/graphics/Path.h"
#include <math.h>
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
#include "third_party/skia/include/pathops/SkPathOps.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Path.h b/sky/engine/platform/graphics/Path.h
index 5bbbf4f..f07cc6f 100644
--- a/sky/engine/platform/graphics/Path.h
+++ b/sky/engine/platform/graphics/Path.h
@@ -29,11 +29,11 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_PATH_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_PATH_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/RoundedRect.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/RoundedRect.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Forward.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkPathMeasure.h"
diff --git a/sky/engine/platform/graphics/PathTraversalState.cpp b/sky/engine/platform/graphics/PathTraversalState.cpp
index f0657e6..0573a7c 100644
--- a/sky/engine/platform/graphics/PathTraversalState.cpp
+++ b/sky/engine/platform/graphics/PathTraversalState.cpp
@@ -17,10 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/platform/graphics/PathTraversalState.h"
+#include "flutter/sky/engine/platform/graphics/PathTraversalState.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/PathTraversalState.h b/sky/engine/platform/graphics/PathTraversalState.h
index 2a92d98..8a9aed7 100644
--- a/sky/engine/platform/graphics/PathTraversalState.h
+++ b/sky/engine/platform/graphics/PathTraversalState.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_PATHTRAVERSALSTATE_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_PATHTRAVERSALSTATE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Pattern.cpp b/sky/engine/platform/graphics/Pattern.cpp
index afacda1..8632af5 100644
--- a/sky/engine/platform/graphics/Pattern.cpp
+++ b/sky/engine/platform/graphics/Pattern.cpp
@@ -25,9 +25,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/graphics/Pattern.h"
+#include "flutter/sky/engine/platform/graphics/Pattern.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
#include "third_party/skia/include/core/SkCanvas.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/Pattern.h b/sky/engine/platform/graphics/Pattern.h
index 2e2dd18..eb57319 100644
--- a/sky/engine/platform/graphics/Pattern.h
+++ b/sky/engine/platform/graphics/Pattern.h
@@ -29,12 +29,12 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_PATTERN_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_PATTERN_H_
-#include "sky/engine/platform/graphics/Image.h"
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/graphics/Image.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
#include "third_party/skia/include/core/SkShader.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/RegionTracker.cpp b/sky/engine/platform/graphics/RegionTracker.cpp
index 9c2eb00..faf752f 100644
--- a/sky/engine/platform/graphics/RegionTracker.cpp
+++ b/sky/engine/platform/graphics/RegionTracker.cpp
@@ -29,9 +29,9 @@
*/
-#include "sky/engine/platform/graphics/RegionTracker.h"
+#include "flutter/sky/engine/platform/graphics/RegionTracker.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
#include "third_party/skia/include/core/SkColorFilter.h"
#include "third_party/skia/include/core/SkShader.h"
diff --git a/sky/engine/platform/graphics/RegionTracker.h b/sky/engine/platform/graphics/RegionTracker.h
index 6602fbf..40b66bc 100644
--- a/sky/engine/platform/graphics/RegionTracker.h
+++ b/sky/engine/platform/graphics/RegionTracker.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_REGIONTRACKER_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_REGIONTRACKER_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPaint.h"
diff --git a/sky/engine/platform/graphics/StrokeData.cpp b/sky/engine/platform/graphics/StrokeData.cpp
index 63ee583..dee135a 100644
--- a/sky/engine/platform/graphics/StrokeData.cpp
+++ b/sky/engine/platform/graphics/StrokeData.cpp
@@ -26,11 +26,11 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "sky/engine/platform/graphics/StrokeData.h"
+#include "flutter/sky/engine/platform/graphics/StrokeData.h"
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace blink {
diff --git a/sky/engine/platform/graphics/StrokeData.h b/sky/engine/platform/graphics/StrokeData.h
index 83a2096..71bb9ee 100644
--- a/sky/engine/platform/graphics/StrokeData.h
+++ b/sky/engine/platform/graphics/StrokeData.h
@@ -29,13 +29,13 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_STROKEDATA_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_STROKEDATA_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/graphics/DashArray.h"
-#include "sky/engine/platform/graphics/Gradient.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/platform/graphics/Pattern.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/graphics/DashArray.h"
+#include "flutter/sky/engine/platform/graphics/Gradient.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/graphics/Pattern.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
#include "third_party/skia/include/core/SkColorPriv.h"
#include "third_party/skia/include/effects/SkDashPathEffect.h"
diff --git a/sky/engine/platform/graphics/skia/SkSizeHash.h b/sky/engine/platform/graphics/skia/SkSizeHash.h
index 7d4c175..adf2d7a 100644
--- a/sky/engine/platform/graphics/skia/SkSizeHash.h
+++ b/sky/engine/platform/graphics/skia/SkSizeHash.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_SKIA_SKSIZEHASH_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_SKIA_SKSIZEHASH_H_
-#include "sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
#include "third_party/skia/include/core/SkScalar.h"
#include "third_party/skia/include/core/SkSize.h"
diff --git a/sky/engine/platform/graphics/skia/SkiaUtils.cpp b/sky/engine/platform/graphics/skia/SkiaUtils.cpp
index 896b70d..f315c55 100644
--- a/sky/engine/platform/graphics/skia/SkiaUtils.cpp
+++ b/sky/engine/platform/graphics/skia/SkiaUtils.cpp
@@ -29,9 +29,9 @@
*/
-#include "sky/engine/platform/graphics/skia/SkiaUtils.h"
+#include "flutter/sky/engine/platform/graphics/skia/SkiaUtils.h"
-#include "sky/engine/platform/graphics/GraphicsContext.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsContext.h"
#include "third_party/skia/include/core/SkColorPriv.h"
#include "third_party/skia/include/core/SkRegion.h"
diff --git a/sky/engine/platform/graphics/skia/SkiaUtils.h b/sky/engine/platform/graphics/skia/SkiaUtils.h
index 66126c4..e6def24 100644
--- a/sky/engine/platform/graphics/skia/SkiaUtils.h
+++ b/sky/engine/platform/graphics/skia/SkiaUtils.h
@@ -33,12 +33,12 @@
#ifndef SKY_ENGINE_PLATFORM_GRAPHICS_SKIA_SKIAUTILS_H_
#define SKY_ENGINE_PLATFORM_GRAPHICS_SKIA_SKIAUTILS_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/graphics/GraphicsTypes.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/graphics/Color.h"
+#include "flutter/sky/engine/platform/graphics/GraphicsTypes.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
diff --git a/sky/engine/platform/heap/Handle.h b/sky/engine/platform/heap/Handle.h
index 1f7f3f4..d746b61 100644
--- a/sky/engine/platform/heap/Handle.h
+++ b/sky/engine/platform/heap/Handle.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_PLATFORM_HEAP_HANDLE_H_
#define SKY_ENGINE_PLATFORM_HEAP_HANDLE_H_
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
//
// STACK_ALLOCATED(): Use if the object is only stack allocated.
diff --git a/sky/engine/platform/testing/RunAllTests.cpp b/sky/engine/platform/testing/RunAllTests.cpp
index f4dde78..1349920 100644
--- a/sky/engine/platform/testing/RunAllTests.cpp
+++ b/sky/engine/platform/testing/RunAllTests.cpp
@@ -31,10 +31,10 @@
#include <string.h>
#include "base/test/test_suite.h"
-#include "sky/engine/platform/Partitions.h"
-#include "sky/engine/platform/TestingPlatformSupport.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/platform/TestingPlatformSupport.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/WTF.h"
int main(int argc, char** argv)
{
diff --git a/sky/engine/platform/text/BidiCharacterRun.cpp b/sky/engine/platform/text/BidiCharacterRun.cpp
index 438641f..ca7e75b 100644
--- a/sky/engine/platform/text/BidiCharacterRun.cpp
+++ b/sky/engine/platform/text/BidiCharacterRun.cpp
@@ -21,10 +21,10 @@
*
*/
-#include "sky/engine/platform/text/BidiCharacterRun.h"
+#include "flutter/sky/engine/platform/text/BidiCharacterRun.h"
-#include "sky/engine/platform/Partitions.h"
-#include "sky/engine/wtf/RefCountedLeakCounter.h"
+#include "flutter/sky/engine/platform/Partitions.h"
+#include "flutter/sky/engine/wtf/RefCountedLeakCounter.h"
using namespace WTF;
diff --git a/sky/engine/platform/text/BidiCharacterRun.h b/sky/engine/platform/text/BidiCharacterRun.h
index 8996b79..d720e56 100644
--- a/sky/engine/platform/text/BidiCharacterRun.h
+++ b/sky/engine/platform/text/BidiCharacterRun.h
@@ -22,8 +22,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_BIDICHARACTERRUN_H_
#define SKY_ENGINE_PLATFORM_TEXT_BIDICHARACTERRUN_H_
-#include "sky/engine/platform/text/BidiContext.h"
-#include "sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/BidiContext.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
namespace blink {
diff --git a/sky/engine/platform/text/BidiContext.cpp b/sky/engine/platform/text/BidiContext.cpp
index d457bed..ebb2cc9 100644
--- a/sky/engine/platform/text/BidiContext.cpp
+++ b/sky/engine/platform/text/BidiContext.cpp
@@ -19,10 +19,10 @@
*
*/
-#include "sky/engine/platform/text/BidiContext.h"
+#include "flutter/sky/engine/platform/text/BidiContext.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/text/BidiContext.h b/sky/engine/platform/text/BidiContext.h
index c6fe7b4..d48dcad 100644
--- a/sky/engine/platform/text/BidiContext.h
+++ b/sky/engine/platform/text/BidiContext.h
@@ -22,12 +22,12 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_BIDICONTEXT_H_
#define SKY_ENGINE_PLATFORM_TEXT_BIDICONTEXT_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/text/BidiResolver.h b/sky/engine/platform/text/BidiResolver.h
index 63bc597..ab500ce 100644
--- a/sky/engine/platform/text/BidiResolver.h
+++ b/sky/engine/platform/text/BidiResolver.h
@@ -22,14 +22,14 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_BIDIRESOLVER_H_
#define SKY_ENGINE_PLATFORM_TEXT_BIDIRESOLVER_H_
-#include "sky/engine/platform/text/BidiCharacterRun.h"
-#include "sky/engine/platform/text/BidiContext.h"
-#include "sky/engine/platform/text/BidiRunList.h"
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/text/BidiCharacterRun.h"
+#include "flutter/sky/engine/platform/text/BidiContext.h"
+#include "flutter/sky/engine/platform/text/BidiRunList.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/text/BidiResolverTest.cpp b/sky/engine/platform/text/BidiResolverTest.cpp
index 44fc95b..02963e8 100644
--- a/sky/engine/platform/text/BidiResolverTest.cpp
+++ b/sky/engine/platform/text/BidiResolverTest.cpp
@@ -28,13 +28,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
#include <gtest/gtest.h>
#include <fstream>
-#include "sky/engine/platform/text/BidiTestHarness.h"
-#include "sky/engine/platform/text/TextRunIterator.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/platform/text/BidiTestHarness.h"
+#include "flutter/sky/engine/platform/text/TextRunIterator.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace {
diff --git a/sky/engine/platform/text/BidiRunList.h b/sky/engine/platform/text/BidiRunList.h
index 66e2352..6699663 100644
--- a/sky/engine/platform/text/BidiRunList.h
+++ b/sky/engine/platform/text/BidiRunList.h
@@ -23,8 +23,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_BIDIRUNLIST_H_
#define SKY_ENGINE_PLATFORM_TEXT_BIDIRUNLIST_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace blink {
diff --git a/sky/engine/platform/text/BidiTextRun.cpp b/sky/engine/platform/text/BidiTextRun.cpp
index 736e4da..f8a4a77 100644
--- a/sky/engine/platform/text/BidiTextRun.cpp
+++ b/sky/engine/platform/text/BidiTextRun.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/BidiTextRun.h"
+#include "flutter/sky/engine/platform/text/BidiTextRun.h"
-#include "sky/engine/platform/text/BidiResolver.h"
-#include "sky/engine/platform/text/TextRunIterator.h"
+#include "flutter/sky/engine/platform/text/BidiResolver.h"
+#include "flutter/sky/engine/platform/text/TextRunIterator.h"
namespace blink {
diff --git a/sky/engine/platform/text/BidiTextRun.h b/sky/engine/platform/text/BidiTextRun.h
index 2a8c531..5ec317a 100644
--- a/sky/engine/platform/text/BidiTextRun.h
+++ b/sky/engine/platform/text/BidiTextRun.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_BIDITEXTRUN_H_
#define SKY_ENGINE_PLATFORM_TEXT_BIDITEXTRUN_H_
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/DateTimeFormat.cpp b/sky/engine/platform/text/DateTimeFormat.cpp
index 5121633..a80be93 100644
--- a/sky/engine/platform/text/DateTimeFormat.cpp
+++ b/sky/engine/platform/text/DateTimeFormat.cpp
@@ -23,10 +23,10 @@
* SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/DateTimeFormat.h"
+#include "flutter/sky/engine/platform/text/DateTimeFormat.h"
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
namespace blink {
diff --git a/sky/engine/platform/text/DateTimeFormat.h b/sky/engine/platform/text/DateTimeFormat.h
index f1f94a6..4cc6f27 100644
--- a/sky/engine/platform/text/DateTimeFormat.h
+++ b/sky/engine/platform/text/DateTimeFormat.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_DATETIMEFORMAT_H_
#define SKY_ENGINE_PLATFORM_TEXT_DATETIMEFORMAT_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
namespace blink {
diff --git a/sky/engine/platform/text/DecodeEscapeSequences.h b/sky/engine/platform/text/DecodeEscapeSequences.h
index a01103e..404039c 100644
--- a/sky/engine/platform/text/DecodeEscapeSequences.h
+++ b/sky/engine/platform/text/DecodeEscapeSequences.h
@@ -30,10 +30,10 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_DECODEESCAPESEQUENCES_H_
#define SKY_ENGINE_PLATFORM_TEXT_DECODEESCAPESEQUENCES_H_
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
namespace blink {
diff --git a/sky/engine/platform/text/LineEnding.cpp b/sky/engine/platform/text/LineEnding.cpp
index 02bba08..9d5b469 100644
--- a/sky/engine/platform/text/LineEnding.cpp
+++ b/sky/engine/platform/text/LineEnding.cpp
@@ -29,10 +29,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/LineEnding.h"
+#include "flutter/sky/engine/platform/text/LineEnding.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace {
diff --git a/sky/engine/platform/text/LineEnding.h b/sky/engine/platform/text/LineEnding.h
index 6bfa747..5bfd668 100644
--- a/sky/engine/platform/text/LineEnding.h
+++ b/sky/engine/platform/text/LineEnding.h
@@ -32,9 +32,9 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_LINEENDING_H_
#define SKY_ENGINE_PLATFORM_TEXT_LINEENDING_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/text/LocaleToScriptMapping.cpp b/sky/engine/platform/text/LocaleToScriptMapping.cpp
index f2bfd68..6a38cbe 100644
--- a/sky/engine/platform/text/LocaleToScriptMapping.cpp
+++ b/sky/engine/platform/text/LocaleToScriptMapping.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/LocaleToScriptMapping.h"
+#include "flutter/sky/engine/platform/text/LocaleToScriptMapping.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
namespace blink {
diff --git a/sky/engine/platform/text/LocaleToScriptMapping.h b/sky/engine/platform/text/LocaleToScriptMapping.h
index 0a5c8c3..850181c 100644
--- a/sky/engine/platform/text/LocaleToScriptMapping.h
+++ b/sky/engine/platform/text/LocaleToScriptMapping.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_LOCALETOSCRIPTMAPPING_H_
#define SKY_ENGINE_PLATFORM_TEXT_LOCALETOSCRIPTMAPPING_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include <unicode/uscript.h>
diff --git a/sky/engine/platform/text/ParserUtilities.h b/sky/engine/platform/text/ParserUtilities.h
index 87fa8f9..dec0d02 100644
--- a/sky/engine/platform/text/ParserUtilities.h
+++ b/sky/engine/platform/text/ParserUtilities.h
@@ -22,7 +22,7 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_PARSERUTILITIES_H_
#define SKY_ENGINE_PLATFORM_TEXT_PARSERUTILITIES_H_
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/QuotedPrintable.cpp b/sky/engine/platform/text/QuotedPrintable.cpp
index 67222f9..04f8392 100644
--- a/sky/engine/platform/text/QuotedPrintable.cpp
+++ b/sky/engine/platform/text/QuotedPrintable.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/QuotedPrintable.h"
+#include "flutter/sky/engine/platform/text/QuotedPrintable.h"
-#include "sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
namespace blink {
diff --git a/sky/engine/platform/text/QuotedPrintable.h b/sky/engine/platform/text/QuotedPrintable.h
index ff043ac..9697270 100644
--- a/sky/engine/platform/text/QuotedPrintable.h
+++ b/sky/engine/platform/text/QuotedPrintable.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_QUOTEDPRINTABLE_H_
#define SKY_ENGINE_PLATFORM_TEXT_QUOTEDPRINTABLE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/platform/text/SegmentedString.cpp b/sky/engine/platform/text/SegmentedString.cpp
index 5aa13fe..11d69ba 100644
--- a/sky/engine/platform/text/SegmentedString.cpp
+++ b/sky/engine/platform/text/SegmentedString.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/platform/text/SegmentedString.h"
+#include "flutter/sky/engine/platform/text/SegmentedString.h"
namespace blink {
diff --git a/sky/engine/platform/text/SegmentedString.h b/sky/engine/platform/text/SegmentedString.h
index 22c6bbf..e4d4415 100644
--- a/sky/engine/platform/text/SegmentedString.h
+++ b/sky/engine/platform/text/SegmentedString.h
@@ -20,11 +20,11 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_SEGMENTEDSTRING_H_
#define SKY_ENGINE_PLATFORM_TEXT_SEGMENTEDSTRING_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Deque.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/TextPosition.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Deque.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/TextPosition.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/SegmentedStringTest.cpp b/sky/engine/platform/text/SegmentedStringTest.cpp
index c0a1009..b0893ef 100644
--- a/sky/engine/platform/text/SegmentedStringTest.cpp
+++ b/sky/engine/platform/text/SegmentedStringTest.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/SegmentedString.h"
+#include "flutter/sky/engine/platform/text/SegmentedString.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/text/StringTruncator.cpp b/sky/engine/platform/text/StringTruncator.cpp
index 22900f8..bd7f899 100644
--- a/sky/engine/platform/text/StringTruncator.cpp
+++ b/sky/engine/platform/text/StringTruncator.cpp
@@ -26,13 +26,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/StringTruncator.h"
+#include "flutter/sky/engine/platform/text/StringTruncator.h"
-#include "sky/engine/platform/fonts/Font.h"
-#include "sky/engine/platform/text/TextBreakIterator.h"
-#include "sky/engine/platform/text/TextRun.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/fonts/Font.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/platform/text/StringTruncator.h b/sky/engine/platform/text/StringTruncator.h
index c85b22f..e37ab0c 100644
--- a/sky/engine/platform/text/StringTruncator.h
+++ b/sky/engine/platform/text/StringTruncator.h
@@ -29,8 +29,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_STRINGTRUNCATOR_H_
#define SKY_ENGINE_PLATFORM_TEXT_STRINGTRUNCATOR_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
namespace blink {
diff --git a/sky/engine/platform/text/SuffixTree.h b/sky/engine/platform/text/SuffixTree.h
index 2664dc6..e2ee3b3 100644
--- a/sky/engine/platform/text/SuffixTree.h
+++ b/sky/engine/platform/text/SuffixTree.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_SUFFIXTREE_H_
#define SKY_ENGINE_PLATFORM_TEXT_SUFFIXTREE_H_
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/SurrogatePairAwareTextIterator.cpp b/sky/engine/platform/text/SurrogatePairAwareTextIterator.cpp
index c527fee..3810b17 100644
--- a/sky/engine/platform/text/SurrogatePairAwareTextIterator.cpp
+++ b/sky/engine/platform/text/SurrogatePairAwareTextIterator.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "sky/engine/platform/text/SurrogatePairAwareTextIterator.h"
+#include "flutter/sky/engine/platform/text/SurrogatePairAwareTextIterator.h"
#include <unicode/unorm.h>
diff --git a/sky/engine/platform/text/SurrogatePairAwareTextIterator.h b/sky/engine/platform/text/SurrogatePairAwareTextIterator.h
index bf8676f..2f30b91 100644
--- a/sky/engine/platform/text/SurrogatePairAwareTextIterator.h
+++ b/sky/engine/platform/text/SurrogatePairAwareTextIterator.h
@@ -21,9 +21,9 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_SURROGATEPAIRAWARETEXTITERATOR_H_
#define SKY_ENGINE_PLATFORM_TEXT_SURROGATEPAIRAWARETEXTITERATOR_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextBoundaries.cpp b/sky/engine/platform/text/TextBoundaries.cpp
index 389fa86..d3a7b7e 100644
--- a/sky/engine/platform/text/TextBoundaries.cpp
+++ b/sky/engine/platform/text/TextBoundaries.cpp
@@ -24,10 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/TextBoundaries.h"
+#include "flutter/sky/engine/platform/text/TextBoundaries.h"
-#include "sky/engine/platform/text/TextBreakIterator.h"
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
using namespace WTF;
using namespace Unicode;
diff --git a/sky/engine/platform/text/TextBoundaries.h b/sky/engine/platform/text/TextBoundaries.h
index 55dfcdc..612659a 100644
--- a/sky/engine/platform/text/TextBoundaries.h
+++ b/sky/engine/platform/text/TextBoundaries.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTBOUNDARIES_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTBOUNDARIES_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextBreakIterator.cpp b/sky/engine/platform/text/TextBreakIterator.cpp
index 841c2f8..0572223 100644
--- a/sky/engine/platform/text/TextBreakIterator.cpp
+++ b/sky/engine/platform/text/TextBreakIterator.cpp
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextBreakIterator.h b/sky/engine/platform/text/TextBreakIterator.h
index 30c6f9f..e133b90 100644
--- a/sky/engine/platform/text/TextBreakIterator.h
+++ b/sky/engine/platform/text/TextBreakIterator.h
@@ -22,9 +22,9 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTBREAKITERATOR_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTBREAKITERATOR_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include <unicode/brkiter.h>
diff --git a/sky/engine/platform/text/TextBreakIteratorICU.cpp b/sky/engine/platform/text/TextBreakIteratorICU.cpp
index 37b1290..f14083e 100644
--- a/sky/engine/platform/text/TextBreakIteratorICU.cpp
+++ b/sky/engine/platform/text/TextBreakIteratorICU.cpp
@@ -19,19 +19,19 @@
*
*/
-#include "sky/engine/platform/text/TextBreakIterator.h"
+#include "flutter/sky/engine/platform/text/TextBreakIterator.h"
#include <unicode/rbbi.h>
#include <unicode/ubrk.h>
-#include "sky/engine/platform/text/TextBreakIteratorInternalICU.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/ThreadSpecific.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/text/TextBreakIteratorInternalICU.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/ThreadSpecific.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
using namespace WTF;
diff --git a/sky/engine/platform/text/TextBreakIteratorInternalICU.cpp b/sky/engine/platform/text/TextBreakIteratorInternalICU.cpp
index a05ca35..748f648 100644
--- a/sky/engine/platform/text/TextBreakIteratorInternalICU.cpp
+++ b/sky/engine/platform/text/TextBreakIteratorInternalICU.cpp
@@ -19,12 +19,12 @@
*
*/
-#include "sky/engine/platform/text/TextBreakIteratorInternalICU.h"
+#include "flutter/sky/engine/platform/text/TextBreakIteratorInternalICU.h"
-#include "sky/engine/platform/Language.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/Language.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextBreakIteratorInternalICU.h b/sky/engine/platform/text/TextBreakIteratorInternalICU.h
index 7b802d6..f9997c5 100644
--- a/sky/engine/platform/text/TextBreakIteratorInternalICU.h
+++ b/sky/engine/platform/text/TextBreakIteratorInternalICU.h
@@ -21,7 +21,7 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTBREAKITERATORINTERNALICU_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTBREAKITERATORINTERNALICU_H_
-#include "sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
// FIXME: Now that this handles locales for ICU, not just for text breaking,
// this file and the various implementation files should be renamed.
diff --git a/sky/engine/platform/text/TextCheckerClient.h b/sky/engine/platform/text/TextCheckerClient.h
index 2d2e5bd..0ece958 100644
--- a/sky/engine/platform/text/TextCheckerClient.h
+++ b/sky/engine/platform/text/TextCheckerClient.h
@@ -28,11 +28,11 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTCHECKERCLIENT_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTCHECKERCLIENT_H_
-#include "sky/engine/platform/text/TextChecking.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/text/TextChecking.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextChecking.h b/sky/engine/platform/text/TextChecking.h
index 4e1e730..441c28c 100644
--- a/sky/engine/platform/text/TextChecking.h
+++ b/sky/engine/platform/text/TextChecking.h
@@ -31,10 +31,10 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTCHECKING_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTCHECKING_H_
-#include "sky/engine/platform/text/TextDecoration.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/text/TextDecoration.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextRun.cpp b/sky/engine/platform/text/TextRun.cpp
index 40a66e1..e987e5a 100644
--- a/sky/engine/platform/text/TextRun.cpp
+++ b/sky/engine/platform/text/TextRun.cpp
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextRun.h b/sky/engine/platform/text/TextRun.h
index 5d8e354..1eb3ff9 100644
--- a/sky/engine/platform/text/TextRun.h
+++ b/sky/engine/platform/text/TextRun.h
@@ -24,13 +24,13 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTRUN_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTRUN_H_
-#include "sky/engine/platform/fonts/Glyph.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/platform/text/TextDirection.h"
-#include "sky/engine/platform/text/TextPath.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/fonts/Glyph.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/platform/text/TextDirection.h"
+#include "flutter/sky/engine/platform/text/TextPath.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include "third_party/skia/include/core/SkRefCnt.h"
class SkTextBlob;
diff --git a/sky/engine/platform/text/TextRunIterator.h b/sky/engine/platform/text/TextRunIterator.h
index 280ff3f..884f6a2 100644
--- a/sky/engine/platform/text/TextRunIterator.h
+++ b/sky/engine/platform/text/TextRunIterator.h
@@ -29,7 +29,7 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTRUNITERATOR_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTRUNITERATOR_H_
-#include "sky/engine/platform/text/TextRun.h"
+#include "flutter/sky/engine/platform/text/TextRun.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextStream.cpp b/sky/engine/platform/text/TextStream.cpp
index 99a9b58..912a5cf 100644
--- a/sky/engine/platform/text/TextStream.cpp
+++ b/sky/engine/platform/text/TextStream.cpp
@@ -23,16 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/TextStream.h"
+#include "flutter/sky/engine/platform/text/TextStream.h"
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/geometry/IntPoint.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/StringExtras.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/geometry/IntPoint.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace blink {
diff --git a/sky/engine/platform/text/TextStream.h b/sky/engine/platform/text/TextStream.h
index 6536012..ac4295f 100644
--- a/sky/engine/platform/text/TextStream.h
+++ b/sky/engine/platform/text/TextStream.h
@@ -26,11 +26,11 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_TEXTSTREAM_H_
#define SKY_ENGINE_PLATFORM_TEXT_TEXTSTREAM_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/text/UnicodeRange.cpp b/sky/engine/platform/text/UnicodeRange.cpp
index 1b30cee..7565062 100644
--- a/sky/engine/platform/text/UnicodeRange.cpp
+++ b/sky/engine/platform/text/UnicodeRange.cpp
@@ -32,7 +32,7 @@
* version of this file under any of the LGPL, the MPL or the GPL.
*/
-#include "sky/engine/platform/text/UnicodeRange.h"
+#include "flutter/sky/engine/platform/text/UnicodeRange.h"
namespace blink {
diff --git a/sky/engine/platform/text/UnicodeRange.h b/sky/engine/platform/text/UnicodeRange.h
index b57e0ef..29b93f5 100644
--- a/sky/engine/platform/text/UnicodeRange.h
+++ b/sky/engine/platform/text/UnicodeRange.h
@@ -35,8 +35,8 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_UNICODERANGE_H_
#define SKY_ENGINE_PLATFORM_TEXT_UNICODERANGE_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/text/UnicodeUtilities.cpp b/sky/engine/platform/text/UnicodeUtilities.cpp
index d33c739..ce472fe 100644
--- a/sky/engine/platform/text/UnicodeUtilities.cpp
+++ b/sky/engine/platform/text/UnicodeUtilities.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/UnicodeUtilities.h"
+#include "flutter/sky/engine/platform/text/UnicodeUtilities.h"
#include <unicode/unorm.h>
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
using namespace WTF::Unicode;
diff --git a/sky/engine/platform/text/UnicodeUtilities.h b/sky/engine/platform/text/UnicodeUtilities.h
index 0ee43be..2f28e1f 100644
--- a/sky/engine/platform/text/UnicodeUtilities.h
+++ b/sky/engine/platform/text/UnicodeUtilities.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_PLATFORM_TEXT_UNICODEUTILITIES_H_
#define SKY_ENGINE_PLATFORM_TEXT_UNICODEUTILITIES_H_
-#include "sky/engine/platform/PlatformExport.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/platform/PlatformExport.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace blink {
diff --git a/sky/engine/platform/text/UnicodeUtilitiesTest.cpp b/sky/engine/platform/text/UnicodeUtilitiesTest.cpp
index 6629608..4a4cf14 100644
--- a/sky/engine/platform/text/UnicodeUtilitiesTest.cpp
+++ b/sky/engine/platform/text/UnicodeUtilitiesTest.cpp
@@ -28,13 +28,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/text/UnicodeUtilities.h"
+#include "flutter/sky/engine/platform/text/UnicodeUtilities.h"
#include <gtest/gtest.h>
#include <unicode/uchar.h>
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
using namespace blink;
diff --git a/sky/engine/platform/transforms/AffineTransform.cpp b/sky/engine/platform/transforms/AffineTransform.cpp
index 4197d73..8db2648 100644
--- a/sky/engine/platform/transforms/AffineTransform.cpp
+++ b/sky/engine/platform/transforms/AffineTransform.cpp
@@ -25,13 +25,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/platform/FloatConversion.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/FloatConversion.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/AffineTransform.h b/sky/engine/platform/transforms/AffineTransform.h
index 4aee060..d959c1a 100644
--- a/sky/engine/platform/transforms/AffineTransform.h
+++ b/sky/engine/platform/transforms/AffineTransform.h
@@ -27,10 +27,10 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_AFFINETRANSFORM_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_AFFINETRANSFORM_H_
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
#include <string.h> // for memcpy
-#include "sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/IdentityTransformOperation.h b/sky/engine/platform/transforms/IdentityTransformOperation.h
index fa2bc01..234d9ad 100644
--- a/sky/engine/platform/transforms/IdentityTransformOperation.h
+++ b/sky/engine/platform/transforms/IdentityTransformOperation.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_IDENTITYTRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_IDENTITYTRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/InterpolatedTransformOperation.cpp b/sky/engine/platform/transforms/InterpolatedTransformOperation.cpp
index a66ce60..faad887 100644
--- a/sky/engine/platform/transforms/InterpolatedTransformOperation.cpp
+++ b/sky/engine/platform/transforms/InterpolatedTransformOperation.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/transforms/InterpolatedTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/InterpolatedTransformOperation.h"
-#include "sky/engine/platform/transforms/IdentityTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/IdentityTransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/InterpolatedTransformOperation.h b/sky/engine/platform/transforms/InterpolatedTransformOperation.h
index 1c366f8..fd8d4c4 100644
--- a/sky/engine/platform/transforms/InterpolatedTransformOperation.h
+++ b/sky/engine/platform/transforms/InterpolatedTransformOperation.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_INTERPOLATEDTRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_INTERPOLATEDTRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
-#include "sky/engine/platform/transforms/TransformOperations.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperations.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/Matrix3DTransformOperation.cpp b/sky/engine/platform/transforms/Matrix3DTransformOperation.cpp
index 8dc5739..05c3b4a 100644
--- a/sky/engine/platform/transforms/Matrix3DTransformOperation.cpp
+++ b/sky/engine/platform/transforms/Matrix3DTransformOperation.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/transforms/Matrix3DTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/Matrix3DTransformOperation.h"
#include <algorithm>
diff --git a/sky/engine/platform/transforms/Matrix3DTransformOperation.h b/sky/engine/platform/transforms/Matrix3DTransformOperation.h
index b598a4e..2195c7a 100644
--- a/sky/engine/platform/transforms/Matrix3DTransformOperation.h
+++ b/sky/engine/platform/transforms/Matrix3DTransformOperation.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_MATRIX3DTRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_MATRIX3DTRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/MatrixTransformOperation.cpp b/sky/engine/platform/transforms/MatrixTransformOperation.cpp
index 1cb983a..81d6b1f 100644
--- a/sky/engine/platform/transforms/MatrixTransformOperation.cpp
+++ b/sky/engine/platform/transforms/MatrixTransformOperation.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "sky/engine/platform/transforms/MatrixTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/MatrixTransformOperation.h"
#include <algorithm>
diff --git a/sky/engine/platform/transforms/MatrixTransformOperation.h b/sky/engine/platform/transforms/MatrixTransformOperation.h
index 9cd67b9..edc6439 100644
--- a/sky/engine/platform/transforms/MatrixTransformOperation.h
+++ b/sky/engine/platform/transforms/MatrixTransformOperation.h
@@ -25,8 +25,8 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_MATRIXTRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_MATRIXTRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/PerspectiveTransformOperation.cpp b/sky/engine/platform/transforms/PerspectiveTransformOperation.cpp
index 75cb787..4fffea3 100644
--- a/sky/engine/platform/transforms/PerspectiveTransformOperation.cpp
+++ b/sky/engine/platform/transforms/PerspectiveTransformOperation.cpp
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/transforms/PerspectiveTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/PerspectiveTransformOperation.h"
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/PerspectiveTransformOperation.h b/sky/engine/platform/transforms/PerspectiveTransformOperation.h
index db88368..1974fd2 100644
--- a/sky/engine/platform/transforms/PerspectiveTransformOperation.h
+++ b/sky/engine/platform/transforms/PerspectiveTransformOperation.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_PERSPECTIVETRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_PERSPECTIVETRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/RotateTransformOperation.cpp b/sky/engine/platform/transforms/RotateTransformOperation.cpp
index 03026a2..48daf63 100644
--- a/sky/engine/platform/transforms/RotateTransformOperation.cpp
+++ b/sky/engine/platform/transforms/RotateTransformOperation.cpp
@@ -19,12 +19,12 @@
*
*/
-#include "sky/engine/platform/transforms/RotateTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/RotateTransformOperation.h"
#include <algorithm>
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/platform/geometry/FloatPoint3D.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint3D.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/RotateTransformOperation.h b/sky/engine/platform/transforms/RotateTransformOperation.h
index 79ef309..cb029a6 100644
--- a/sky/engine/platform/transforms/RotateTransformOperation.h
+++ b/sky/engine/platform/transforms/RotateTransformOperation.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_ROTATETRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_ROTATETRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/ScaleTransformOperation.cpp b/sky/engine/platform/transforms/ScaleTransformOperation.cpp
index 9a28583..c2434b9 100644
--- a/sky/engine/platform/transforms/ScaleTransformOperation.cpp
+++ b/sky/engine/platform/transforms/ScaleTransformOperation.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/platform/transforms/ScaleTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/ScaleTransformOperation.h"
-#include "sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/ScaleTransformOperation.h b/sky/engine/platform/transforms/ScaleTransformOperation.h
index a9fa4d9..29239d8 100644
--- a/sky/engine/platform/transforms/ScaleTransformOperation.h
+++ b/sky/engine/platform/transforms/ScaleTransformOperation.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_SCALETRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_SCALETRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/SkewTransformOperation.cpp b/sky/engine/platform/transforms/SkewTransformOperation.cpp
index 5434000..04333f1 100644
--- a/sky/engine/platform/transforms/SkewTransformOperation.cpp
+++ b/sky/engine/platform/transforms/SkewTransformOperation.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/platform/transforms/SkewTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/SkewTransformOperation.h"
-#include "sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/SkewTransformOperation.h b/sky/engine/platform/transforms/SkewTransformOperation.h
index 858dd9b..657ef9d 100644
--- a/sky/engine/platform/transforms/SkewTransformOperation.h
+++ b/sky/engine/platform/transforms/SkewTransformOperation.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_SKEWTRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_SKEWTRANSFORMOPERATION_H_
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/TransformOperation.h b/sky/engine/platform/transforms/TransformOperation.h
index 9b4a51b..11ccd88 100644
--- a/sky/engine/platform/transforms/TransformOperation.h
+++ b/sky/engine/platform/transforms/TransformOperation.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSFORMOPERATION_H_
-#include "sky/engine/platform/geometry/FloatSize.h"
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/platform/geometry/FloatSize.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/TransformOperations.cpp b/sky/engine/platform/transforms/TransformOperations.cpp
index 8fb9aa9..0474215 100644
--- a/sky/engine/platform/transforms/TransformOperations.cpp
+++ b/sky/engine/platform/transforms/TransformOperations.cpp
@@ -19,14 +19,14 @@
*
*/
-#include "sky/engine/platform/transforms/TransformOperations.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperations.h"
#include <algorithm>
-#include "sky/engine/platform/animation/AnimationUtilities.h"
-#include "sky/engine/platform/geometry/FloatBox.h"
-#include "sky/engine/platform/transforms/IdentityTransformOperation.h"
-#include "sky/engine/platform/transforms/InterpolatedTransformOperation.h"
-#include "sky/engine/platform/transforms/RotateTransformOperation.h"
+#include "flutter/sky/engine/platform/animation/AnimationUtilities.h"
+#include "flutter/sky/engine/platform/geometry/FloatBox.h"
+#include "flutter/sky/engine/platform/transforms/IdentityTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/InterpolatedTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/RotateTransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/TransformOperations.h b/sky/engine/platform/transforms/TransformOperations.h
index 4777ddf..21abb6b 100644
--- a/sky/engine/platform/transforms/TransformOperations.h
+++ b/sky/engine/platform/transforms/TransformOperations.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSFORMOPERATIONS_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSFORMOPERATIONS_H_
-#include "sky/engine/platform/geometry/LayoutSize.h"
-#include "sky/engine/platform/transforms/TransformOperation.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/platform/geometry/LayoutSize.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
class FloatBox;
diff --git a/sky/engine/platform/transforms/TransformOperationsTest.cpp b/sky/engine/platform/transforms/TransformOperationsTest.cpp
index 0d2ebc3..8edfe2b 100644
--- a/sky/engine/platform/transforms/TransformOperationsTest.cpp
+++ b/sky/engine/platform/transforms/TransformOperationsTest.cpp
@@ -22,18 +22,18 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/transforms/TransformOperations.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperations.h"
-#include "sky/engine/platform/geometry/FloatBox.h"
-#include "sky/engine/platform/geometry/FloatBoxTestHelpers.h"
-#include "sky/engine/platform/transforms/IdentityTransformOperation.h"
-#include "sky/engine/platform/transforms/Matrix3DTransformOperation.h"
-#include "sky/engine/platform/transforms/MatrixTransformOperation.h"
-#include "sky/engine/platform/transforms/PerspectiveTransformOperation.h"
-#include "sky/engine/platform/transforms/RotateTransformOperation.h"
-#include "sky/engine/platform/transforms/ScaleTransformOperation.h"
-#include "sky/engine/platform/transforms/SkewTransformOperation.h"
-#include "sky/engine/platform/transforms/TranslateTransformOperation.h"
+#include "flutter/sky/engine/platform/geometry/FloatBox.h"
+#include "flutter/sky/engine/platform/geometry/FloatBoxTestHelpers.h"
+#include "flutter/sky/engine/platform/transforms/IdentityTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/Matrix3DTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/MatrixTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/PerspectiveTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/RotateTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/ScaleTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/SkewTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TranslateTransformOperation.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/transforms/TransformationMatrix.cpp b/sky/engine/platform/transforms/TransformationMatrix.cpp
index 6950071..584155a 100644
--- a/sky/engine/platform/transforms/TransformationMatrix.cpp
+++ b/sky/engine/platform/transforms/TransformationMatrix.cpp
@@ -25,17 +25,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
-#include "sky/engine/platform/geometry/FloatBox.h"
-#include "sky/engine/platform/geometry/FloatQuad.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/engine/platform/geometry/IntRect.h"
-#include "sky/engine/platform/geometry/LayoutRect.h"
-#include "sky/engine/platform/transforms/AffineTransform.h"
+#include "flutter/sky/engine/platform/geometry/FloatBox.h"
+#include "flutter/sky/engine/platform/geometry/FloatQuad.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/sky/engine/platform/geometry/IntRect.h"
+#include "flutter/sky/engine/platform/geometry/LayoutRect.h"
+#include "flutter/sky/engine/platform/transforms/AffineTransform.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
#if CPU(X86_64)
#include <emmintrin.h>
diff --git a/sky/engine/platform/transforms/TransformationMatrix.h b/sky/engine/platform/transforms/TransformationMatrix.h
index 7ab0008..79d38c7 100644
--- a/sky/engine/platform/transforms/TransformationMatrix.h
+++ b/sky/engine/platform/transforms/TransformationMatrix.h
@@ -27,11 +27,11 @@
#define SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSFORMATIONMATRIX_H_
#include <string.h> //for memcpy
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/geometry/FloatPoint3D.h"
-#include "sky/engine/platform/geometry/IntPoint.h"
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint.h"
+#include "flutter/sky/engine/platform/geometry/FloatPoint3D.h"
+#include "flutter/sky/engine/platform/geometry/IntPoint.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
#include "third_party/skia/include/core/SkMatrix44.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/TransformationMatrixTest.cpp b/sky/engine/platform/transforms/TransformationMatrixTest.cpp
index fbdbbf1..3e8639f 100644
--- a/sky/engine/platform/transforms/TransformationMatrixTest.cpp
+++ b/sky/engine/platform/transforms/TransformationMatrixTest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/platform/transforms/TransformationMatrix.h"
+#include "flutter/sky/engine/platform/transforms/TransformationMatrix.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/platform/transforms/TranslateTransformOperation.cpp b/sky/engine/platform/transforms/TranslateTransformOperation.cpp
index da72878..1850b42 100644
--- a/sky/engine/platform/transforms/TranslateTransformOperation.cpp
+++ b/sky/engine/platform/transforms/TranslateTransformOperation.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "sky/engine/platform/transforms/TranslateTransformOperation.h"
+#include "flutter/sky/engine/platform/transforms/TranslateTransformOperation.h"
namespace blink {
diff --git a/sky/engine/platform/transforms/TranslateTransformOperation.h b/sky/engine/platform/transforms/TranslateTransformOperation.h
index 500d7bb..6fb6d8c 100644
--- a/sky/engine/platform/transforms/TranslateTransformOperation.h
+++ b/sky/engine/platform/transforms/TranslateTransformOperation.h
@@ -25,9 +25,9 @@
#ifndef SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSLATETRANSFORMOPERATION_H_
#define SKY_ENGINE_PLATFORM_TRANSFORMS_TRANSLATETRANSFORMOPERATION_H_
-#include "sky/engine/platform/Length.h"
-#include "sky/engine/platform/LengthFunctions.h"
-#include "sky/engine/platform/transforms/TransformOperation.h"
+#include "flutter/sky/engine/platform/Length.h"
+#include "flutter/sky/engine/platform/LengthFunctions.h"
+#include "flutter/sky/engine/platform/transforms/TransformOperation.h"
namespace blink {
diff --git a/sky/engine/public/BUILD.gn b/sky/engine/public/BUILD.gn
index d441a7d..4c926a9 100644
--- a/sky/engine/public/BUILD.gn
+++ b/sky/engine/public/BUILD.gn
@@ -6,7 +6,7 @@
group("test_support") {
deps = [
- "//sky/engine/web:test_support",
+ "//flutter/sky/engine/web:test_support",
]
}
diff --git a/sky/engine/public/platform/Platform.h b/sky/engine/public/platform/Platform.h
index 006dd61..89f1545 100644
--- a/sky/engine/public/platform/Platform.h
+++ b/sky/engine/public/platform/Platform.h
@@ -33,8 +33,8 @@
#include <string>
-#include "sky/engine/public/platform/WebCommon.h"
-#include "sky/engine/public/platform/WebVector.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/public/platform/WebVector.h"
namespace ftl {
class TaskRunner;
diff --git a/sky/engine/public/platform/WebBlendMode.h b/sky/engine/public/platform/WebBlendMode.h
index 530557f..db1670f 100644
--- a/sky/engine/public/platform/WebBlendMode.h
+++ b/sky/engine/public/platform/WebBlendMode.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_PUBLIC_PLATFORM_WEBBLENDMODE_H_
#define SKY_ENGINE_PUBLIC_PLATFORM_WEBBLENDMODE_H_
-#include "sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
namespace blink {
diff --git a/sky/engine/public/platform/WebCString.h b/sky/engine/public/platform/WebCString.h
index d5bdbd3..da32e86 100644
--- a/sky/engine/public/platform/WebCString.h
+++ b/sky/engine/public/platform/WebCString.h
@@ -31,11 +31,11 @@
#ifndef SKY_ENGINE_PUBLIC_PLATFORM_WEBCSTRING_H_
#define SKY_ENGINE_PUBLIC_PLATFORM_WEBCSTRING_H_
-#include "sky/engine/public/platform/WebCommon.h"
-#include "sky/engine/public/platform/WebPrivatePtr.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/public/platform/WebPrivatePtr.h"
#if INSIDE_BLINK
-#include "sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Forward.h"
#endif
#if !INSIDE_BLINK || defined(UNIT_TEST)
#include <string>
diff --git a/sky/engine/public/platform/WebPrivatePtr.h b/sky/engine/public/platform/WebPrivatePtr.h
index cbb01ae..1fa7ecf 100644
--- a/sky/engine/public/platform/WebPrivatePtr.h
+++ b/sky/engine/public/platform/WebPrivatePtr.h
@@ -31,12 +31,12 @@
#ifndef SKY_ENGINE_PUBLIC_PLATFORM_WEBPRIVATEPTR_H_
#define SKY_ENGINE_PUBLIC_PLATFORM_WEBPRIVATEPTR_H_
-#include "sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
#if INSIDE_BLINK
-#include "sky/engine/platform/heap/Handle.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/platform/heap/Handle.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
#endif
namespace blink {
diff --git a/sky/engine/public/platform/WebVector.h b/sky/engine/public/platform/WebVector.h
index 2a06252..547d22a 100644
--- a/sky/engine/public/platform/WebVector.h
+++ b/sky/engine/public/platform/WebVector.h
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <algorithm>
#include <limits>
-#include "sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
namespace blink {
diff --git a/sky/engine/public/platform/linux/WebFontInfo.h b/sky/engine/public/platform/linux/WebFontInfo.h
index 68ae327..7f5be20 100644
--- a/sky/engine/public/platform/linux/WebFontInfo.h
+++ b/sky/engine/public/platform/linux/WebFontInfo.h
@@ -33,8 +33,8 @@
#include <string.h>
#include <unistd.h>
-#include "sky/engine/public/platform/WebCString.h"
-#include "sky/engine/public/platform/linux/WebFallbackFont.h"
+#include "flutter/sky/engine/public/platform/WebCString.h"
+#include "flutter/sky/engine/public/platform/linux/WebFallbackFont.h"
namespace blink {
diff --git a/sky/engine/public/sky/BUILD.gn b/sky/engine/public/sky/BUILD.gn
index d0aa80f..ac851d4 100644
--- a/sky/engine/public/sky/BUILD.gn
+++ b/sky/engine/public/sky/BUILD.gn
@@ -5,25 +5,25 @@
source_set("sky") {
deps = [
"//base",
- "//flow",
+ "//flutter/flow",
"//flutter/lib/ui",
- "//glue",
+ "//flutter/glue",
"//lib/ftl/",
"//mojo/public/cpp/system",
"//mojo/services/network/interfaces",
- "//skia",
- "//sky/engine/bindings",
- "//sky/engine/core",
- "//sky/engine/platform",
- "//sky/engine/wtf",
- "//sky/services/engine:interfaces",
- "//sky/services/pointer:interfaces",
+ "//flutter/skia",
+ "//flutter/sky/engine/bindings",
+ "//flutter/sky/engine/core",
+ "//flutter/sky/engine/platform",
+ "//flutter/sky/engine/wtf",
+ "//flutter/services/engine:interfaces",
+ "//flutter/services/pointer:interfaces",
]
configs += [
- "//sky/engine:config",
- "//sky/engine:inside_blink",
- "//sky/engine:non_test_config",
+ "//flutter/sky/engine:config",
+ "//flutter/sky/engine:inside_blink",
+ "//flutter/sky/engine:non_test_config",
]
sources = [
diff --git a/sky/engine/public/sky/sky_view.cc b/sky/engine/public/sky/sky_view.cc
index 9c6d0b7..c67845a 100644
--- a/sky/engine/public/sky/sky_view.cc
+++ b/sky/engine/public/sky/sky_view.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/public/sky/sky_view.h"
+#include "flutter/sky/engine/public/sky/sky_view.h"
#include "flutter/lib/ui/compositing/scene.h"
-#include "glue/trace_event.h"
-#include "sky/engine/core/script/dart_controller.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/core/window/window.h"
-#include "sky/engine/public/sky/sky_view_client.h"
-#include "sky/engine/wtf/MakeUnique.h"
+#include "flutter/glue/trace_event.h"
+#include "flutter/sky/engine/core/script/dart_controller.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/core/window/window.h"
+#include "flutter/sky/engine/public/sky/sky_view_client.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
namespace blink {
diff --git a/sky/engine/public/sky/sky_view.h b/sky/engine/public/sky/sky_view.h
index 658e7f8..454a3d1 100644
--- a/sky/engine/public/sky/sky_view.h
+++ b/sky/engine/public/sky/sky_view.h
@@ -7,18 +7,18 @@
#include <memory>
-#include "flow/layers/layer_tree.h"
+#include "flutter/flow/layers/layer_tree.h"
#include "lib/ftl/macros.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "mojo/services/network/interfaces/url_loader.mojom.h"
-#include "sky/engine/bindings/flutter_dart_state.h"
-#include "sky/engine/core/window/window.h"
-#include "sky/engine/public/platform/WebCommon.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/services/engine/sky_engine.mojom.h"
-#include "sky/services/pointer/pointer.mojom.h"
+#include "flutter/sky/engine/bindings/flutter_dart_state.h"
+#include "flutter/sky/engine/core/window/window.h"
+#include "flutter/sky/engine/public/platform/WebCommon.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
+#include "flutter/services/pointer/pointer.mojom.h"
#include "third_party/skia/include/core/SkPicture.h"
namespace blink {
diff --git a/sky/engine/public/sky/sky_view_client.cc b/sky/engine/public/sky/sky_view_client.cc
index b672f48..ab77e8a 100644
--- a/sky/engine/public/sky/sky_view_client.cc
+++ b/sky/engine/public/sky/sky_view_client.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/public/sky/sky_view_client.h"
+#include "flutter/sky/engine/public/sky/sky_view_client.h"
namespace blink {
diff --git a/sky/engine/public/sky/sky_view_client.h b/sky/engine/public/sky/sky_view_client.h
index a488d54..c2e6711 100644
--- a/sky/engine/public/sky/sky_view_client.h
+++ b/sky/engine/public/sky/sky_view_client.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "flow/layers/layer_tree.h"
+#include "flutter/flow/layers/layer_tree.h"
typedef struct _Dart_Isolate* Dart_Isolate;
diff --git a/sky/engine/web/BUILD.gn b/sky/engine/web/BUILD.gn
index 76ec2cf..cc0520a 100644
--- a/sky/engine/web/BUILD.gn
+++ b/sky/engine/web/BUILD.gn
@@ -5,14 +5,14 @@
source_set("web") {
deps = [
"//mojo/message_pump",
- "//sky/engine/core",
- "//sky/engine/platform",
+ "//flutter/sky/engine/core",
+ "//flutter/sky/engine/platform",
]
configs += [
- "//sky/engine:config",
- "//sky/engine:inside_blink",
- "//sky/engine:non_test_config",
+ "//flutter/sky/engine:config",
+ "//flutter/sky/engine:inside_blink",
+ "//flutter/sky/engine:non_test_config",
]
sources = [
diff --git a/sky/engine/web/Sky.cpp b/sky/engine/web/Sky.cpp
index 2aea70f..5d7be76 100644
--- a/sky/engine/web/Sky.cpp
+++ b/sky/engine/web/Sky.cpp
@@ -28,20 +28,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/public/web/Sky.h"
+#include "flutter/sky/engine/public/web/Sky.h"
#include "base/message_loop/message_loop.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "lib/tonic/dart_microtask_queue.h"
#include "mojo/message_pump/message_pump_mojo.h"
-#include "sky/engine/core/Init.h"
-#include "sky/engine/core/script/dart_init.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/core/Init.h"
+#include "flutter/sky/engine/core/script/dart_init.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/WTF.h"
namespace blink {
diff --git a/sky/engine/wtf/ASCIICType.h b/sky/engine/wtf/ASCIICType.h
index 97451f7..a9487dd 100644
--- a/sky/engine/wtf/ASCIICType.h
+++ b/sky/engine/wtf/ASCIICType.h
@@ -29,7 +29,7 @@
#ifndef SKY_ENGINE_WTF_ASCIICTYPE_H_
#define SKY_ENGINE_WTF_ASCIICTYPE_H_
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
// The behavior of many of the functions in the <ctype.h> header is dependent
// on the current locale. But in the WebKit project, all uses of those functions
diff --git a/sky/engine/wtf/AddressSpaceRandomization.cpp b/sky/engine/wtf/AddressSpaceRandomization.cpp
index 005dd8d..1abc271 100644
--- a/sky/engine/wtf/AddressSpaceRandomization.cpp
+++ b/sky/engine/wtf/AddressSpaceRandomization.cpp
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/wtf/AddressSpaceRandomization.h"
+#include "flutter/sky/engine/wtf/AddressSpaceRandomization.h"
-#include "sky/engine/wtf/PageAllocator.h"
-#include "sky/engine/wtf/SpinLock.h"
+#include "flutter/sky/engine/wtf/PageAllocator.h"
+#include "flutter/sky/engine/wtf/SpinLock.h"
namespace WTF {
diff --git a/sky/engine/wtf/AddressSpaceRandomization.h b/sky/engine/wtf/AddressSpaceRandomization.h
index fb3ea95..313db03 100644
--- a/sky/engine/wtf/AddressSpaceRandomization.h
+++ b/sky/engine/wtf/AddressSpaceRandomization.h
@@ -5,7 +5,7 @@
#ifndef SKY_ENGINE_WTF_ADDRESSSPACERANDOMIZATION_H_
#define SKY_ENGINE_WTF_ADDRESSSPACERANDOMIZATION_H_
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/Alignment.h b/sky/engine/wtf/Alignment.h
index d04a74d..bbbb7cf 100644
--- a/sky/engine/wtf/Alignment.h
+++ b/sky/engine/wtf/Alignment.h
@@ -24,7 +24,7 @@
#include <algorithm>
#include <cstddef>
#include <stdint.h>
-#include "sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
namespace WTF {
diff --git a/sky/engine/wtf/Assertions.cpp b/sky/engine/wtf/Assertions.cpp
index 126dfdd..7a8faef 100644
--- a/sky/engine/wtf/Assertions.cpp
+++ b/sky/engine/wtf/Assertions.cpp
@@ -31,12 +31,12 @@
// we need to place this directive before any data or functions are defined.
#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
-#include "glue/stack_trace.h"
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/glue/stack_trace.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/sky/engine/wtf/Assertions.h b/sky/engine/wtf/Assertions.h
index 220cf01..1fcd608 100644
--- a/sky/engine/wtf/Assertions.h
+++ b/sky/engine/wtf/Assertions.h
@@ -41,9 +41,9 @@
#include <cstddef>
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/OperatingSystem.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
/* Users must test "#if ENABLE(ASSERT)", which helps ensure that code
testing this macro has included this header. */
diff --git a/sky/engine/wtf/Atomics.h b/sky/engine/wtf/Atomics.h
index da69b71..c6cfc7c 100644
--- a/sky/engine/wtf/Atomics.h
+++ b/sky/engine/wtf/Atomics.h
@@ -30,8 +30,8 @@
#ifndef SKY_ENGINE_WTF_ATOMICS_H_
#define SKY_ENGINE_WTF_ATOMICS_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/CPU.h"
#include <stdint.h>
diff --git a/sky/engine/wtf/BUILD.gn b/sky/engine/wtf/BUILD.gn
index 83040c8..c8e84fa 100644
--- a/sky/engine/wtf/BUILD.gn
+++ b/sky/engine/wtf/BUILD.gn
@@ -179,20 +179,20 @@
]
configs += [
- "//sky/engine:config",
- "//sky/engine:non_test_config",
+ "//flutter/sky/engine:config",
+ "//flutter/sky/engine:non_test_config",
]
defines = [ "WTF_IMPLEMENTATION=1" ]
- direct_dependent_configs = [ "//sky/engine:features" ]
+ direct_dependent_configs = [ "//flutter/sky/engine:features" ]
public_deps = [
"//lib/ftl",
]
deps = [
- "//glue",
+ "//flutter/glue",
"//third_party/icu",
]
@@ -234,7 +234,7 @@
"text/WTFStringTest.cpp",
]
- configs += [ "//sky/engine:config" ]
+ configs += [ "//flutter/sky/engine:config" ]
deps = [
":test_support",
@@ -264,8 +264,8 @@
defines = [ "WTF_UNITTEST_HELPERS_IMPLEMENTATION=1" ]
configs += [
- "//sky/engine:config",
- "//sky/engine:non_test_config",
+ "//flutter/sky/engine:config",
+ "//flutter/sky/engine:non_test_config",
]
deps = [
diff --git a/sky/engine/wtf/BitwiseOperations.h b/sky/engine/wtf/BitwiseOperations.h
index d491765..fcd4db3 100644
--- a/sky/engine/wtf/BitwiseOperations.h
+++ b/sky/engine/wtf/BitwiseOperations.h
@@ -37,8 +37,8 @@
// have an operator to do this, but fortunately the various compilers have
// built-ins that map to fast underlying processor instructions.
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
#include <stdint.h>
diff --git a/sky/engine/wtf/ByteOrder.h b/sky/engine/wtf/ByteOrder.h
index 7321e9a..d16485d 100644
--- a/sky/engine/wtf/ByteOrder.h
+++ b/sky/engine/wtf/ByteOrder.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_WTF_BYTEORDER_H_
#define SKY_ENGINE_WTF_BYTEORDER_H_
-#include "sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
#if OS(POSIX)
#include <arpa/inet.h>
diff --git a/sky/engine/wtf/ByteSwap.h b/sky/engine/wtf/ByteSwap.h
index 7a1db47..69cc3b5 100644
--- a/sky/engine/wtf/ByteSwap.h
+++ b/sky/engine/wtf/ByteSwap.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_WTF_BYTESWAP_H_
#define SKY_ENGINE_WTF_BYTESWAP_H_
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
#include <stdint.h>
diff --git a/sky/engine/wtf/CPU.h b/sky/engine/wtf/CPU.h
index cb6d85e..9926724 100644
--- a/sky/engine/wtf/CPU.h
+++ b/sky/engine/wtf/CPU.h
@@ -29,7 +29,7 @@
#ifndef SKY_ENGINE_WTF_CPU_H_
#define SKY_ENGINE_WTF_CPU_H_
-#include "sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
/* CPU() - the target CPU architecture */
#define CPU(WTF_FEATURE) (defined WTF_CPU_##WTF_FEATURE && WTF_CPU_##WTF_FEATURE)
diff --git a/sky/engine/wtf/CheckedArithmetic.h b/sky/engine/wtf/CheckedArithmetic.h
index 870d29a..ee49abb 100644
--- a/sky/engine/wtf/CheckedArithmetic.h
+++ b/sky/engine/wtf/CheckedArithmetic.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_WTF_CHECKEDARITHMETIC_H_
#define SKY_ENGINE_WTF_CHECKEDARITHMETIC_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/EnumClass.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/EnumClass.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
#include <stdint.h>
#include <limits>
diff --git a/sky/engine/wtf/CheckedArithmeticTest.cpp b/sky/engine/wtf/CheckedArithmeticTest.cpp
index 35cdbd0..f20e924 100644
--- a/sky/engine/wtf/CheckedArithmeticTest.cpp
+++ b/sky/engine/wtf/CheckedArithmeticTest.cpp
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/CheckedArithmetic.h"
+#include "flutter/sky/engine/wtf/CheckedArithmetic.h"
namespace {
diff --git a/sky/engine/wtf/DataLog.cpp b/sky/engine/wtf/DataLog.cpp
index e5052a6..9747cc5 100644
--- a/sky/engine/wtf/DataLog.cpp
+++ b/sky/engine/wtf/DataLog.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/DataLog.h"
+#include "flutter/sky/engine/wtf/DataLog.h"
#if OS(POSIX)
#include <pthread.h>
diff --git a/sky/engine/wtf/DataLog.h b/sky/engine/wtf/DataLog.h
index cbd2105..2b9024f 100644
--- a/sky/engine/wtf/DataLog.h
+++ b/sky/engine/wtf/DataLog.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_WTF_DATALOG_H_
#define SKY_ENGINE_WTF_DATALOG_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/FilePrintStream.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/FilePrintStream.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/sky/engine/wtf/DefaultAllocator.cpp b/sky/engine/wtf/DefaultAllocator.cpp
index fedd48a..96d74f8 100644
--- a/sky/engine/wtf/DefaultAllocator.cpp
+++ b/sky/engine/wtf/DefaultAllocator.cpp
@@ -28,9 +28,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
namespace WTF {
diff --git a/sky/engine/wtf/DefaultAllocator.h b/sky/engine/wtf/DefaultAllocator.h
index 6d882f7..9398bfd 100644
--- a/sky/engine/wtf/DefaultAllocator.h
+++ b/sky/engine/wtf/DefaultAllocator.h
@@ -35,10 +35,10 @@
// traced, garbage collected heap. It uses FastMalloc for collections,
// but uses the partition allocator for the backing store of the collections.
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/PartitionAlloc.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/WTF.h"
#include <string.h>
diff --git a/sky/engine/wtf/Deque.h b/sky/engine/wtf/Deque.h
index 4864a36..4999344 100644
--- a/sky/engine/wtf/Deque.h
+++ b/sky/engine/wtf/Deque.h
@@ -34,8 +34,8 @@
// Deque doesn't actually use Vector.
#include <iterator>
-#include "sky/engine/wtf/PassTraits.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/PassTraits.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace WTF {
template<typename T, size_t inlineCapacity, typename Allocator> class DequeIteratorBase;
diff --git a/sky/engine/wtf/DequeTest.cpp b/sky/engine/wtf/DequeTest.cpp
index db70084..cad1ad7 100644
--- a/sky/engine/wtf/DequeTest.cpp
+++ b/sky/engine/wtf/DequeTest.cpp
@@ -24,12 +24,12 @@
*/
-#include "sky/engine/wtf/Deque.h"
+#include "flutter/sky/engine/wtf/Deque.h"
#include <gtest/gtest.h>
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace {
diff --git a/sky/engine/wtf/DoubleBufferedDeque.h b/sky/engine/wtf/DoubleBufferedDeque.h
index be98b0a..637c6c5 100644
--- a/sky/engine/wtf/DoubleBufferedDeque.h
+++ b/sky/engine/wtf/DoubleBufferedDeque.h
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_WTF_DOUBLEBUFFEREDDEQUE_H_
#define SKY_ENGINE_WTF_DOUBLEBUFFEREDDEQUE_H_
-#include "sky/engine/wtf/Deque.h"
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Deque.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace WTF {
diff --git a/sky/engine/wtf/DoubleBufferedDequeTest.cpp b/sky/engine/wtf/DoubleBufferedDequeTest.cpp
index c9034d3..ea6f4b5 100644
--- a/sky/engine/wtf/DoubleBufferedDequeTest.cpp
+++ b/sky/engine/wtf/DoubleBufferedDequeTest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/wtf/DoubleBufferedDeque.h"
+#include "flutter/sky/engine/wtf/DoubleBufferedDeque.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/wtf/DynamicAnnotations.cpp b/sky/engine/wtf/DynamicAnnotations.cpp
index 5b8dd6d..f7574ed 100644
--- a/sky/engine/wtf/DynamicAnnotations.cpp
+++ b/sky/engine/wtf/DynamicAnnotations.cpp
@@ -25,7 +25,7 @@
*/
-#include "sky/engine/wtf/DynamicAnnotations.h"
+#include "flutter/sky/engine/wtf/DynamicAnnotations.h"
#if USE(DYNAMIC_ANNOTATIONS) && !USE(DYNAMIC_ANNOTATIONS_NOIMPL)
diff --git a/sky/engine/wtf/DynamicAnnotations.h b/sky/engine/wtf/DynamicAnnotations.h
index df38ef5..9dc76c2 100644
--- a/sky/engine/wtf/DynamicAnnotations.h
+++ b/sky/engine/wtf/DynamicAnnotations.h
@@ -48,8 +48,8 @@
* See http://code.google.com/p/data-race-test/wiki/DynamicAnnotations for more information.
*/
-#include "sky/engine/wtf/OperatingSystem.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
#if USE(DYNAMIC_ANNOTATIONS)
/* Tell data race detector that we're not interested in reports on the given address range. */
diff --git a/sky/engine/wtf/EnumClass.h b/sky/engine/wtf/EnumClass.h
index 7b86da2..0859ac1 100644
--- a/sky/engine/wtf/EnumClass.h
+++ b/sky/engine/wtf/EnumClass.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_ENUMCLASS_H_
#define SKY_ENGINE_WTF_ENUMCLASS_H_
-#include "sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
namespace WTF {
diff --git a/sky/engine/wtf/FastAllocBase.h b/sky/engine/wtf/FastAllocBase.h
index a453daf..e475e07 100644
--- a/sky/engine/wtf/FastAllocBase.h
+++ b/sky/engine/wtf/FastAllocBase.h
@@ -47,9 +47,9 @@
// };
//
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/FastMalloc.h"
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/FastMalloc.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
#define WTF_MAKE_FAST_ALLOCATED \
public: \
diff --git a/sky/engine/wtf/FastMalloc.cpp b/sky/engine/wtf/FastMalloc.cpp
index 63a4a57..971005b 100644
--- a/sky/engine/wtf/FastMalloc.cpp
+++ b/sky/engine/wtf/FastMalloc.cpp
@@ -28,11 +28,11 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "sky/engine/wtf/FastMalloc.h"
+#include "flutter/sky/engine/wtf/FastMalloc.h"
#include <string.h>
-#include "sky/engine/wtf/PartitionAlloc.h"
-#include "sky/engine/wtf/SpinLock.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/SpinLock.h"
namespace WTF {
diff --git a/sky/engine/wtf/FastMalloc.h b/sky/engine/wtf/FastMalloc.h
index 1ced0db..c870540 100644
--- a/sky/engine/wtf/FastMalloc.h
+++ b/sky/engine/wtf/FastMalloc.h
@@ -23,7 +23,7 @@
#include <cstddef>
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/FilePrintStream.cpp b/sky/engine/wtf/FilePrintStream.cpp
index f67db99..a788ced 100644
--- a/sky/engine/wtf/FilePrintStream.cpp
+++ b/sky/engine/wtf/FilePrintStream.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/FilePrintStream.h"
+#include "flutter/sky/engine/wtf/FilePrintStream.h"
namespace WTF {
diff --git a/sky/engine/wtf/FilePrintStream.h b/sky/engine/wtf/FilePrintStream.h
index f5aece7..bf30457 100644
--- a/sky/engine/wtf/FilePrintStream.h
+++ b/sky/engine/wtf/FilePrintStream.h
@@ -27,8 +27,8 @@
#define SKY_ENGINE_WTF_FILEPRINTSTREAM_H_
#include <stdio.h>
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/PrintStream.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/PrintStream.h"
namespace WTF {
diff --git a/sky/engine/wtf/HashCountedSet.h b/sky/engine/wtf/HashCountedSet.h
index 9a83094..e9d6d1d 100644
--- a/sky/engine/wtf/HashCountedSet.h
+++ b/sky/engine/wtf/HashCountedSet.h
@@ -21,9 +21,9 @@
#ifndef SKY_ENGINE_WTF_HASHCOUNTEDSET_H_
#define SKY_ENGINE_WTF_HASHCOUNTEDSET_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace WTF {
diff --git a/sky/engine/wtf/HashFunctions.h b/sky/engine/wtf/HashFunctions.h
index 5b5243c..0f20885 100644
--- a/sky/engine/wtf/HashFunctions.h
+++ b/sky/engine/wtf/HashFunctions.h
@@ -22,9 +22,9 @@
#define SKY_ENGINE_WTF_HASHFUNCTIONS_H_
#include <stdint.h>
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
namespace WTF {
diff --git a/sky/engine/wtf/HashMap.h b/sky/engine/wtf/HashMap.h
index b99b725..f739513 100644
--- a/sky/engine/wtf/HashMap.h
+++ b/sky/engine/wtf/HashMap.h
@@ -21,8 +21,8 @@
#ifndef SKY_ENGINE_WTF_HASHMAP_H_
#define SKY_ENGINE_WTF_HASHMAP_H_
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/HashTable.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/HashTable.h"
namespace WTF {
diff --git a/sky/engine/wtf/HashMapTest.cpp b/sky/engine/wtf/HashMapTest.cpp
index 64b483f..d2965d7 100644
--- a/sky/engine/wtf/HashMapTest.cpp
+++ b/sky/engine/wtf/HashMapTest.cpp
@@ -25,11 +25,11 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace {
diff --git a/sky/engine/wtf/HashSet.h b/sky/engine/wtf/HashSet.h
index 8dd91fa..a2c01b2 100644
--- a/sky/engine/wtf/HashSet.h
+++ b/sky/engine/wtf/HashSet.h
@@ -21,8 +21,8 @@
#ifndef SKY_ENGINE_WTF_HASHSET_H_
#define SKY_ENGINE_WTF_HASHSET_H_
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/HashTable.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/HashTable.h"
namespace WTF {
diff --git a/sky/engine/wtf/HashSetTest.cpp b/sky/engine/wtf/HashSetTest.cpp
index cd38c28..b527cc5 100644
--- a/sky/engine/wtf/HashSetTest.cpp
+++ b/sky/engine/wtf/HashSetTest.cpp
@@ -25,10 +25,10 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
namespace {
diff --git a/sky/engine/wtf/HashTable.cpp b/sky/engine/wtf/HashTable.cpp
index 99f7acb..d4bffc4 100644
--- a/sky/engine/wtf/HashTable.cpp
+++ b/sky/engine/wtf/HashTable.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/wtf/DataLog.h"
-#include "sky/engine/wtf/HashTable.h"
+#include "flutter/sky/engine/wtf/DataLog.h"
+#include "flutter/sky/engine/wtf/HashTable.h"
namespace WTF {
diff --git a/sky/engine/wtf/HashTable.h b/sky/engine/wtf/HashTable.h
index 945017e..5e06584 100644
--- a/sky/engine/wtf/HashTable.h
+++ b/sky/engine/wtf/HashTable.h
@@ -20,17 +20,17 @@
#ifndef SKY_ENGINE_WTF_HASHTABLE_H_
#define SKY_ENGINE_WTF_HASHTABLE_H_
-#include "sky/engine/wtf/Alignment.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/HashTraits.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/Alignment.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/HashTraits.h"
+#include "flutter/sky/engine/wtf/WTF.h"
#define DUMP_HASHTABLE_STATS 0
#define DUMP_HASHTABLE_STATS_PER_TABLE 0
#if DUMP_HASHTABLE_STATS_PER_TABLE
-#include "sky/engine/wtf/DataLog.h"
+#include "flutter/sky/engine/wtf/DataLog.h"
#endif
#if DUMP_HASHTABLE_STATS
@@ -1249,6 +1249,6 @@
} // namespace WTF
-#include "sky/engine/wtf/HashIterators.h"
+#include "flutter/sky/engine/wtf/HashIterators.h"
#endif // SKY_ENGINE_WTF_HASHTABLE_H_
diff --git a/sky/engine/wtf/HashTraits.h b/sky/engine/wtf/HashTraits.h
index f498b04..34f1894 100644
--- a/sky/engine/wtf/HashTraits.h
+++ b/sky/engine/wtf/HashTraits.h
@@ -24,10 +24,10 @@
#include <string.h> // For memset.
#include <limits>
#include <utility>
-#include "sky/engine/wtf/HashFunctions.h"
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/wtf/HashFunctions.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
namespace WTF {
diff --git a/sky/engine/wtf/HexNumber.h b/sky/engine/wtf/HexNumber.h
index bbc0a4f..bc63cdc 100644
--- a/sky/engine/wtf/HexNumber.h
+++ b/sky/engine/wtf/HexNumber.h
@@ -20,7 +20,7 @@
#ifndef SKY_ENGINE_WTF_HEXNUMBER_H_
#define SKY_ENGINE_WTF_HEXNUMBER_H_
-#include "sky/engine/wtf/text/StringConcatenate.h"
+#include "flutter/sky/engine/wtf/text/StringConcatenate.h"
namespace WTF {
diff --git a/sky/engine/wtf/InstanceCounter.cpp b/sky/engine/wtf/InstanceCounter.cpp
index a67d9f6..29f3a92 100644
--- a/sky/engine/wtf/InstanceCounter.cpp
+++ b/sky/engine/wtf/InstanceCounter.cpp
@@ -23,14 +23,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/InstanceCounter.h"
+#include "flutter/sky/engine/wtf/InstanceCounter.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/StringHash.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/InstanceCounter.h b/sky/engine/wtf/InstanceCounter.h
index 06481f1..1d4fe4c 100644
--- a/sky/engine/wtf/InstanceCounter.h
+++ b/sky/engine/wtf/InstanceCounter.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_WTF_INSTANCECOUNTER_H_
#define SKY_ENGINE_WTF_INSTANCECOUNTER_H_
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/OperatingSystem.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/LeakAnnotations.h b/sky/engine/wtf/LeakAnnotations.h
index 794e9f7..52ba0b6 100644
--- a/sky/engine/wtf/LeakAnnotations.h
+++ b/sky/engine/wtf/LeakAnnotations.h
@@ -47,7 +47,7 @@
// annotated with ANNOTATE_LEAKING_OBJECT_PTR is later deleted (but
// LeakSanitizer won't).
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace WTF {
diff --git a/sky/engine/wtf/LinkedHashSet.h b/sky/engine/wtf/LinkedHashSet.h
index e08d15b..dae2fc0 100644
--- a/sky/engine/wtf/LinkedHashSet.h
+++ b/sky/engine/wtf/LinkedHashSet.h
@@ -22,10 +22,10 @@
#ifndef SKY_ENGINE_WTF_LINKEDHASHSET_H_
#define SKY_ENGINE_WTF_LINKEDHASHSET_H_
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace WTF {
diff --git a/sky/engine/wtf/LinkedStack.h b/sky/engine/wtf/LinkedStack.h
index cc764f1..a631f75 100644
--- a/sky/engine/wtf/LinkedStack.h
+++ b/sky/engine/wtf/LinkedStack.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_WTF_LINKEDSTACK_H_
#define SKY_ENGINE_WTF_LINKEDSTACK_H_
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
namespace WTF {
diff --git a/sky/engine/wtf/ListHashSet.h b/sky/engine/wtf/ListHashSet.h
index 39bbfc9..40eaf5c 100644
--- a/sky/engine/wtf/ListHashSet.h
+++ b/sky/engine/wtf/ListHashSet.h
@@ -22,10 +22,10 @@
#ifndef SKY_ENGINE_WTF_LISTHASHSET_H_
#define SKY_ENGINE_WTF_LISTHASHSET_H_
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace WTF {
diff --git a/sky/engine/wtf/ListHashSetTest.cpp b/sky/engine/wtf/ListHashSetTest.cpp
index c37f04c..351b729 100644
--- a/sky/engine/wtf/ListHashSetTest.cpp
+++ b/sky/engine/wtf/ListHashSetTest.cpp
@@ -25,11 +25,11 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/LinkedHashSet.h"
-#include "sky/engine/wtf/ListHashSet.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/LinkedHashSet.h"
+#include "flutter/sky/engine/wtf/ListHashSet.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
namespace {
diff --git a/sky/engine/wtf/Locker.h b/sky/engine/wtf/Locker.h
index 9ddb17e..be48b68 100644
--- a/sky/engine/wtf/Locker.h
+++ b/sky/engine/wtf/Locker.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_LOCKER_H_
#define SKY_ENGINE_WTF_LOCKER_H_
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace WTF {
diff --git a/sky/engine/wtf/MainThread.cpp b/sky/engine/wtf/MainThread.cpp
index 587e8e5..5f00faf 100644
--- a/sky/engine/wtf/MainThread.cpp
+++ b/sky/engine/wtf/MainThread.cpp
@@ -28,11 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/Threading.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace WTF {
diff --git a/sky/engine/wtf/MainThread.h b/sky/engine/wtf/MainThread.h
index 50ca128..4a38c5b 100644
--- a/sky/engine/wtf/MainThread.h
+++ b/sky/engine/wtf/MainThread.h
@@ -32,7 +32,7 @@
#include <stdint.h>
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/MathExtras.h b/sky/engine/wtf/MathExtras.h
index 6faf173..d0eb011 100644
--- a/sky/engine/wtf/MathExtras.h
+++ b/sky/engine/wtf/MathExtras.h
@@ -30,8 +30,8 @@
#include <cstddef>
#include <limits>
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
const double piDouble = M_PI;
const float piFloat = static_cast<float>(M_PI);
diff --git a/sky/engine/wtf/MathExtrasTest.cpp b/sky/engine/wtf/MathExtrasTest.cpp
index e7efcef..bdcd621 100644
--- a/sky/engine/wtf/MathExtrasTest.cpp
+++ b/sky/engine/wtf/MathExtrasTest.cpp
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
namespace {
diff --git a/sky/engine/wtf/Noncopyable.h b/sky/engine/wtf/Noncopyable.h
index 550f996..0158f3d 100644
--- a/sky/engine/wtf/Noncopyable.h
+++ b/sky/engine/wtf/Noncopyable.h
@@ -21,7 +21,7 @@
#ifndef SKY_ENGINE_WTF_NONCOPYABLE_H_
#define SKY_ENGINE_WTF_NONCOPYABLE_H_
-#include "sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
#define WTF_MAKE_NONCOPYABLE(ClassName) \
private: \
diff --git a/sky/engine/wtf/OwnPtr.h b/sky/engine/wtf/OwnPtr.h
index 8fe072a..9aaa40f 100644
--- a/sky/engine/wtf/OwnPtr.h
+++ b/sky/engine/wtf/OwnPtr.h
@@ -23,10 +23,10 @@
#define SKY_ENGINE_WTF_OWNPTR_H_
#include <algorithm>
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/NullPtr.h"
-#include "sky/engine/wtf/OwnPtrCommon.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/NullPtr.h"
+#include "flutter/sky/engine/wtf/OwnPtrCommon.h"
namespace WTF {
diff --git a/sky/engine/wtf/OwnPtrCommon.h b/sky/engine/wtf/OwnPtrCommon.h
index 871c79a..c075bab 100644
--- a/sky/engine/wtf/OwnPtrCommon.h
+++ b/sky/engine/wtf/OwnPtrCommon.h
@@ -29,8 +29,8 @@
#ifndef SKY_ENGINE_WTF_OWNPTRCOMMON_H_
#define SKY_ENGINE_WTF_OWNPTRCOMMON_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
namespace WTF {
diff --git a/sky/engine/wtf/PageAllocator.cpp b/sky/engine/wtf/PageAllocator.cpp
index 18ffdec..41d7f4b 100644
--- a/sky/engine/wtf/PageAllocator.cpp
+++ b/sky/engine/wtf/PageAllocator.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/PageAllocator.h"
+#include "flutter/sky/engine/wtf/PageAllocator.h"
-#include "sky/engine/wtf/AddressSpaceRandomization.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/AddressSpaceRandomization.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
#include <limits.h>
diff --git a/sky/engine/wtf/PageAllocator.h b/sky/engine/wtf/PageAllocator.h
index de0d266..69396bc 100644
--- a/sky/engine/wtf/PageAllocator.h
+++ b/sky/engine/wtf/PageAllocator.h
@@ -32,9 +32,9 @@
#define SKY_ENGINE_WTF_PAGEALLOCATOR_H_
#include <stdint.h>
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/PartitionAlloc.cpp b/sky/engine/wtf/PartitionAlloc.cpp
index 7d6c8d3..d531a0f 100644
--- a/sky/engine/wtf/PartitionAlloc.cpp
+++ b/sky/engine/wtf/PartitionAlloc.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
#include <string.h>
diff --git a/sky/engine/wtf/PartitionAlloc.h b/sky/engine/wtf/PartitionAlloc.h
index d17b2f4..ff37e24 100644
--- a/sky/engine/wtf/PartitionAlloc.h
+++ b/sky/engine/wtf/PartitionAlloc.h
@@ -96,12 +96,12 @@
// - Better checking for wild pointers in free().
// - Better freelist masking function to guarantee fault on 32-bit.
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/BitwiseOperations.h"
-#include "sky/engine/wtf/ByteSwap.h"
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/PageAllocator.h"
-#include "sky/engine/wtf/SpinLock.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/BitwiseOperations.h"
+#include "flutter/sky/engine/wtf/ByteSwap.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/PageAllocator.h"
+#include "flutter/sky/engine/wtf/SpinLock.h"
#include <limits.h>
diff --git a/sky/engine/wtf/PartitionAllocTest.cpp b/sky/engine/wtf/PartitionAllocTest.cpp
index 4ef0f6c..80b6975 100644
--- a/sky/engine/wtf/PartitionAllocTest.cpp
+++ b/sky/engine/wtf/PartitionAllocTest.cpp
@@ -28,14 +28,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
#include <gtest/gtest.h>
#include <stdlib.h>
#include <string.h>
-#include "sky/engine/wtf/BitwiseOperations.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/BitwiseOperations.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
#if OS(POSIX)
#include <sys/mman.h>
diff --git a/sky/engine/wtf/PassOwnPtr.h b/sky/engine/wtf/PassOwnPtr.h
index 6a85838..59c14da 100644
--- a/sky/engine/wtf/PassOwnPtr.h
+++ b/sky/engine/wtf/PassOwnPtr.h
@@ -27,8 +27,8 @@
#ifndef SKY_ENGINE_WTF_PASSOWNPTR_H_
#define SKY_ENGINE_WTF_PASSOWNPTR_H_
-#include "sky/engine/wtf/NullPtr.h"
-#include "sky/engine/wtf/OwnPtrCommon.h"
+#include "flutter/sky/engine/wtf/NullPtr.h"
+#include "flutter/sky/engine/wtf/OwnPtrCommon.h"
namespace WTF {
diff --git a/sky/engine/wtf/PassRefPtr.h b/sky/engine/wtf/PassRefPtr.h
index 2d8c8b9..d90a94b 100644
--- a/sky/engine/wtf/PassRefPtr.h
+++ b/sky/engine/wtf/PassRefPtr.h
@@ -21,11 +21,11 @@
#ifndef SKY_ENGINE_WTF_PASSREFPTR_H_
#define SKY_ENGINE_WTF_PASSREFPTR_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/NullPtr.h"
-#include "sky/engine/wtf/RawPtr.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/NullPtr.h"
+#include "flutter/sky/engine/wtf/RawPtr.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
namespace WTF {
diff --git a/sky/engine/wtf/PassTraits.h b/sky/engine/wtf/PassTraits.h
index bfca45d..278098d 100644
--- a/sky/engine/wtf/PassTraits.h
+++ b/sky/engine/wtf/PassTraits.h
@@ -29,8 +29,8 @@
#ifndef SKY_ENGINE_WTF_PASSTRAITS_H_
#define SKY_ENGINE_WTF_PASSTRAITS_H_
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
// The PassTraits template exists to help optimize (or make possible) use
// of WTF data structures with WTF smart pointers that have a Pass
diff --git a/sky/engine/wtf/PrintStream.cpp b/sky/engine/wtf/PrintStream.cpp
index 461fdb7..8520a87 100644
--- a/sky/engine/wtf/PrintStream.cpp
+++ b/sky/engine/wtf/PrintStream.cpp
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/PrintStream.h"
+#include "flutter/sky/engine/wtf/PrintStream.h"
#include <stdio.h>
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/PrintStream.h b/sky/engine/wtf/PrintStream.h
index d624df1..5566054 100644
--- a/sky/engine/wtf/PrintStream.h
+++ b/sky/engine/wtf/PrintStream.h
@@ -27,10 +27,10 @@
#define SKY_ENGINE_WTF_PRINTSTREAM_H_
#include <stdarg.h>
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/RawPtr.h b/sky/engine/wtf/RawPtr.h
index fac1c00..6290656 100644
--- a/sky/engine/wtf/RawPtr.h
+++ b/sky/engine/wtf/RawPtr.h
@@ -34,7 +34,7 @@
#include <stdint.h>
#include <algorithm>
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
// RawPtr is a simple wrapper for a raw pointer that provides the
// interface (get, clear) of other pointer types such as RefPtr,
diff --git a/sky/engine/wtf/RefCounted.h b/sky/engine/wtf/RefCounted.h
index 7a121e2..99baa14 100644
--- a/sky/engine/wtf/RefCounted.h
+++ b/sky/engine/wtf/RefCounted.h
@@ -21,15 +21,15 @@
#ifndef SKY_ENGINE_WTF_REFCOUNTED_H_
#define SKY_ENGINE_WTF_REFCOUNTED_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/InstanceCounter.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/InstanceCounter.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
#if ENABLE(ASSERT)
#define CHECK_REF_COUNTED_LIFECYCLE 1
-#include "sky/engine/wtf/ThreadRestrictionVerifier.h"
+#include "flutter/sky/engine/wtf/ThreadRestrictionVerifier.h"
#else
#define CHECK_REF_COUNTED_LIFECYCLE 0
#endif
diff --git a/sky/engine/wtf/RefCountedLeakCounter.cpp b/sky/engine/wtf/RefCountedLeakCounter.cpp
index 717d3a7..ef16a34 100644
--- a/sky/engine/wtf/RefCountedLeakCounter.cpp
+++ b/sky/engine/wtf/RefCountedLeakCounter.cpp
@@ -18,12 +18,12 @@
*
*/
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/RefCountedLeakCounter.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/RefCountedLeakCounter.h"
#if ENABLE(ASSERT)
-#include "sky/engine/wtf/Atomics.h"
-#include "sky/engine/wtf/HashCountedSet.h"
+#include "flutter/sky/engine/wtf/Atomics.h"
+#include "flutter/sky/engine/wtf/HashCountedSet.h"
#endif
namespace WTF {
diff --git a/sky/engine/wtf/RefCountedLeakCounter.h b/sky/engine/wtf/RefCountedLeakCounter.h
index 89b9784..741e402 100644
--- a/sky/engine/wtf/RefCountedLeakCounter.h
+++ b/sky/engine/wtf/RefCountedLeakCounter.h
@@ -21,8 +21,8 @@
#ifndef SKY_ENGINE_WTF_REFCOUNTEDLEAKCOUNTER_H_
#define SKY_ENGINE_WTF_REFCOUNTEDLEAKCOUNTER_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/RefPtr.h b/sky/engine/wtf/RefPtr.h
index af5ad64..13bc400 100644
--- a/sky/engine/wtf/RefPtr.h
+++ b/sky/engine/wtf/RefPtr.h
@@ -24,9 +24,9 @@
#define SKY_ENGINE_WTF_REFPTR_H_
#include <algorithm>
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RawPtr.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RawPtr.h"
namespace WTF {
diff --git a/sky/engine/wtf/RefPtrTest.cpp b/sky/engine/wtf/RefPtrTest.cpp
index 6d890e9..336a788 100644
--- a/sky/engine/wtf/RefPtrTest.cpp
+++ b/sky/engine/wtf/RefPtrTest.cpp
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
#include <gtest/gtest.h>
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
namespace {
diff --git a/sky/engine/wtf/RefVector.h b/sky/engine/wtf/RefVector.h
index af70d28..2e10c97 100644
--- a/sky/engine/wtf/RefVector.h
+++ b/sky/engine/wtf/RefVector.h
@@ -5,9 +5,9 @@
#ifndef SKY_ENGINE_WTF_REFVECTOR_H_
#define SKY_ENGINE_WTF_REFVECTOR_H_
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace blink {
diff --git a/sky/engine/wtf/SaturatedArithmetic.h b/sky/engine/wtf/SaturatedArithmetic.h
index a3378e7..4079613 100644
--- a/sky/engine/wtf/SaturatedArithmetic.h
+++ b/sky/engine/wtf/SaturatedArithmetic.h
@@ -33,13 +33,13 @@
#include <stdint.h>
#include <limits>
-#include "sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/CPU.h"
#if CPU(ARM) && COMPILER(GCC) && __OPTIMIZE__
// If we're building ARM on GCC we replace the C++ versions with some
// native ARM assembly for speed.
-#include "sky/engine/wtf/asm/SaturatedArithmeticARM.h"
+#include "flutter/sky/engine/wtf/asm/SaturatedArithmeticARM.h"
#else
diff --git a/sky/engine/wtf/SaturatedArithmeticTest.cpp b/sky/engine/wtf/SaturatedArithmeticTest.cpp
index bfbc957..61de2e5 100644
--- a/sky/engine/wtf/SaturatedArithmeticTest.cpp
+++ b/sky/engine/wtf/SaturatedArithmeticTest.cpp
@@ -31,7 +31,7 @@
#include <gtest/gtest.h>
#include <limits.h>
-#include "sky/engine/wtf/SaturatedArithmetic.h"
+#include "flutter/sky/engine/wtf/SaturatedArithmetic.h"
namespace {
diff --git a/sky/engine/wtf/SizeLimits.cpp b/sky/engine/wtf/SizeLimits.cpp
index 34be6dd..031457e 100644
--- a/sky/engine/wtf/SizeLimits.cpp
+++ b/sky/engine/wtf/SizeLimits.cpp
@@ -29,15 +29,15 @@
*/
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/ThreadRestrictionVerifier.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/ThreadRestrictionVerifier.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/SpinLock.h b/sky/engine/wtf/SpinLock.h
index 3721f54..e3305d1 100644
--- a/sky/engine/wtf/SpinLock.h
+++ b/sky/engine/wtf/SpinLock.h
@@ -36,7 +36,7 @@
// the standard CPU primitive of atomic increment and decrement of an int at
// a given memory address.
-#include "sky/engine/wtf/Atomics.h"
+#include "flutter/sky/engine/wtf/Atomics.h"
namespace WTF {
diff --git a/sky/engine/wtf/StdLibExtras.h b/sky/engine/wtf/StdLibExtras.h
index b880a94..e0d4d4f 100644
--- a/sky/engine/wtf/StdLibExtras.h
+++ b/sky/engine/wtf/StdLibExtras.h
@@ -26,9 +26,9 @@
#ifndef SKY_ENGINE_WTF_STDLIBEXTRAS_H_
#define SKY_ENGINE_WTF_STDLIBEXTRAS_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/CheckedArithmetic.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/CheckedArithmetic.h"
// Use this to declare and define a static local variable (static T;) so that
// it is leaked so that its destructors are not called at exit.
diff --git a/sky/engine/wtf/StreamBuffer.h b/sky/engine/wtf/StreamBuffer.h
index d34064c..f719dca 100644
--- a/sky/engine/wtf/StreamBuffer.h
+++ b/sky/engine/wtf/StreamBuffer.h
@@ -31,8 +31,8 @@
#ifndef SKY_ENGINE_WTF_STREAMBUFFER_H_
#define SKY_ENGINE_WTF_STREAMBUFFER_H_
-#include "sky/engine/wtf/Deque.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/Deque.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
namespace WTF {
diff --git a/sky/engine/wtf/StringExtras.h b/sky/engine/wtf/StringExtras.h
index 8f1fb3e..ea511b2 100644
--- a/sky/engine/wtf/StringExtras.h
+++ b/sky/engine/wtf/StringExtras.h
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <string.h>
#include <strings.h>
-#include "sky/engine/wtf/OperatingSystem.h"
+#include "flutter/sky/engine/wtf/OperatingSystem.h"
#if !HAVE(STRNSTR)
diff --git a/sky/engine/wtf/StringExtrasTest.cpp b/sky/engine/wtf/StringExtrasTest.cpp
index 05f6126..5634b12 100644
--- a/sky/engine/wtf/StringExtrasTest.cpp
+++ b/sky/engine/wtf/StringExtrasTest.cpp
@@ -26,9 +26,9 @@
#include <gtest/gtest.h>
#include <limits>
-#include "sky/engine/wtf/StringExtras.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace {
diff --git a/sky/engine/wtf/StringHasher.h b/sky/engine/wtf/StringHasher.h
index 85625b7..bd984c8 100644
--- a/sky/engine/wtf/StringHasher.h
+++ b/sky/engine/wtf/StringHasher.h
@@ -22,7 +22,7 @@
#ifndef SKY_ENGINE_WTF_STRINGHASHER_H_
#define SKY_ENGINE_WTF_STRINGHASHER_H_
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/StringHasherTest.cpp b/sky/engine/wtf/StringHasherTest.cpp
index aedf4eb..715d8b4 100644
--- a/sky/engine/wtf/StringHasherTest.cpp
+++ b/sky/engine/wtf/StringHasherTest.cpp
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/StringHasher.h"
+#include "flutter/sky/engine/wtf/StringHasher.h"
namespace {
diff --git a/sky/engine/wtf/TemporaryChange.h b/sky/engine/wtf/TemporaryChange.h
index ac5f643..91c98ae 100644
--- a/sky/engine/wtf/TemporaryChange.h
+++ b/sky/engine/wtf/TemporaryChange.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_TEMPORARYCHANGE_H_
#define SKY_ENGINE_WTF_TEMPORARYCHANGE_H_
-#include "sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
namespace WTF {
diff --git a/sky/engine/wtf/TemporaryChangeTest.cpp b/sky/engine/wtf/TemporaryChangeTest.cpp
index ea04dce..623823d 100644
--- a/sky/engine/wtf/TemporaryChangeTest.cpp
+++ b/sky/engine/wtf/TemporaryChangeTest.cpp
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/TemporaryChange.h"
+#include "flutter/sky/engine/wtf/TemporaryChange.h"
namespace {
diff --git a/sky/engine/wtf/ThreadIdentifierDataPthreads.cpp b/sky/engine/wtf/ThreadIdentifierDataPthreads.cpp
index 91b9b93..6e5b67e 100644
--- a/sky/engine/wtf/ThreadIdentifierDataPthreads.cpp
+++ b/sky/engine/wtf/ThreadIdentifierDataPthreads.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/ThreadIdentifierDataPthreads.h"
+#include "flutter/sky/engine/wtf/ThreadIdentifierDataPthreads.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/WTF.h"
#include <limits.h>
diff --git a/sky/engine/wtf/ThreadIdentifierDataPthreads.h b/sky/engine/wtf/ThreadIdentifierDataPthreads.h
index 4f87a1c..2b66994 100644
--- a/sky/engine/wtf/ThreadIdentifierDataPthreads.h
+++ b/sky/engine/wtf/ThreadIdentifierDataPthreads.h
@@ -32,8 +32,8 @@
#define SKY_ENGINE_WTF_THREADIDENTIFIERDATAPTHREADS_H_
#include <pthread.h>
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/Threading.h"
namespace WTF {
diff --git a/sky/engine/wtf/ThreadRestrictionVerifier.h b/sky/engine/wtf/ThreadRestrictionVerifier.h
index 991dc52..c169a82 100644
--- a/sky/engine/wtf/ThreadRestrictionVerifier.h
+++ b/sky/engine/wtf/ThreadRestrictionVerifier.h
@@ -31,11 +31,11 @@
#ifndef SKY_ENGINE_WTF_THREADRESTRICTIONVERIFIER_H_
#define SKY_ENGINE_WTF_THREADRESTRICTIONVERIFIER_H_
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
#if ENABLE(ASSERT)
-#include "sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/Threading.h"
namespace WTF {
diff --git a/sky/engine/wtf/ThreadSafeRefCounted.h b/sky/engine/wtf/ThreadSafeRefCounted.h
index 63d88fd..a7dfd28 100644
--- a/sky/engine/wtf/ThreadSafeRefCounted.h
+++ b/sky/engine/wtf/ThreadSafeRefCounted.h
@@ -30,11 +30,11 @@
#ifndef SKY_ENGINE_WTF_THREADSAFEREFCOUNTED_H_
#define SKY_ENGINE_WTF_THREADSAFEREFCOUNTED_H_
-#include "sky/engine/wtf/Atomics.h"
-#include "sky/engine/wtf/DynamicAnnotations.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Atomics.h"
+#include "flutter/sky/engine/wtf/DynamicAnnotations.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/ThreadSpecific.h b/sky/engine/wtf/ThreadSpecific.h
index 13404ee..5b835c3 100644
--- a/sky/engine/wtf/ThreadSpecific.h
+++ b/sky/engine/wtf/ThreadSpecific.h
@@ -42,11 +42,11 @@
#ifndef SKY_ENGINE_WTF_THREADSPECIFIC_H_
#define SKY_ENGINE_WTF_THREADSPECIFIC_H_
-#include "sky/engine/wtf/FastMalloc.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/WTF.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/FastMalloc.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
#if USE(PTHREADS)
#include <pthread.h>
diff --git a/sky/engine/wtf/Threading.h b/sky/engine/wtf/Threading.h
index fded5a1..78bfaf2 100644
--- a/sky/engine/wtf/Threading.h
+++ b/sky/engine/wtf/Threading.h
@@ -31,7 +31,7 @@
#define SKY_ENGINE_WTF_THREADING_H_
#include <stdint.h>
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
// For portability, we do not use thread-safe statics natively supported by some compilers (e.g. gcc).
#define AtomicallyInitializedStatic(T, name) \
diff --git a/sky/engine/wtf/ThreadingPrimitives.h b/sky/engine/wtf/ThreadingPrimitives.h
index 82b8a60..162d504 100644
--- a/sky/engine/wtf/ThreadingPrimitives.h
+++ b/sky/engine/wtf/ThreadingPrimitives.h
@@ -31,11 +31,11 @@
#ifndef SKY_ENGINE_WTF_THREADINGPRIMITIVES_H_
#define SKY_ENGINE_WTF_THREADINGPRIMITIVES_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Locker.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Locker.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
#if USE(PTHREADS)
#include <pthread.h>
diff --git a/sky/engine/wtf/ThreadingPthreads.cpp b/sky/engine/wtf/ThreadingPthreads.cpp
index f94fbc9..bd33538 100644
--- a/sky/engine/wtf/ThreadingPthreads.cpp
+++ b/sky/engine/wtf/ThreadingPthreads.cpp
@@ -28,18 +28,18 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/Threading.h"
#include <errno.h>
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/ThreadIdentifierDataPthreads.h"
-#include "sky/engine/wtf/ThreadSpecific.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
-#include "sky/engine/wtf/WTFThreadData.h"
-#include "sky/engine/wtf/dtoa.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/ThreadIdentifierDataPthreads.h"
+#include "flutter/sky/engine/wtf/ThreadSpecific.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/WTFThreadData.h"
+#include "flutter/sky/engine/wtf/dtoa.h"
#include "wtf/dtoa/cached-powers.h"
#include <limits.h>
diff --git a/sky/engine/wtf/TypeTraits.cpp b/sky/engine/wtf/TypeTraits.cpp
index 177771a..f56f2cc 100644
--- a/sky/engine/wtf/TypeTraits.cpp
+++ b/sky/engine/wtf/TypeTraits.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
namespace WTF {
diff --git a/sky/engine/wtf/Vector.h b/sky/engine/wtf/Vector.h
index b26e943..3c3651e 100644
--- a/sky/engine/wtf/Vector.h
+++ b/sky/engine/wtf/Vector.h
@@ -23,15 +23,15 @@
#include <string.h>
#include <utility>
-#include "sky/engine/wtf/Alignment.h"
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/NotFound.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/VectorTraits.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/Alignment.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/NotFound.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/VectorTraits.h"
+#include "flutter/sky/engine/wtf/WTF.h"
namespace WTF {
diff --git a/sky/engine/wtf/VectorTest.cpp b/sky/engine/wtf/VectorTest.cpp
index 4e24fa5..550aed6 100644
--- a/sky/engine/wtf/VectorTest.cpp
+++ b/sky/engine/wtf/VectorTest.cpp
@@ -25,11 +25,11 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace {
diff --git a/sky/engine/wtf/VectorTraits.h b/sky/engine/wtf/VectorTraits.h
index 0d794a3..9e1bc6a 100644
--- a/sky/engine/wtf/VectorTraits.h
+++ b/sky/engine/wtf/VectorTraits.h
@@ -22,9 +22,9 @@
#define SKY_ENGINE_WTF_VECTORTRAITS_H_
#include <utility>
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/TypeTraits.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/TypeTraits.h"
using std::pair;
diff --git a/sky/engine/wtf/WTF.cpp b/sky/engine/wtf/WTF.cpp
index 247ab05..c59064a 100644
--- a/sky/engine/wtf/WTF.cpp
+++ b/sky/engine/wtf/WTF.cpp
@@ -28,10 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/WTF.h"
-#include "sky/engine/wtf/DefaultAllocator.h"
-#include "sky/engine/wtf/FastMalloc.h"
+#include "flutter/sky/engine/wtf/DefaultAllocator.h"
+#include "flutter/sky/engine/wtf/FastMalloc.h"
namespace WTF {
diff --git a/sky/engine/wtf/WTF.h b/sky/engine/wtf/WTF.h
index 9186d98..7fc1f54 100644
--- a/sky/engine/wtf/WTF.h
+++ b/sky/engine/wtf/WTF.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_WTF_WTF_H_
#define SKY_ENGINE_WTF_WTF_H_
-#include "sky/engine/wtf/Compiler.h"
-#include "sky/engine/wtf/PartitionAlloc.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/Compiler.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/WTFThreadData.cpp b/sky/engine/wtf/WTFThreadData.cpp
index 2271349..776a43b 100644
--- a/sky/engine/wtf/WTFThreadData.cpp
+++ b/sky/engine/wtf/WTFThreadData.cpp
@@ -24,9 +24,9 @@
*
*/
-#include "sky/engine/wtf/WTFThreadData.h"
+#include "flutter/sky/engine/wtf/WTFThreadData.h"
-#include "sky/engine/wtf/text/TextCodecICU.h"
+#include "flutter/sky/engine/wtf/text/TextCodecICU.h"
namespace WTF {
diff --git a/sky/engine/wtf/WTFThreadData.h b/sky/engine/wtf/WTFThreadData.h
index 999f91e..73eca9a 100644
--- a/sky/engine/wtf/WTFThreadData.h
+++ b/sky/engine/wtf/WTFThreadData.h
@@ -27,13 +27,13 @@
#ifndef SKY_ENGINE_WTF_WTFTHREADDATA_H_
#define SKY_ENGINE_WTF_WTFTHREADDATA_H_
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/ThreadSpecific.h"
-#include "sky/engine/wtf/Threading.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/ThreadSpecific.h"
+#include "flutter/sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
namespace WTF {
diff --git a/sky/engine/wtf/asm/SaturatedArithmeticARM.h b/sky/engine/wtf/asm/SaturatedArithmeticARM.h
index 58aace7..913127e 100644
--- a/sky/engine/wtf/asm/SaturatedArithmeticARM.h
+++ b/sky/engine/wtf/asm/SaturatedArithmeticARM.h
@@ -7,7 +7,7 @@
#include <stdint.h>
#include <limits>
-#include "sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/CPU.h"
ALWAYS_INLINE int32_t saturatedAddition(int32_t a, int32_t b)
{
diff --git a/sky/engine/wtf/dtoa.cpp b/sky/engine/wtf/dtoa.cpp
index 792a484..81323e3 100644
--- a/sky/engine/wtf/dtoa.cpp
+++ b/sky/engine/wtf/dtoa.cpp
@@ -32,12 +32,12 @@
* file.
*/
-#include "sky/engine/wtf/dtoa.h"
+#include "flutter/sky/engine/wtf/dtoa.h"
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
-#include "sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/Vector.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa.h b/sky/engine/wtf/dtoa.h
index 841f9a6..fbf557f 100644
--- a/sky/engine/wtf/dtoa.h
+++ b/sky/engine/wtf/dtoa.h
@@ -21,9 +21,9 @@
#ifndef SKY_ENGINE_WTF_DTOA_H_
#define SKY_ENGINE_WTF_DTOA_H_
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
#include "wtf/dtoa/double-conversion.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/bignum-dtoa.cc b/sky/engine/wtf/dtoa/bignum-dtoa.cc
index 0f5fa90..80b1020 100644
--- a/sky/engine/wtf/dtoa/bignum-dtoa.cc
+++ b/sky/engine/wtf/dtoa/bignum-dtoa.cc
@@ -30,8 +30,8 @@
#include "bignum-dtoa.h"
-#include "sky/engine/wtf/dtoa/bignum.h"
-#include "sky/engine/wtf/dtoa/double.h"
+#include "flutter/sky/engine/wtf/dtoa/bignum.h"
+#include "flutter/sky/engine/wtf/dtoa/double.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/bignum-dtoa.h b/sky/engine/wtf/dtoa/bignum-dtoa.h
index 2968e6a..e28536d 100644
--- a/sky/engine/wtf/dtoa/bignum-dtoa.h
+++ b/sky/engine/wtf/dtoa/bignum-dtoa.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_BIGNUM_DTOA_H_
#define SKY_ENGINE_WTF_DTOA_BIGNUM_DTOA_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/bignum.cc b/sky/engine/wtf/dtoa/bignum.cc
index aadc536..eea5394 100644
--- a/sky/engine/wtf/dtoa/bignum.cc
+++ b/sky/engine/wtf/dtoa/bignum.cc
@@ -26,8 +26,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "sky/engine/wtf/dtoa/bignum.h"
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/bignum.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/bignum.h b/sky/engine/wtf/dtoa/bignum.h
index ec540f5..dfa37f3 100644
--- a/sky/engine/wtf/dtoa/bignum.h
+++ b/sky/engine/wtf/dtoa/bignum.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_BIGNUM_H_
#define SKY_ENGINE_WTF_DTOA_BIGNUM_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/cached-powers.cc b/sky/engine/wtf/dtoa/cached-powers.cc
index bb8e366..aeb10dc 100644
--- a/sky/engine/wtf/dtoa/cached-powers.cc
+++ b/sky/engine/wtf/dtoa/cached-powers.cc
@@ -31,7 +31,7 @@
#include <math.h>
#include "cached-powers.h"
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/diy-fp.cc b/sky/engine/wtf/dtoa/diy-fp.cc
index 876fa62..f48526f 100644
--- a/sky/engine/wtf/dtoa/diy-fp.cc
+++ b/sky/engine/wtf/dtoa/diy-fp.cc
@@ -27,7 +27,7 @@
#include "diy-fp.h"
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/diy-fp.h b/sky/engine/wtf/dtoa/diy-fp.h
index 4363aff..f670f8b 100644
--- a/sky/engine/wtf/dtoa/diy-fp.h
+++ b/sky/engine/wtf/dtoa/diy-fp.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_DIY_FP_H_
#define SKY_ENGINE_WTF_DTOA_DIY_FP_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/double-conversion.cc b/sky/engine/wtf/dtoa/double-conversion.cc
index 1b15380..0b3968e 100644
--- a/sky/engine/wtf/dtoa/double-conversion.cc
+++ b/sky/engine/wtf/dtoa/double-conversion.cc
@@ -32,11 +32,11 @@
#include "double-conversion.h"
#include "bignum-dtoa.h"
-#include "sky/engine/wtf/dtoa/double.h"
+#include "flutter/sky/engine/wtf/dtoa/double.h"
#include "fast-dtoa.h"
#include "fixed-dtoa.h"
-#include "sky/engine/wtf/dtoa/strtod.h"
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/strtod.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/double-conversion.h b/sky/engine/wtf/dtoa/double-conversion.h
index 0d3b3bf..27fe892 100644
--- a/sky/engine/wtf/dtoa/double-conversion.h
+++ b/sky/engine/wtf/dtoa/double-conversion.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_DOUBLE_CONVERSION_H_
#define SKY_ENGINE_WTF_DTOA_DOUBLE_CONVERSION_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/fast-dtoa.cc b/sky/engine/wtf/dtoa/fast-dtoa.cc
index 9cd9231..c30c23b 100644
--- a/sky/engine/wtf/dtoa/fast-dtoa.cc
+++ b/sky/engine/wtf/dtoa/fast-dtoa.cc
@@ -30,7 +30,7 @@
#include "cached-powers.h"
#include "diy-fp.h"
-#include "sky/engine/wtf/dtoa/double.h"
+#include "flutter/sky/engine/wtf/dtoa/double.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/fast-dtoa.h b/sky/engine/wtf/dtoa/fast-dtoa.h
index f25a157..88ef158 100644
--- a/sky/engine/wtf/dtoa/fast-dtoa.h
+++ b/sky/engine/wtf/dtoa/fast-dtoa.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_FAST_DTOA_H_
#define SKY_ENGINE_WTF_DTOA_FAST_DTOA_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/fixed-dtoa.cc b/sky/engine/wtf/dtoa/fixed-dtoa.cc
index b45b1d4..8e61cb4 100644
--- a/sky/engine/wtf/dtoa/fixed-dtoa.cc
+++ b/sky/engine/wtf/dtoa/fixed-dtoa.cc
@@ -28,7 +28,7 @@
#include <math.h>
-#include "sky/engine/wtf/dtoa/double.h"
+#include "flutter/sky/engine/wtf/dtoa/double.h"
#include "fixed-dtoa.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/fixed-dtoa.h b/sky/engine/wtf/dtoa/fixed-dtoa.h
index 74dc82b..e668ef2 100644
--- a/sky/engine/wtf/dtoa/fixed-dtoa.h
+++ b/sky/engine/wtf/dtoa/fixed-dtoa.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_FIXED_DTOA_H_
#define SKY_ENGINE_WTF_DTOA_FIXED_DTOA_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/strtod.cc b/sky/engine/wtf/dtoa/strtod.cc
index b118be4..e79209d 100644
--- a/sky/engine/wtf/dtoa/strtod.cc
+++ b/sky/engine/wtf/dtoa/strtod.cc
@@ -29,10 +29,10 @@
#include <stdarg.h>
#include <limits.h>
-#include "sky/engine/wtf/dtoa/strtod.h"
-#include "sky/engine/wtf/dtoa/bignum.h"
+#include "flutter/sky/engine/wtf/dtoa/strtod.h"
+#include "flutter/sky/engine/wtf/dtoa/bignum.h"
#include "cached-powers.h"
-#include "sky/engine/wtf/dtoa/double.h"
+#include "flutter/sky/engine/wtf/dtoa/double.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/strtod.h b/sky/engine/wtf/dtoa/strtod.h
index 4aa3b1c..6f9e684 100644
--- a/sky/engine/wtf/dtoa/strtod.h
+++ b/sky/engine/wtf/dtoa/strtod.h
@@ -28,7 +28,7 @@
#ifndef SKY_ENGINE_WTF_DTOA_STRTOD_H_
#define SKY_ENGINE_WTF_DTOA_STRTOD_H_
-#include "sky/engine/wtf/dtoa/utils.h"
+#include "flutter/sky/engine/wtf/dtoa/utils.h"
namespace WTF {
diff --git a/sky/engine/wtf/dtoa/utils.h b/sky/engine/wtf/dtoa/utils.h
index 7a4e673..bbfab79 100644
--- a/sky/engine/wtf/dtoa/utils.h
+++ b/sky/engine/wtf/dtoa/utils.h
@@ -31,7 +31,7 @@
#include <string.h>
#include "lib/ftl/macros.h"
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
#define UNIMPLEMENTED ASSERT_NOT_REACHED
#define UNREACHABLE ASSERT_NOT_REACHED
diff --git a/sky/engine/wtf/testing/RunAllTests.cpp b/sky/engine/wtf/testing/RunAllTests.cpp
index 955c8c7..01c0296 100644
--- a/sky/engine/wtf/testing/RunAllTests.cpp
+++ b/sky/engine/wtf/testing/RunAllTests.cpp
@@ -29,8 +29,8 @@
*/
#include "gtest/gtest.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/WTF.h"
int main(int argc, char** argv) {
WTF::initialize();
diff --git a/sky/engine/wtf/testing/WTFTestHelpers.cpp b/sky/engine/wtf/testing/WTFTestHelpers.cpp
index 494d8b4..ba113da 100644
--- a/sky/engine/wtf/testing/WTFTestHelpers.cpp
+++ b/sky/engine/wtf/testing/WTFTestHelpers.cpp
@@ -32,7 +32,7 @@
#include <ios> // NOLINT
#include <ostream> // NOLINT
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/testing/WTFTestHelpers.h b/sky/engine/wtf/testing/WTFTestHelpers.h
index 13ee581..b16bf3c 100644
--- a/sky/engine/wtf/testing/WTFTestHelpers.h
+++ b/sky/engine/wtf/testing/WTFTestHelpers.h
@@ -32,7 +32,7 @@
#define SKY_ENGINE_WTF_TESTING_WTFTESTHELPERS_H_
#include <iosfwd> // NOLINT
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include "wtf/testing/WTFUnitTestHelpersExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/testing/WTFTestHelpersTest.cpp b/sky/engine/wtf/testing/WTFTestHelpersTest.cpp
index b61bba0..a594ce0 100644
--- a/sky/engine/wtf/testing/WTFTestHelpersTest.cpp
+++ b/sky/engine/wtf/testing/WTFTestHelpersTest.cpp
@@ -33,9 +33,9 @@
#include <gtest/gtest.h>
#include <sstream>
#include <string>
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
using namespace WTF;
diff --git a/sky/engine/wtf/text/ASCIIFastPath.h b/sky/engine/wtf/text/ASCIIFastPath.h
index fc3f0e2..0e595ce 100644
--- a/sky/engine/wtf/text/ASCIIFastPath.h
+++ b/sky/engine/wtf/text/ASCIIFastPath.h
@@ -23,10 +23,10 @@
#define SKY_ENGINE_WTF_TEXT_ASCIIFASTPATH_H_
#include <stdint.h>
-#include "sky/engine/wtf/Alignment.h"
-#include "sky/engine/wtf/CPU.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/Alignment.h"
+#include "flutter/sky/engine/wtf/CPU.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/AtomicString.cpp b/sky/engine/wtf/text/AtomicString.cpp
index 9cdc74b..7f89878 100644
--- a/sky/engine/wtf/text/AtomicString.cpp
+++ b/sky/engine/wtf/text/AtomicString.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/WTFThreadData.h"
-#include "sky/engine/wtf/dtoa.h"
-#include "sky/engine/wtf/text/IntegerToStringConversion.h"
-#include "sky/engine/wtf/text/StringHash.h"
-#include "sky/engine/wtf/unicode/UTF8.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/WTFThreadData.h"
+#include "flutter/sky/engine/wtf/dtoa.h"
+#include "flutter/sky/engine/wtf/text/IntegerToStringConversion.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/unicode/UTF8.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/AtomicString.h b/sky/engine/wtf/text/AtomicString.h
index 916d4e5..9725042 100644
--- a/sky/engine/wtf/text/AtomicString.h
+++ b/sky/engine/wtf/text/AtomicString.h
@@ -21,10 +21,10 @@
#ifndef SKY_ENGINE_WTF_TEXT_ATOMICSTRING_H_
#define SKY_ENGINE_WTF_TEXT_ATOMICSTRING_H_
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
@@ -244,5 +244,5 @@
using WTF::emptyAtom;
using WTF::starAtom;
-#include "sky/engine/wtf/text/StringConcatenate.h"
+#include "flutter/sky/engine/wtf/text/StringConcatenate.h"
#endif // SKY_ENGINE_WTF_TEXT_ATOMICSTRING_H_
diff --git a/sky/engine/wtf/text/AtomicStringHash.h b/sky/engine/wtf/text/AtomicStringHash.h
index b8fa2a3..3f4c480 100644
--- a/sky/engine/wtf/text/AtomicStringHash.h
+++ b/sky/engine/wtf/text/AtomicStringHash.h
@@ -29,8 +29,8 @@
#ifndef SKY_ENGINE_WTF_TEXT_ATOMICSTRINGHASH_H_
#define SKY_ENGINE_WTF_TEXT_ATOMICSTRINGHASH_H_
-#include "sky/engine/wtf/HashTraits.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/HashTraits.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/AtomicStringTest.cpp b/sky/engine/wtf/text/AtomicStringTest.cpp
index 9528858..62abad0 100644
--- a/sky/engine/wtf/text/AtomicStringTest.cpp
+++ b/sky/engine/wtf/text/AtomicStringTest.cpp
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/wtf/text/CString.cpp b/sky/engine/wtf/text/CString.cpp
index e820762..bcd1885 100644
--- a/sky/engine/wtf/text/CString.cpp
+++ b/sky/engine/wtf/text/CString.cpp
@@ -24,11 +24,11 @@
*/
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
#include <string.h>
-#include "sky/engine/wtf/PartitionAlloc.h"
-#include "sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/WTF.h"
using namespace std;
diff --git a/sky/engine/wtf/text/CString.h b/sky/engine/wtf/text/CString.h
index 08c1fcb..6fa0406 100644
--- a/sky/engine/wtf/text/CString.h
+++ b/sky/engine/wtf/text/CString.h
@@ -27,9 +27,9 @@
#define SKY_ENGINE_WTF_TEXT_CSTRING_H_
#include <string>
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/CStringTest.cpp b/sky/engine/wtf/text/CStringTest.cpp
index 4a905b8..9f80bba 100644
--- a/sky/engine/wtf/text/CStringTest.cpp
+++ b/sky/engine/wtf/text/CStringTest.cpp
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
namespace {
diff --git a/sky/engine/wtf/text/IntegerToStringConversion.h b/sky/engine/wtf/text/IntegerToStringConversion.h
index 856f61a..454f459 100644
--- a/sky/engine/wtf/text/IntegerToStringConversion.h
+++ b/sky/engine/wtf/text/IntegerToStringConversion.h
@@ -22,8 +22,8 @@
#ifndef SKY_ENGINE_WTF_TEXT_INTEGERTOSTRINGCONVERSION_H_
#define SKY_ENGINE_WTF_TEXT_INTEGERTOSTRINGCONVERSION_H_
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringBuffer.h b/sky/engine/wtf/text/StringBuffer.h
index 22e7bfe..bcd7821 100644
--- a/sky/engine/wtf/text/StringBuffer.h
+++ b/sky/engine/wtf/text/StringBuffer.h
@@ -29,9 +29,9 @@
#ifndef SKY_ENGINE_WTF_TEXT_STRINGBUFFER_H_
#define SKY_ENGINE_WTF_TEXT_STRINGBUFFER_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/StringImpl.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringBufferTest.cpp b/sky/engine/wtf/text/StringBufferTest.cpp
index 8ae8d30..12b02cb 100644
--- a/sky/engine/wtf/text/StringBufferTest.cpp
+++ b/sky/engine/wtf/text/StringBufferTest.cpp
@@ -5,7 +5,7 @@
*/
-#include "sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
#include <gtest/gtest.h>
diff --git a/sky/engine/wtf/text/StringBuilder.cpp b/sky/engine/wtf/text/StringBuilder.cpp
index afa7929..a4f2525 100644
--- a/sky/engine/wtf/text/StringBuilder.cpp
+++ b/sky/engine/wtf/text/StringBuilder.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/dtoa.h"
-#include "sky/engine/wtf/text/IntegerToStringConversion.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/dtoa.h"
+#include "flutter/sky/engine/wtf/text/IntegerToStringConversion.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringBuilder.h b/sky/engine/wtf/text/StringBuilder.h
index 7c7292a..5290ee7 100644
--- a/sky/engine/wtf/text/StringBuilder.h
+++ b/sky/engine/wtf/text/StringBuilder.h
@@ -27,9 +27,9 @@
#ifndef SKY_ENGINE_WTF_TEXT_STRINGBUILDER_H_
#define SKY_ENGINE_WTF_TEXT_STRINGBUILDER_H_
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringBuilderTest.cpp b/sky/engine/wtf/text/StringBuilderTest.cpp
index 040a7bd..7201bc4 100644
--- a/sky/engine/wtf/text/StringBuilderTest.cpp
+++ b/sky/engine/wtf/text/StringBuilderTest.cpp
@@ -31,11 +31,11 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringConcatenate.h b/sky/engine/wtf/text/StringConcatenate.h
index 7c74af1..0bef51e 100644
--- a/sky/engine/wtf/text/StringConcatenate.h
+++ b/sky/engine/wtf/text/StringConcatenate.h
@@ -29,7 +29,7 @@
#include <string.h>
#ifndef WTFString_h
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
#endif
// This macro is helpful for testing how many intermediate Strings are created while evaluating an
@@ -436,5 +436,5 @@
} // namespace WTF
-#include "sky/engine/wtf/text/StringOperators.h"
+#include "flutter/sky/engine/wtf/text/StringOperators.h"
#endif // SKY_ENGINE_WTF_TEXT_STRINGCONCATENATE_H_
diff --git a/sky/engine/wtf/text/StringHash.h b/sky/engine/wtf/text/StringHash.h
index 163f905..998a1cf 100644
--- a/sky/engine/wtf/text/StringHash.h
+++ b/sky/engine/wtf/text/StringHash.h
@@ -22,9 +22,9 @@
#ifndef SKY_ENGINE_WTF_TEXT_STRINGHASH_H_
#define SKY_ENGINE_WTF_TEXT_STRINGHASH_H_
-#include "sky/engine/wtf/HashTraits.h"
-#include "sky/engine/wtf/StringHasher.h"
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/HashTraits.h"
+#include "flutter/sky/engine/wtf/StringHasher.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringImpl.cpp b/sky/engine/wtf/text/StringImpl.cpp
index 84d81cd..58355c4 100644
--- a/sky/engine/wtf/text/StringImpl.cpp
+++ b/sky/engine/wtf/text/StringImpl.cpp
@@ -22,30 +22,30 @@
*
*/
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
#include <unicode/translit.h>
#include <unicode/unistr.h>
-#include "sky/engine/wtf/DynamicAnnotations.h"
-#include "sky/engine/wtf/LeakAnnotations.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/PartitionAlloc.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/WTF.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/StringHash.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/DynamicAnnotations.h"
+#include "flutter/sky/engine/wtf/LeakAnnotations.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/PartitionAlloc.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/WTF.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/StringHash.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
#ifdef STRING_STATS
#include <unistd.h>
-#include "sky/engine/wtf/DataLog.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/RefCounted.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/DataLog.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/RefCounted.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
#endif
using namespace std;
diff --git a/sky/engine/wtf/text/StringImpl.h b/sky/engine/wtf/text/StringImpl.h
index b4c3ec0..cce6f78 100644
--- a/sky/engine/wtf/text/StringImpl.h
+++ b/sky/engine/wtf/text/StringImpl.h
@@ -24,13 +24,13 @@
#define SKY_ENGINE_WTF_TEXT_STRINGIMPL_H_
#include <limits.h>
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/StringHasher.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/StringHasher.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringImplTest.cpp b/sky/engine/wtf/text/StringImplTest.cpp
index 402d4a7..a15c091 100644
--- a/sky/engine/wtf/text/StringImplTest.cpp
+++ b/sky/engine/wtf/text/StringImplTest.cpp
@@ -25,8 +25,8 @@
#include <gtest/gtest.h>
-#include "sky/engine/wtf/text/StringImpl.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace {
diff --git a/sky/engine/wtf/text/StringOperatorsTest.cpp b/sky/engine/wtf/text/StringOperatorsTest.cpp
index 1c40f2a..e7cad58 100644
--- a/sky/engine/wtf/text/StringOperatorsTest.cpp
+++ b/sky/engine/wtf/text/StringOperatorsTest.cpp
@@ -29,7 +29,7 @@
static int wtfStringCopyCount;
#include <gtest/gtest.h>
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace {
diff --git a/sky/engine/wtf/text/StringStatics.cpp b/sky/engine/wtf/text/StringStatics.cpp
index 2b2dda0..bf6032f 100644
--- a/sky/engine/wtf/text/StringStatics.cpp
+++ b/sky/engine/wtf/text/StringStatics.cpp
@@ -23,13 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/StringStatics.h"
+#include "flutter/sky/engine/wtf/text/StringStatics.h"
-#include "sky/engine/wtf/DynamicAnnotations.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/StaticConstructors.h"
-#include "sky/engine/wtf/text/AtomicString.h"
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/DynamicAnnotations.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/StaticConstructors.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringStatics.h b/sky/engine/wtf/text/StringStatics.h
index 132e46f..9492a45 100644
--- a/sky/engine/wtf/text/StringStatics.h
+++ b/sky/engine/wtf/text/StringStatics.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_STRINGSTATICS_H_
#define SKY_ENGINE_WTF_TEXT_STRINGSTATICS_H_
-#include "sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringUTF8Adaptor.h b/sky/engine/wtf/text/StringUTF8Adaptor.h
index 73d5f1e..45090ca 100644
--- a/sky/engine/wtf/text/StringUTF8Adaptor.h
+++ b/sky/engine/wtf/text/StringUTF8Adaptor.h
@@ -31,9 +31,9 @@
#ifndef SKY_ENGINE_WTF_TEXT_STRINGUTF8ADAPTOR_H_
#define SKY_ENGINE_WTF_TEXT_STRINGUTF8ADAPTOR_H_
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/StringView.h b/sky/engine/wtf/text/StringView.h
index 3ebf99c..fa36101 100644
--- a/sky/engine/wtf/text/StringView.h
+++ b/sky/engine/wtf/text/StringView.h
@@ -31,7 +31,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_STRINGVIEW_H_
#define SKY_ENGINE_WTF_TEXT_STRINGVIEW_H_
-#include "sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodec.cpp b/sky/engine/wtf/text/TextCodec.cpp
index 0fb1606..b34fd80 100644
--- a/sky/engine/wtf/text/TextCodec.cpp
+++ b/sky/engine/wtf/text/TextCodec.cpp
@@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
-#include "sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodec.h b/sky/engine/wtf/text/TextCodec.h
index 22fc912..19fc036 100644
--- a/sky/engine/wtf/text/TextCodec.h
+++ b/sky/engine/wtf/text/TextCodec.h
@@ -27,11 +27,11 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODEC_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODEC_H_
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecASCIIFastPath.h b/sky/engine/wtf/text/TextCodecASCIIFastPath.h
index e3b3881..3a2963f 100644
--- a/sky/engine/wtf/text/TextCodecASCIIFastPath.h
+++ b/sky/engine/wtf/text/TextCodecASCIIFastPath.h
@@ -27,7 +27,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODECASCIIFASTPATH_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODECASCIIFASTPATH_H_
-#include "sky/engine/wtf/text/ASCIIFastPath.h"
+#include "flutter/sky/engine/wtf/text/ASCIIFastPath.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecICU.cpp b/sky/engine/wtf/text/TextCodecICU.cpp
index cbddcba..435f855 100644
--- a/sky/engine/wtf/text/TextCodecICU.cpp
+++ b/sky/engine/wtf/text/TextCodecICU.cpp
@@ -24,17 +24,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextCodecICU.h"
+#include "flutter/sky/engine/wtf/text/TextCodecICU.h"
#include <unicode/ucnv.h>
#include <unicode/ucnv_cb.h>
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/StringExtras.h"
-#include "sky/engine/wtf/Threading.h"
-#include "sky/engine/wtf/WTFThreadData.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/WTFThreadData.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
using std::min;
diff --git a/sky/engine/wtf/text/TextCodecICU.h b/sky/engine/wtf/text/TextCodecICU.h
index 2b61faa..9d5c17d 100644
--- a/sky/engine/wtf/text/TextCodecICU.h
+++ b/sky/engine/wtf/text/TextCodecICU.h
@@ -28,8 +28,8 @@
#define SKY_ENGINE_WTF_TEXT_TEXTCODECICU_H_
#include <unicode/utypes.h>
-#include "sky/engine/wtf/text/TextCodec.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
typedef struct UConverter UConverter;
diff --git a/sky/engine/wtf/text/TextCodecLatin1.cpp b/sky/engine/wtf/text/TextCodecLatin1.cpp
index b50604c..f1e98b6 100644
--- a/sky/engine/wtf/text/TextCodecLatin1.cpp
+++ b/sky/engine/wtf/text/TextCodecLatin1.cpp
@@ -23,13 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextCodecLatin1.h"
+#include "flutter/sky/engine/wtf/text/TextCodecLatin1.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/TextCodecASCIIFastPath.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/TextCodecASCIIFastPath.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
using namespace WTF;
diff --git a/sky/engine/wtf/text/TextCodecLatin1.h b/sky/engine/wtf/text/TextCodecLatin1.h
index 1fa0cf2..3f5d40a 100644
--- a/sky/engine/wtf/text/TextCodecLatin1.h
+++ b/sky/engine/wtf/text/TextCodecLatin1.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODECLATIN1_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODECLATIN1_H_
-#include "sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecReplacement.cpp b/sky/engine/wtf/text/TextCodecReplacement.cpp
index 657687b..19f6722 100644
--- a/sky/engine/wtf/text/TextCodecReplacement.cpp
+++ b/sky/engine/wtf/text/TextCodecReplacement.cpp
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/engine/wtf/text/TextCodecReplacement.h"
+#include "flutter/sky/engine/wtf/text/TextCodecReplacement.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecReplacement.h b/sky/engine/wtf/text/TextCodecReplacement.h
index 2752b9e..d67de69 100644
--- a/sky/engine/wtf/text/TextCodecReplacement.h
+++ b/sky/engine/wtf/text/TextCodecReplacement.h
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODECREPLACEMENT_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODECREPLACEMENT_H_
-#include "sky/engine/wtf/text/TextCodec.h"
-#include "sky/engine/wtf/text/TextCodecUTF8.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUTF8.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecReplacementTest.cpp b/sky/engine/wtf/text/TextCodecReplacementTest.cpp
index 7f35d60..a1aaf2f 100644
--- a/sky/engine/wtf/text/TextCodecReplacementTest.cpp
+++ b/sky/engine/wtf/text/TextCodecReplacementTest.cpp
@@ -3,15 +3,15 @@
// found in the LICENSE file.
-#include "sky/engine/wtf/text/TextCodecReplacement.h"
+#include "flutter/sky/engine/wtf/text/TextCodecReplacement.h"
#include <gtest/gtest.h>
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/TextCodec.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
-#include "sky/engine/wtf/text/TextEncodingRegistry.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/text/TextEncodingRegistry.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecUTF16.cpp b/sky/engine/wtf/text/TextCodecUTF16.cpp
index 7a4c669..e1115f3 100644
--- a/sky/engine/wtf/text/TextCodecUTF16.cpp
+++ b/sky/engine/wtf/text/TextCodecUTF16.cpp
@@ -23,13 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextCodecUTF16.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUTF16.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
using namespace std;
diff --git a/sky/engine/wtf/text/TextCodecUTF16.h b/sky/engine/wtf/text/TextCodecUTF16.h
index fe4ab9e..9a4d78d 100644
--- a/sky/engine/wtf/text/TextCodecUTF16.h
+++ b/sky/engine/wtf/text/TextCodecUTF16.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODECUTF16_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODECUTF16_H_
-#include "sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecUTF8.cpp b/sky/engine/wtf/text/TextCodecUTF8.cpp
index d3ed80d..7df5fba 100644
--- a/sky/engine/wtf/text/TextCodecUTF8.cpp
+++ b/sky/engine/wtf/text/TextCodecUTF8.cpp
@@ -23,12 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextCodecUTF8.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUTF8.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/TextCodecASCIIFastPath.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/TextCodecASCIIFastPath.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
using namespace WTF;
using namespace WTF::Unicode;
diff --git a/sky/engine/wtf/text/TextCodecUTF8.h b/sky/engine/wtf/text/TextCodecUTF8.h
index 8a55132..4062cf7 100644
--- a/sky/engine/wtf/text/TextCodecUTF8.h
+++ b/sky/engine/wtf/text/TextCodecUTF8.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODECUTF8_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODECUTF8_H_
-#include "sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecUTF8Test.cpp b/sky/engine/wtf/text/TextCodecUTF8Test.cpp
index b59d2fb..ddc334c 100644
--- a/sky/engine/wtf/text/TextCodecUTF8Test.cpp
+++ b/sky/engine/wtf/text/TextCodecUTF8Test.cpp
@@ -29,14 +29,14 @@
*/
-#include "sky/engine/wtf/text/TextCodecUTF8.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUTF8.h"
#include <gtest/gtest.h>
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/text/TextCodec.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
-#include "sky/engine/wtf/text/TextEncodingRegistry.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/text/TextEncodingRegistry.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecUserDefined.cpp b/sky/engine/wtf/text/TextCodecUserDefined.cpp
index e2c01ff..0ee4797 100644
--- a/sky/engine/wtf/text/TextCodecUserDefined.cpp
+++ b/sky/engine/wtf/text/TextCodecUserDefined.cpp
@@ -23,13 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextCodecUserDefined.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUserDefined.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/StringBuffer.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/StringBuffer.h"
+#include "flutter/sky/engine/wtf/text/StringBuilder.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextCodecUserDefined.h b/sky/engine/wtf/text/TextCodecUserDefined.h
index cf9b4ca..0572857 100644
--- a/sky/engine/wtf/text/TextCodecUserDefined.h
+++ b/sky/engine/wtf/text/TextCodecUserDefined.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTCODECUSERDEFINED_H_
#define SKY_ENGINE_WTF_TEXT_TEXTCODECUSERDEFINED_H_
-#include "sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextEncoding.cpp b/sky/engine/wtf/text/TextEncoding.cpp
index d21e826..d1820d1 100644
--- a/sky/engine/wtf/text/TextEncoding.cpp
+++ b/sky/engine/wtf/text/TextEncoding.cpp
@@ -25,14 +25,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
#include <unicode/unorm.h>
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/TextEncodingRegistry.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/OwnPtr.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/TextEncodingRegistry.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextEncoding.h b/sky/engine/wtf/text/TextEncoding.h
index 90fabf7..2410f46 100644
--- a/sky/engine/wtf/text/TextEncoding.h
+++ b/sky/engine/wtf/text/TextEncoding.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTENCODING_H_
#define SKY_ENGINE_WTF_TEXT_TEXTENCODING_H_
-#include "sky/engine/wtf/Forward.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/TextCodec.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/Forward.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/TextCodec.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextEncodingRegistry.cpp b/sky/engine/wtf/text/TextEncodingRegistry.cpp
index 20669b3..699ba4b 100644
--- a/sky/engine/wtf/text/TextEncodingRegistry.cpp
+++ b/sky/engine/wtf/text/TextEncodingRegistry.cpp
@@ -24,23 +24,23 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextEncodingRegistry.h"
+#include "flutter/sky/engine/wtf/text/TextEncodingRegistry.h"
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/StdLibExtras.h"
-#include "sky/engine/wtf/StringExtras.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/TextCodecICU.h"
-#include "sky/engine/wtf/text/TextCodecLatin1.h"
-#include "sky/engine/wtf/text/TextCodecReplacement.h"
-#include "sky/engine/wtf/text/TextCodecUTF16.h"
-#include "sky/engine/wtf/text/TextCodecUTF8.h"
-#include "sky/engine/wtf/text/TextCodecUserDefined.h"
-#include "sky/engine/wtf/text/TextEncoding.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/HashMap.h"
+#include "flutter/sky/engine/wtf/HashSet.h"
+#include "flutter/sky/engine/wtf/MainThread.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/TextCodecICU.h"
+#include "flutter/sky/engine/wtf/text/TextCodecLatin1.h"
+#include "flutter/sky/engine/wtf/text/TextCodecReplacement.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUTF16.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUTF8.h"
+#include "flutter/sky/engine/wtf/text/TextCodecUserDefined.h"
+#include "flutter/sky/engine/wtf/text/TextEncoding.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextEncodingRegistry.h b/sky/engine/wtf/text/TextEncodingRegistry.h
index 2e2f8d4..1b31de8 100644
--- a/sky/engine/wtf/text/TextEncodingRegistry.h
+++ b/sky/engine/wtf/text/TextEncodingRegistry.h
@@ -26,10 +26,10 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTENCODINGREGISTRY_H_
#define SKY_ENGINE_WTF_TEXT_TEXTENCODINGREGISTRY_H_
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/WTFString.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextPosition.cpp b/sky/engine/wtf/text/TextPosition.cpp
index dfdb881..f943c89 100644
--- a/sky/engine/wtf/text/TextPosition.cpp
+++ b/sky/engine/wtf/text/TextPosition.cpp
@@ -22,10 +22,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/text/TextPosition.h"
+#include "flutter/sky/engine/wtf/text/TextPosition.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/StdLibExtras.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/StdLibExtras.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/TextPosition.h b/sky/engine/wtf/text/TextPosition.h
index 90d724ba..68c1a3e 100644
--- a/sky/engine/wtf/text/TextPosition.h
+++ b/sky/engine/wtf/text/TextPosition.h
@@ -25,10 +25,10 @@
#ifndef SKY_ENGINE_WTF_TEXT_TEXTPOSITION_H_
#define SKY_ENGINE_WTF_TEXT_TEXTPOSITION_H_
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace WTF {
diff --git a/sky/engine/wtf/text/WTFString.cpp b/sky/engine/wtf/text/WTFString.cpp
index 7a0a020..8767074 100644
--- a/sky/engine/wtf/text/WTFString.cpp
+++ b/sky/engine/wtf/text/WTFString.cpp
@@ -19,21 +19,21 @@
* Boston, MA 02110-1301, USA.
*/
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
#include <stdarg.h>
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/DataLog.h"
-#include "sky/engine/wtf/HexNumber.h"
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/StringExtras.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/dtoa.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/IntegerToStringConversion.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
-#include "sky/engine/wtf/unicode/UTF8.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/DataLog.h"
+#include "flutter/sky/engine/wtf/HexNumber.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/Vector.h"
+#include "flutter/sky/engine/wtf/dtoa.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/IntegerToStringConversion.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/unicode/UTF8.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
using namespace std;
diff --git a/sky/engine/wtf/text/WTFString.h b/sky/engine/wtf/text/WTFString.h
index 21a9b1f..4c96f85 100644
--- a/sky/engine/wtf/text/WTFString.h
+++ b/sky/engine/wtf/text/WTFString.h
@@ -26,11 +26,11 @@
// on systems without case-sensitive file systems.
#include <string>
-#include "sky/engine/wtf/HashTableDeletedValueType.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/text/ASCIIFastPath.h"
-#include "sky/engine/wtf/text/StringImpl.h"
-#include "sky/engine/wtf/text/StringView.h"
+#include "flutter/sky/engine/wtf/HashTableDeletedValueType.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/text/ASCIIFastPath.h"
+#include "flutter/sky/engine/wtf/text/StringImpl.h"
+#include "flutter/sky/engine/wtf/text/StringView.h"
namespace WTF {
@@ -669,5 +669,5 @@
using WTF::isSpaceOrNewline;
using WTF::reverseFind;
-#include "sky/engine/wtf/text/AtomicString.h"
+#include "flutter/sky/engine/wtf/text/AtomicString.h"
#endif // SKY_ENGINE_WTF_TEXT_WTFSTRING_H_
diff --git a/sky/engine/wtf/text/WTFStringTest.cpp b/sky/engine/wtf/text/WTFStringTest.cpp
index 25d0c95..c3dce67 100644
--- a/sky/engine/wtf/text/WTFStringTest.cpp
+++ b/sky/engine/wtf/text/WTFStringTest.cpp
@@ -26,9 +26,9 @@
#include <gtest/gtest.h>
#include <limits>
-#include "sky/engine/wtf/MathExtras.h"
-#include "sky/engine/wtf/text/CString.h"
-#include "sky/engine/wtf/text/WTFString.h"
+#include "flutter/sky/engine/wtf/MathExtras.h"
+#include "flutter/sky/engine/wtf/text/CString.h"
+#include "flutter/sky/engine/wtf/text/WTFString.h"
namespace {
diff --git a/sky/engine/wtf/unicode/CharacterNames.h b/sky/engine/wtf/unicode/CharacterNames.h
index 34dd5e1..e17f0b0 100644
--- a/sky/engine/wtf/unicode/CharacterNames.h
+++ b/sky/engine/wtf/unicode/CharacterNames.h
@@ -26,7 +26,7 @@
#ifndef SKY_ENGINE_WTF_UNICODE_CHARACTERNAMES_H_
#define SKY_ENGINE_WTF_UNICODE_CHARACTERNAMES_H_
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
namespace Unicode {
diff --git a/sky/engine/wtf/unicode/Collator.h b/sky/engine/wtf/unicode/Collator.h
index a9ee744..6f8c4ff 100644
--- a/sky/engine/wtf/unicode/Collator.h
+++ b/sky/engine/wtf/unicode/Collator.h
@@ -29,11 +29,11 @@
#ifndef SKY_ENGINE_WTF_UNICODE_COLLATOR_H_
#define SKY_ENGINE_WTF_UNICODE_COLLATOR_H_
-#include "sky/engine/wtf/FastAllocBase.h"
-#include "sky/engine/wtf/Noncopyable.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/FastAllocBase.h"
+#include "flutter/sky/engine/wtf/Noncopyable.h"
+#include "flutter/sky/engine/wtf/PassOwnPtr.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
struct UCollator;
diff --git a/sky/engine/wtf/unicode/UTF8.cpp b/sky/engine/wtf/unicode/UTF8.cpp
index 7c40e57..46c16a4 100644
--- a/sky/engine/wtf/unicode/UTF8.cpp
+++ b/sky/engine/wtf/unicode/UTF8.cpp
@@ -24,11 +24,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/unicode/UTF8.h"
+#include "flutter/sky/engine/wtf/unicode/UTF8.h"
-#include "sky/engine/wtf/ASCIICType.h"
-#include "sky/engine/wtf/StringHasher.h"
-#include "sky/engine/wtf/unicode/CharacterNames.h"
+#include "flutter/sky/engine/wtf/ASCIICType.h"
+#include "flutter/sky/engine/wtf/StringHasher.h"
+#include "flutter/sky/engine/wtf/unicode/CharacterNames.h"
namespace WTF {
namespace Unicode {
diff --git a/sky/engine/wtf/unicode/UTF8.h b/sky/engine/wtf/unicode/UTF8.h
index b734468..f9bff95 100644
--- a/sky/engine/wtf/unicode/UTF8.h
+++ b/sky/engine/wtf/unicode/UTF8.h
@@ -26,8 +26,8 @@
#ifndef SKY_ENGINE_WTF_UNICODE_UTF8_H_
#define SKY_ENGINE_WTF_UNICODE_UTF8_H_
-#include "sky/engine/wtf/WTFExport.h"
-#include "sky/engine/wtf/unicode/Unicode.h"
+#include "flutter/sky/engine/wtf/WTFExport.h"
+#include "flutter/sky/engine/wtf/unicode/Unicode.h"
namespace WTF {
namespace Unicode {
diff --git a/sky/engine/wtf/unicode/Unicode.h b/sky/engine/wtf/unicode/Unicode.h
index c371a85..26e5aae 100644
--- a/sky/engine/wtf/unicode/Unicode.h
+++ b/sky/engine/wtf/unicode/Unicode.h
@@ -23,12 +23,12 @@
#ifndef SKY_ENGINE_WTF_UNICODE_UNICODE_H_
#define SKY_ENGINE_WTF_UNICODE_UNICODE_H_
-#include "sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
// Define platform neutral 8 bit character type (L is for Latin-1).
typedef unsigned char LChar;
-#include "sky/engine/wtf/unicode/icu/UnicodeIcu.h"
+#include "flutter/sky/engine/wtf/unicode/icu/UnicodeIcu.h"
COMPILE_ASSERT(sizeof(UChar) == 2, UCharIsTwoBytes);
diff --git a/sky/engine/wtf/unicode/icu/CollatorICU.cpp b/sky/engine/wtf/unicode/icu/CollatorICU.cpp
index ddc6ff9..b20dc8f 100644
--- a/sky/engine/wtf/unicode/icu/CollatorICU.cpp
+++ b/sky/engine/wtf/unicode/icu/CollatorICU.cpp
@@ -26,15 +26,15 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sky/engine/wtf/unicode/Collator.h"
+#include "flutter/sky/engine/wtf/unicode/Collator.h"
#include <stdlib.h>
#include <string.h>
#include <unicode/ucol.h>
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/engine/wtf/StringExtras.h"
-#include "sky/engine/wtf/Threading.h"
-#include "sky/engine/wtf/ThreadingPrimitives.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/sky/engine/wtf/StringExtras.h"
+#include "flutter/sky/engine/wtf/Threading.h"
+#include "flutter/sky/engine/wtf/ThreadingPrimitives.h"
namespace WTF {
diff --git a/sky/packages/BUILD.gn b/sky/packages/BUILD.gn
index 0014e9d..3c81136 100644
--- a/sky/packages/BUILD.gn
+++ b/sky/packages/BUILD.gn
@@ -6,7 +6,7 @@
testonly = true
deps = [
- "//sky/packages/sky_engine",
- "//sky/packages/sky_services",
+ "//flutter/sky/packages/sky_engine",
+ "//flutter/sky/packages/sky_services",
]
}
diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn
index d71096c..ed7fa40 100644
--- a/sky/packages/sky_engine/BUILD.gn
+++ b/sky/packages/sky_engine/BUILD.gn
@@ -6,7 +6,7 @@
import("//flutter/lib/jni/dart_jni.gni")
import("//flutter/lib/ui/dart_ui.gni")
import("//mojo/public/dart/rules.gni")
-import("//sky/engine/core/core.gni")
+import("//flutter/sky/engine/core/core.gni")
copy("copy_sky_engine_authors") {
sources = [
@@ -107,13 +107,13 @@
":copy_dart_sdk",
":copy_dart_ui",
":copy_sky_engine_authors",
- "//sky/engine/bindings",
+ "//flutter/sky/engine/bindings",
]
service_isolate_dir = "//dart/runtime/bin/vmservice"
sdk_ext_directory = "$root_gen_dir/sky/bindings"
sdk_ext_files = [
- "//sky/engine/bindings/internals.dart",
+ "//flutter/sky/engine/bindings/internals.dart",
"$service_isolate_dir/vmservice_io.dart",
"$service_isolate_dir/loader.dart",
"$service_isolate_dir/server.dart",
diff --git a/sky/packages/sky_services/BUILD.gn b/sky/packages/sky_services/BUILD.gn
index 0a2c0d3..955075f 100644
--- a/sky/packages/sky_services/BUILD.gn
+++ b/sky/packages/sky_services/BUILD.gn
@@ -23,12 +23,12 @@
deps = [
":copy_sky_services_license",
- "//sky/services/activity:interfaces",
- "//sky/services/editing:interfaces",
- "//sky/services/media:interfaces",
- "//sky/services/platform:interfaces",
- "//sky/services/pointer:interfaces",
- "//sky/services/raw_keyboard:interfaces",
- "//sky/services/semantics:interfaces",
+ "//flutter/services/activity:interfaces",
+ "//flutter/services/editing:interfaces",
+ "//flutter/services/media:interfaces",
+ "//flutter/services/platform:interfaces",
+ "//flutter/services/pointer:interfaces",
+ "//flutter/services/raw_keyboard:interfaces",
+ "//flutter/services/semantics:interfaces",
]
}
diff --git a/sky/shell/BUILD.gn b/sky/shell/BUILD.gn
index fd95277..7d26843 100644
--- a/sky/shell/BUILD.gn
+++ b/sky/shell/BUILD.gn
@@ -7,9 +7,9 @@
dart_embedder_resources("generate_sky_embedder_diagnostic_server_resources_cc") {
inputs = [
- "//sky/shell/diagnostic/diagnostic_server.dart"
+ "//flutter/sky/shell/diagnostic/diagnostic_server.dart"
]
- root_prefix = "//sky/shell/diagnostic/"
+ root_prefix = "//flutter/sky/shell/diagnostic/"
output = "$target_gen_dir/sky_embedder_diagnostic_server_resources.cc"
table_name = "sky_embedder_diagnostic_server"
}
@@ -51,11 +51,11 @@
"//base",
"//build/config/sanitizers:deps",
"//dart/runtime:libdart",
- "//flow",
+ "//flutter/flow",
"//flutter/assets",
"//flutter/lib/ui",
"//flutter/tonic",
- "//glue",
+ "//flutter/glue",
"//lib/ftl",
"//lib/tonic",
"//mojo/common",
@@ -68,17 +68,17 @@
"//mojo/services/gfx/composition/interfaces",
"//mojo/services/navigation/interfaces",
"//mojo/services/vsync/interfaces",
- "//skia",
- "//sky/engine",
- "//sky/engine/bindings",
- "//sky/engine/core:core",
- "//sky/engine/wtf",
- "//sky/services/editing:interfaces",
- "//sky/services/engine:interfaces",
- "//sky/services/platform",
- "//sky/services/pointer:interfaces",
- "//sky/services/rasterizer:interfaces",
- "//sky/services/semantics:interfaces",
+ "//flutter/skia",
+ "//flutter/sky/engine",
+ "//flutter/sky/engine/bindings",
+ "//flutter/sky/engine/core:core",
+ "//flutter/sky/engine/wtf",
+ "//flutter/services/editing:interfaces",
+ "//flutter/services/engine:interfaces",
+ "//flutter/services/platform",
+ "//flutter/services/pointer:interfaces",
+ "//flutter/services/rasterizer:interfaces",
+ "//flutter/services/semantics:interfaces",
]
}
@@ -191,23 +191,23 @@
"//mojo/services/network/interfaces:interfaces_java",
"//mojo/services/sensors/interfaces:interfaces_java",
"//mojo/services/vsync/interfaces:interfaces_java",
- "//services/sensors:sensors_lib",
- "//sky/services/activity:activity_lib",
- "//sky/services/activity:interfaces_java",
- "//sky/services/common:common_lib",
- "//sky/services/editing:editing_lib",
- "//sky/services/editing:interfaces_java",
- "//sky/services/engine:interfaces_java",
- "//sky/services/media:interfaces_java",
- "//sky/services/media:media_lib",
- "//sky/services/oknet",
- "//sky/services/platform:interfaces_java",
- "//sky/services/platform:platform_lib",
- "//sky/services/pointer:interfaces_java",
- "//sky/services/raw_keyboard:interfaces_java",
- "//sky/services/raw_keyboard:raw_keyboard_lib",
- "//sky/services/semantics:interfaces_java",
- "//sky/services/vsync:vsync_lib",
+ "//flutter/services/sensors:sensors_lib",
+ "//flutter/services/activity:activity_lib",
+ "//flutter/services/activity:interfaces_java",
+ "//flutter/services/common:common_lib",
+ "//flutter/services/editing:editing_lib",
+ "//flutter/services/editing:interfaces_java",
+ "//flutter/services/engine:interfaces_java",
+ "//flutter/services/media:interfaces_java",
+ "//flutter/services/media:media_lib",
+ "//flutter/services/oknet",
+ "//flutter/services/platform:interfaces_java",
+ "//flutter/services/platform:platform_lib",
+ "//flutter/services/pointer:interfaces_java",
+ "//flutter/services/raw_keyboard:interfaces_java",
+ "//flutter/services/raw_keyboard:raw_keyboard_lib",
+ "//flutter/services/semantics:interfaces_java",
+ "//flutter/services/vsync:vsync_lib",
]
}
@@ -289,14 +289,14 @@
deps = [
"//mojo/edk/base_edk",
"//mojo/edk/system",
- "//skia",
- "//sky/services/activity",
- "//sky/services/dynamic:embedder",
- "//sky/services/editing",
- "//sky/services/media",
- "//sky/services/ns_net",
- "//sky/services/semantics",
- "//sky/services/vsync",
+ "//flutter/skia",
+ "//flutter/services/activity",
+ "//flutter/services/dynamic:embedder",
+ "//flutter/services/editing",
+ "//flutter/services/media",
+ "//flutter/services/ns_net",
+ "//flutter/services/semantics",
+ "//flutter/services/vsync",
":common",
":gpu_direct",
]
@@ -328,7 +328,7 @@
action("framework_install_name") {
stamp_file = "$root_out_dir/flutter_install_name_stamp"
- script = "//sky/tools/change_install_name.py"
+ script = "//flutter/sky/tools/change_install_name.py"
inputs = [ "$framework_dir/Flutter" ]
outputs = [ stamp_file ]
@@ -414,18 +414,18 @@
if (use_glfw) {
sources += [
- "//sky/shell/platform/glfw/init_glfw.cc",
- "//sky/shell/platform/glfw/init_glfw.h",
- "//sky/shell/platform/glfw/message_pump_glfw.cc",
- "//sky/shell/platform/glfw/message_pump_glfw.h",
- "//sky/shell/platform/glfw/platform_view_glfw.cc",
- "//sky/shell/platform/glfw/platform_view_glfw.h",
- "//sky/shell/platform/glfw/window_impl.cc",
- "//sky/shell/platform/glfw/window_impl.h",
+ "//flutter/sky/shell/platform/glfw/init_glfw.cc",
+ "//flutter/sky/shell/platform/glfw/init_glfw.h",
+ "//flutter/sky/shell/platform/glfw/message_pump_glfw.cc",
+ "//flutter/sky/shell/platform/glfw/message_pump_glfw.h",
+ "//flutter/sky/shell/platform/glfw/platform_view_glfw.cc",
+ "//flutter/sky/shell/platform/glfw/platform_view_glfw.h",
+ "//flutter/sky/shell/platform/glfw/window_impl.cc",
+ "//flutter/sky/shell/platform/glfw/window_impl.h",
]
deps += [
- "//sky/services/raw_keyboard:interfaces",
+ "//flutter/services/raw_keyboard:interfaces",
"//third_party/glfw",
"//ui/gl",
]
@@ -459,8 +459,8 @@
"//mojo/common",
"//mojo/edk/base_edk",
"//mojo/edk/system",
- "//sky/services/ns_net",
- "//sky/services/vsync",
+ "//flutter/services/ns_net",
+ "//flutter/services/vsync",
":common",
":gpu_direct",
":testing",
diff --git a/sky/shell/diagnostic/diagnostic_server.cc b/sky/shell/diagnostic/diagnostic_server.cc
index 67a913c..ebecd02 100644
--- a/sky/shell/diagnostic/diagnostic_server.cc
+++ b/sky/shell/diagnostic/diagnostic_server.cc
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/diagnostic/diagnostic_server.h"
+#include "flutter/sky/shell/diagnostic/diagnostic_server.h"
#include "dart/runtime/include/dart_api.h"
#include "dart/runtime/include/dart_native_api.h"
-#include "flow/compositor_context.h"
+#include "flutter/flow/compositor_context.h"
#include "lib/ftl/logging.h"
#include "lib/tonic/dart_binding_macros.h"
#include "lib/tonic/dart_library_natives.h"
#include "lib/tonic/logging/dart_invoke.h"
-#include "sky/engine/core/script/embedder_resources.h"
-#include "sky/shell/gpu/picture_serializer.h"
-#include "sky/shell/rasterizer.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/ui/engine.h"
+#include "flutter/sky/engine/core/script/embedder_resources.h"
+#include "flutter/sky/shell/gpu/picture_serializer.h"
+#include "flutter/sky/shell/rasterizer.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/ui/engine.h"
#include "third_party/skia/include/core/SkStream.h"
namespace mojo {
diff --git a/sky/shell/gpu/direct/ganesh_canvas.cc b/sky/shell/gpu/direct/ganesh_canvas.cc
index 08b2a41..9221751 100644
--- a/sky/shell/gpu/direct/ganesh_canvas.cc
+++ b/sky/shell/gpu/direct/ganesh_canvas.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/gpu/direct/ganesh_canvas.h"
+#include "flutter/sky/shell/gpu/direct/ganesh_canvas.h"
#include "lib/ftl/arraysize.h"
#include "lib/ftl/logging.h"
diff --git a/sky/shell/gpu/direct/rasterizer_direct.cc b/sky/shell/gpu/direct/rasterizer_direct.cc
index e849910..7e50109 100644
--- a/sky/shell/gpu/direct/rasterizer_direct.cc
+++ b/sky/shell/gpu/direct/rasterizer_direct.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/gpu/direct/rasterizer_direct.h"
+#include "flutter/sky/shell/gpu/direct/rasterizer_direct.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "sky/engine/wtf/PassRefPtr.h"
-#include "sky/engine/wtf/RefPtr.h"
-#include "sky/shell/gpu/picture_serializer.h"
-#include "sky/shell/platform_view.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/engine/wtf/PassRefPtr.h"
+#include "flutter/sky/engine/wtf/RefPtr.h"
+#include "flutter/sky/shell/gpu/picture_serializer.h"
+#include "flutter/sky/shell/platform_view.h"
+#include "flutter/sky/shell/shell.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPicture.h"
diff --git a/sky/shell/gpu/direct/rasterizer_direct.h b/sky/shell/gpu/direct/rasterizer_direct.h
index 81c7e28..e8b75ac 100644
--- a/sky/shell/gpu/direct/rasterizer_direct.h
+++ b/sky/shell/gpu/direct/rasterizer_direct.h
@@ -5,11 +5,11 @@
#ifndef SKY_SHELL_GPU_DIRECT_RASTERIZER_DIRECT_H_
#define SKY_SHELL_GPU_DIRECT_RASTERIZER_DIRECT_H_
-#include "flow/compositor_context.h"
+#include "flutter/flow/compositor_context.h"
#include "lib/ftl/memory/weak_ptr.h"
#include "lib/ftl/synchronization/waitable_event.h"
-#include "sky/shell/gpu/direct/ganesh_canvas.h"
-#include "sky/shell/rasterizer.h"
+#include "flutter/sky/shell/gpu/direct/ganesh_canvas.h"
+#include "flutter/sky/shell/rasterizer.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/gpu/mojo/gl_texture_recycler.cc b/sky/shell/gpu/mojo/gl_texture_recycler.cc
index bb69338..7f7ce2e 100644
--- a/sky/shell/gpu/mojo/gl_texture_recycler.cc
+++ b/sky/shell/gpu/mojo/gl_texture_recycler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/gpu/mojo/gl_texture_recycler.h"
+#include "flutter/sky/shell/gpu/mojo/gl_texture_recycler.h"
#ifndef GL_GLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES
diff --git a/sky/shell/gpu/mojo/rasterizer_mojo.cc b/sky/shell/gpu/mojo/rasterizer_mojo.cc
index c75e154..317d7d8 100644
--- a/sky/shell/gpu/mojo/rasterizer_mojo.cc
+++ b/sky/shell/gpu/mojo/rasterizer_mojo.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/gpu/mojo/rasterizer_mojo.h"
+#include "flutter/sky/shell/gpu/mojo/rasterizer_mojo.h"
#include <MGL/mgl_echo.h>
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "mojo/gpu/gl_texture.h"
#include "mojo/skia/ganesh_texture_surface.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/shell.h"
#include "third_party/skia/include/core/SkCanvas.h"
namespace sky {
diff --git a/sky/shell/gpu/mojo/rasterizer_mojo.h b/sky/shell/gpu/mojo/rasterizer_mojo.h
index 27e4414..9810957 100644
--- a/sky/shell/gpu/mojo/rasterizer_mojo.h
+++ b/sky/shell/gpu/mojo/rasterizer_mojo.h
@@ -5,14 +5,14 @@
#ifndef SKY_SHELL_GPU_MOJO_RASTERIZER_MOJO_H_
#define SKY_SHELL_GPU_MOJO_RASTERIZER_MOJO_H_
-#include "flow/compositor_context.h"
+#include "flutter/flow/compositor_context.h"
#include "lib/ftl/memory/weak_ptr.h"
#include "mojo/gpu/gl_context.h"
#include "mojo/public/interfaces/application/application_connector.mojom.h"
#include "mojo/services/gfx/composition/interfaces/scenes.mojom.h"
#include "mojo/skia/ganesh_context.h"
-#include "sky/shell/gpu/mojo/gl_texture_recycler.h"
-#include "sky/shell/rasterizer.h"
+#include "flutter/sky/shell/gpu/mojo/gl_texture_recycler.h"
+#include "flutter/sky/shell/rasterizer.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/gpu/picture_serializer.cc b/sky/shell/gpu/picture_serializer.cc
index 31f0db0..3176a0a 100644
--- a/sky/shell/gpu/picture_serializer.cc
+++ b/sky/shell/gpu/picture_serializer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/gpu/picture_serializer.h"
+#include "flutter/sky/shell/gpu/picture_serializer.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkData.h"
diff --git a/sky/shell/platform/android/flutter_main.cc b/sky/shell/platform/android/flutter_main.cc
index ed24c54..430b7ba 100644
--- a/sky/shell/platform/android/flutter_main.cc
+++ b/sky/shell/platform/android/flutter_main.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/android/flutter_main.h"
+#include "flutter/sky/shell/platform/android/flutter_main.h"
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
@@ -21,8 +21,8 @@
#include "jni/FlutterMain_jni.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/simple_platform_support.h"
-#include "sky/shell/shell.h"
-#include "sky/engine/core/start_up.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/engine/core/start_up.h"
#include "dart/runtime/include/dart_tools_api.h"
using base::LazyInstance;
diff --git a/sky/shell/platform/android/library_loader.cc b/sky/shell/platform/android/library_loader.cc
index 7613237..950e700 100644
--- a/sky/shell/platform/android/library_loader.cc
+++ b/sky/shell/platform/android/library_loader.cc
@@ -12,8 +12,8 @@
#include "flutter/lib/jni/dart_jni.h"
#include "mojo/android/system/base_run_loop.h"
#include "mojo/android/system/core_impl.h"
-#include "sky/shell/platform/android/flutter_main.h"
-#include "sky/shell/platform/android/platform_view_android.h"
+#include "flutter/sky/shell/platform/android/flutter_main.h"
+#include "flutter/sky/shell/platform/android/platform_view_android.h"
namespace {
diff --git a/sky/shell/platform/android/platform_view_android.cc b/sky/shell/platform/android/platform_view_android.cc
index 6e0756c..66be5b1 100644
--- a/sky/shell/platform/android/platform_view_android.cc
+++ b/sky/shell/platform/android/platform_view_android.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/android/platform_view_android.h"
+#include "flutter/sky/shell/platform/android/platform_view_android.h"
#include <EGL/egl.h>
@@ -15,9 +15,9 @@
#include "base/location.h"
#include "base/trace_event/trace_event.h"
#include "jni/FlutterView_jni.h"
-#include "sky/engine/core/script/dart_service_isolate.h"
-#include "sky/engine/wtf/MakeUnique.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/engine/core/script/dart_service_isolate.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/android/platform_view_android.h b/sky/shell/platform/android/platform_view_android.h
index 07e7b73..2cdf7f3 100644
--- a/sky/shell/platform/android/platform_view_android.h
+++ b/sky/shell/platform/android/platform_view_android.h
@@ -7,7 +7,7 @@
#include "base/android/jni_android.h"
#include "lib/ftl/memory/weak_ptr.h"
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/glfw/init_glfw.cc b/sky/shell/platform/glfw/init_glfw.cc
index a245bf6..539fc54 100644
--- a/sky/shell/platform/glfw/init_glfw.cc
+++ b/sky/shell/platform/glfw/init_glfw.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/glfw/init_glfw.h"
+#include "flutter/sky/shell/platform/glfw/init_glfw.h"
#include <GLFW/glfw3.h>
#include <memory>
#include <string>
#include "base/command_line.h"
-#include "sky/shell/platform/glfw/platform_view_glfw.h"
-#include "sky/shell/platform/glfw/window_impl.h"
-#include "sky/shell/switches.h"
+#include "flutter/sky/shell/platform/glfw/platform_view_glfw.h"
+#include "flutter/sky/shell/platform/glfw/window_impl.h"
+#include "flutter/sky/shell/switches.h"
#include "ui/gl/gl_surface.h"
namespace sky {
diff --git a/sky/shell/platform/glfw/message_pump_glfw.cc b/sky/shell/platform/glfw/message_pump_glfw.cc
index a52ed37..ac5763b 100644
--- a/sky/shell/platform/glfw/message_pump_glfw.cc
+++ b/sky/shell/platform/glfw/message_pump_glfw.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/glfw/message_pump_glfw.h"
+#include "flutter/sky/shell/platform/glfw/message_pump_glfw.h"
#include <GLFW/glfw3.h>
diff --git a/sky/shell/platform/glfw/platform_view_glfw.cc b/sky/shell/platform/glfw/platform_view_glfw.cc
index 4c8d2a1..4f5963a 100644
--- a/sky/shell/platform/glfw/platform_view_glfw.cc
+++ b/sky/shell/platform/glfw/platform_view_glfw.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/glfw/platform_view_glfw.h"
+#include "flutter/sky/shell/platform/glfw/platform_view_glfw.h"
-#include "sky/shell/gpu/direct/surface_notifications_direct.h"
+#include "flutter/sky/shell/gpu/direct/surface_notifications_direct.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/glfw/platform_view_glfw.h b/sky/shell/platform/glfw/platform_view_glfw.h
index 1a37573..32d98fc 100644
--- a/sky/shell/platform/glfw/platform_view_glfw.h
+++ b/sky/shell/platform/glfw/platform_view_glfw.h
@@ -5,7 +5,7 @@
#ifndef SKY_SHELL_PLATFORM_GLFW_PLATFORM_VIEW_GLFW_H_
#define SKY_SHELL_PLATFORM_GLFW_PLATFORM_VIEW_GLFW_H_
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/glfw/window_impl.cc b/sky/shell/platform/glfw/window_impl.cc
index 1b0c4cc..46e10a3 100644
--- a/sky/shell/platform/glfw/window_impl.cc
+++ b/sky/shell/platform/glfw/window_impl.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/glfw/window_impl.h"
+#include "flutter/sky/shell/platform/glfw/window_impl.h"
#include <GLFW/glfw3.h>
-#include "sky/shell/platform/glfw/platform_view_glfw.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/platform/glfw/platform_view_glfw.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/glfw/window_impl.h b/sky/shell/platform/glfw/window_impl.h
index cf214f2..5218dc0 100644
--- a/sky/shell/platform/glfw/window_impl.h
+++ b/sky/shell/platform/glfw/window_impl.h
@@ -9,10 +9,10 @@
#include <string>
#include "mojo/common/binding_set.h"
-#include "sky/services/engine/sky_engine.mojom.h"
-#include "sky/services/raw_keyboard/raw_keyboard.mojom.h"
-#include "sky/shell/platform_view.h"
-#include "sky/shell/shell_view.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
+#include "flutter/services/raw_keyboard/raw_keyboard.mojom.h"
+#include "flutter/sky/shell/platform_view.h"
+#include "flutter/sky/shell/shell_view.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/ios/framework/Source/FlutterAppDelegate.mm b/sky/shell/platform/ios/framework/Source/FlutterAppDelegate.mm
index 686bb8c..8781df8 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterAppDelegate.mm
+++ b/sky/shell/platform/ios/framework/Source/FlutterAppDelegate.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Headers/FlutterAppDelegate.h"
+#include "flutter/sky/shell/platform/ios/framework/Headers/FlutterAppDelegate.h"
@implementation FlutterAppDelegate
diff --git a/sky/shell/platform/ios/framework/Source/FlutterDartProject.mm b/sky/shell/platform/ios/framework/Source/FlutterDartProject.mm
index d6def01..be6790b 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterDartProject.mm
+++ b/sky/shell/platform/ios/framework/Source/FlutterDartProject.mm
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h"
#include "base/command_line.h"
#include "dart/runtime/include/dart_api.h"
-#include "sky/shell/platform/ios/framework/Source/FlutterDartSource.h"
-#include "sky/shell/switches.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterDartSource.h"
+#include "flutter/sky/shell/switches.h"
static NSURL* URLForSwitch(const char* name) {
auto cmd = *base::CommandLine::ForCurrentProcess();
diff --git a/sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h b/sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h
index 534f595..60c0059 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h
+++ b/sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h
@@ -5,9 +5,9 @@
#ifndef SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
-#include "sky/shell/platform/ios/framework/Headers/FlutterDartProject.h"
+#include "flutter/sky/shell/platform/ios/framework/Headers/FlutterDartProject.h"
-#include "sky/services/engine/sky_engine.mojom.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
enum VMType {
// An invalid VM configuration.
diff --git a/sky/shell/platform/ios/framework/Source/FlutterDartSource.mm b/sky/shell/platform/ios/framework/Source/FlutterDartSource.mm
index 4187c41..bedac87 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterDartSource.mm
+++ b/sky/shell/platform/ios/framework/Source/FlutterDartSource.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/FlutterDartSource.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterDartSource.h"
@implementation FlutterDartSource
diff --git a/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h b/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h
index 85c6e94..7ad5a0b 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h
+++ b/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h
@@ -6,7 +6,7 @@
#define SKY_SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_DYNAMIC_SERVICE_LOADER_H_
#import <Foundation/Foundation.h>
-#include "sky/shell/platform/mac/platform_service_provider.h"
+#include "flutter/sky/shell/platform/mac/platform_service_provider.h"
@interface FlutterDynamicServiceLoader : NSObject
diff --git a/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.mm b/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.mm
index d26a61e..ffae410 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.mm
+++ b/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.mm
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h"
#include "base/logging.h"
-#include "sky/services/dynamic/dynamic_service_embedder.h"
-#include "sky/services/dynamic/dynamic_service_definition.h"
+#include "flutter/services/dynamic/dynamic_service_embedder.h"
+#include "flutter/services/dynamic/dynamic_service_definition.h"
#include <Foundation/Foundation.h>
#include <dlfcn.h>
diff --git a/sky/shell/platform/ios/framework/Source/FlutterView.mm b/sky/shell/platform/ios/framework/Source/FlutterView.mm
index 223f135..30081f7 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterView.mm
+++ b/sky/shell/platform/ios/framework/Source/FlutterView.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/FlutterView.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterView.h"
@interface FlutterView ()<UIInputViewAudioFeedback>
diff --git a/sky/shell/platform/ios/framework/Source/FlutterViewController.mm b/sky/shell/platform/ios/framework/Source/FlutterViewController.mm
index 1179c35..a9a4314 100644
--- a/sky/shell/platform/ios/framework/Source/FlutterViewController.mm
+++ b/sky/shell/platform/ios/framework/Source/FlutterViewController.mm
@@ -13,23 +13,23 @@
#include "dart/runtime/include/dart_api.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "sky/engine/wtf/MakeUnique.h"
-#include "sky/services/engine/sky_engine.mojom.h"
-#include "sky/services/platform/app_messages.mojom.h"
-#include "sky/services/platform/ios/system_chrome_impl.h"
-#include "sky/services/semantics/semantics.mojom.h"
-#include "sky/shell/platform/ios/framework/Source/accessibility_bridge.h"
-#include "sky/shell/platform/ios/framework/Source/application_messages_impl.h"
-#include "sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h"
-#include "sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h"
-#include "sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h"
-#include "sky/shell/platform/ios/framework/Source/FlutterView.h"
-#include "sky/shell/platform/ios/platform_view_ios.h"
-#include "sky/shell/platform/mac/platform_mac.h"
-#include "sky/shell/platform/mac/platform_service_provider.h"
-#include "sky/shell/platform/mac/view_service_provider.h"
-#include "sky/shell/platform_view.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
+#include "flutter/services/platform/app_messages.mojom.h"
+#include "flutter/services/platform/ios/system_chrome_impl.h"
+#include "flutter/services/semantics/semantics.mojom.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/accessibility_bridge.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/application_messages_impl.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterDartProject_Internal.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterDynamicServiceLoader.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterView.h"
+#include "flutter/sky/shell/platform/ios/platform_view_ios.h"
+#include "flutter/sky/shell/platform/mac/platform_mac.h"
+#include "flutter/sky/shell/platform/mac/platform_service_provider.h"
+#include "flutter/sky/shell/platform/mac/view_service_provider.h"
+#include "flutter/sky/shell/platform_view.h"
+#include "flutter/sky/shell/shell.h"
@interface FlutterViewController ()<UIAlertViewDelegate>
@end
diff --git a/sky/shell/platform/ios/framework/Source/accessibility_bridge.h b/sky/shell/platform/ios/framework/Source/accessibility_bridge.h
index bec8c1e..dd3f73f 100644
--- a/sky/shell/platform/ios/framework/Source/accessibility_bridge.h
+++ b/sky/shell/platform/ios/framework/Source/accessibility_bridge.h
@@ -13,9 +13,9 @@
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "sky/engine/platform/geometry/FloatRect.h"
-#include "sky/services/semantics/semantics.mojom.h"
-#include "sky/shell/platform/ios/framework/Source/FlutterView.h"
+#include "flutter/sky/engine/platform/geometry/FloatRect.h"
+#include "flutter/services/semantics/semantics.mojom.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/FlutterView.h"
#include "third_party/skia/include/core/SkMatrix44.h"
#include "third_party/skia/include/core/SkRect.h"
diff --git a/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm b/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm
index 238939c..f73783b 100644
--- a/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm
+++ b/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/accessibility_bridge.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/accessibility_bridge.h"
#import <UIKit/UIKit.h>
#include <vector>
diff --git a/sky/shell/platform/ios/framework/Source/application_messages_impl.h b/sky/shell/platform/ios/framework/Source/application_messages_impl.h
index b3eaa8f..06073e3 100644
--- a/sky/shell/platform/ios/framework/Source/application_messages_impl.h
+++ b/sky/shell/platform/ios/framework/Source/application_messages_impl.h
@@ -9,9 +9,9 @@
#include "lib/ftl/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "sky/services/platform/app_messages.mojom.h"
-#include "sky/shell/platform/ios/framework/Headers/FlutterAsyncMessageListener.h"
-#include "sky/shell/platform/ios/framework/Headers/FlutterMessageListener.h"
+#include "flutter/services/platform/app_messages.mojom.h"
+#include "flutter/sky/shell/platform/ios/framework/Headers/FlutterAsyncMessageListener.h"
+#include "flutter/sky/shell/platform/ios/framework/Headers/FlutterMessageListener.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/ios/framework/Source/application_messages_impl.mm b/sky/shell/platform/ios/framework/Source/application_messages_impl.mm
index bbf383d..f62b196 100644
--- a/sky/shell/platform/ios/framework/Source/application_messages_impl.mm
+++ b/sky/shell/platform/ios/framework/Source/application_messages_impl.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/application_messages_impl.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/application_messages_impl.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/sky/shell/platform/ios/framework/Source/flutter_touch_mapper.mm b/sky/shell/platform/ios/framework/Source/flutter_touch_mapper.mm
index e030ccf..35e88b6 100644
--- a/sky/shell/platform/ios/framework/Source/flutter_touch_mapper.mm
+++ b/sky/shell/platform/ios/framework/Source/flutter_touch_mapper.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h"
+#include "flutter/sky/shell/platform/ios/framework/Source/flutter_touch_mapper.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/ios/platform_view_ios.h b/sky/shell/platform/ios/platform_view_ios.h
index 9c63e24..081b692 100644
--- a/sky/shell/platform/ios/platform_view_ios.h
+++ b/sky/shell/platform/ios/platform_view_ios.h
@@ -10,7 +10,7 @@
#include "base/mac/scoped_nsobject.h"
#include "lib/ftl/macros.h"
#include "lib/ftl/memory/weak_ptr.h"
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
@class CAEAGLLayer;
diff --git a/sky/shell/platform/ios/platform_view_ios.mm b/sky/shell/platform/ios/platform_view_ios.mm
index 9acd6f3..42d15b3 100644
--- a/sky/shell/platform/ios/platform_view_ios.mm
+++ b/sky/shell/platform/ios/platform_view_ios.mm
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/ios/platform_view_ios.h"
+#include "flutter/sky/shell/platform/ios/platform_view_ios.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/trace_event/trace_event.h"
-#include "sky/engine/wtf/MakeUnique.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
#import <OpenGLES/ES2/gl.h>
#import <OpenGLES/ES2/glext.h>
diff --git a/sky/shell/platform/linux/main_linux.cc b/sky/shell/platform/linux/main_linux.cc
index b7c1b33..7f38b53 100644
--- a/sky/shell/platform/linux/main_linux.cc
+++ b/sky/shell/platform/linux/main_linux.cc
@@ -10,13 +10,13 @@
#include "base/message_loop/message_loop.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/simple_platform_support.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/switches.h"
-#include "sky/shell/testing/testing.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/switches.h"
+#include "flutter/sky/shell/testing/testing.h"
#if defined(USE_GLFW)
-#include "sky/shell/platform/glfw/init_glfw.h"
-#include "sky/shell/platform/glfw/message_pump_glfw.h"
+#include "flutter/sky/shell/platform/glfw/init_glfw.h"
+#include "flutter/sky/shell/platform/glfw/message_pump_glfw.h"
#endif
namespace {
diff --git a/sky/shell/platform/linux/platform_view_linux.cc b/sky/shell/platform/linux/platform_view_linux.cc
index 2c20ce8..0955ac9 100644
--- a/sky/shell/platform/linux/platform_view_linux.cc
+++ b/sky/shell/platform/linux/platform_view_linux.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/linux/platform_view_linux.h"
+#include "flutter/sky/shell/platform/linux/platform_view_linux.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/linux/platform_view_linux.h b/sky/shell/platform/linux/platform_view_linux.h
index 0b2f4e0..1b10ee0 100644
--- a/sky/shell/platform/linux/platform_view_linux.h
+++ b/sky/shell/platform/linux/platform_view_linux.h
@@ -5,7 +5,7 @@
#ifndef SKY_SHELL_PLATFORM_LINUX_PLATFORM_VIEW_LINUX_H_
#define SKY_SHELL_PLATFORM_LINUX_PLATFORM_VIEW_LINUX_H_
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mac/main_mac.mm b/sky/shell/platform/mac/main_mac.mm
index 8f57340..db8510e 100644
--- a/sky/shell/platform/mac/main_mac.mm
+++ b/sky/shell/platform/mac/main_mac.mm
@@ -7,10 +7,10 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
-#include "sky/shell/platform/mac/platform_mac.h"
-#include "sky/shell/platform/mac/sky_application.h"
-#include "sky/shell/switches.h"
-#include "sky/shell/testing/testing.h"
+#include "flutter/sky/shell/platform/mac/platform_mac.h"
+#include "flutter/sky/shell/platform/mac/sky_application.h"
+#include "flutter/sky/shell/switches.h"
+#include "flutter/sky/shell/testing/testing.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mac/platform_mac.h b/sky/shell/platform/mac/platform_mac.h
index 48f5629..8a1161a 100644
--- a/sky/shell/platform/mac/platform_mac.h
+++ b/sky/shell/platform/mac/platform_mac.h
@@ -5,7 +5,7 @@
#ifndef SKY_SHELL_PLATFORM_MAC_PLATFORM_MAC_H_
#define SKY_SHELL_PLATFORM_MAC_PLATFORM_MAC_H_
-#include "sky/services/engine/sky_engine.mojom.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mac/platform_mac.mm b/sky/shell/platform/mac/platform_mac.mm
index 7c2d592..69079e1 100644
--- a/sky/shell/platform/mac/platform_mac.mm
+++ b/sky/shell/platform/mac/platform_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mac/platform_mac.h"
+#include "flutter/sky/shell/platform/mac/platform_mac.h"
#include <Foundation/Foundation.h>
@@ -18,12 +18,12 @@
#include "dart/runtime/include/dart_tools_api.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/simple_platform_support.h"
-#include "sky/engine/core/start_up.h"
-#include "sky/engine/wtf/MakeUnique.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/switches.h"
-#include "sky/shell/tracing_controller.h"
-#include "sky/shell/ui_delegate.h"
+#include "flutter/sky/engine/core/start_up.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/switches.h"
+#include "flutter/sky/shell/tracing_controller.h"
+#include "flutter/sky/shell/ui_delegate.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mac/platform_service_provider.cc b/sky/shell/platform/mac/platform_service_provider.cc
index de6ef39..3924704 100644
--- a/sky/shell/platform/mac/platform_service_provider.cc
+++ b/sky/shell/platform/mac/platform_service_provider.cc
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mac/platform_service_provider.h"
+#include "flutter/sky/shell/platform/mac/platform_service_provider.h"
#if TARGET_OS_IPHONE
-#include "sky/services/activity/ios/activity_impl.h"
-#include "sky/services/editing/ios/clipboard_impl.h"
-#include "sky/services/media/ios/media_player_impl.h"
-#include "sky/services/media/ios/media_service_impl.h"
-#include "sky/services/platform/ios/haptic_feedback_impl.h"
-#include "sky/services/platform/ios/path_provider_impl.h"
-#include "sky/services/platform/ios/system_chrome_impl.h"
-#include "sky/services/platform/ios/system_sound_impl.h"
-#include "sky/services/platform/ios/url_launcher_impl.h"
-#include "sky/services/vsync/ios/vsync_provider_ios_impl.h"
+#include "flutter/services/activity/ios/activity_impl.h"
+#include "flutter/services/editing/ios/clipboard_impl.h"
+#include "flutter/services/media/ios/media_player_impl.h"
+#include "flutter/services/media/ios/media_service_impl.h"
+#include "flutter/services/platform/ios/haptic_feedback_impl.h"
+#include "flutter/services/platform/ios/path_provider_impl.h"
+#include "flutter/services/platform/ios/system_chrome_impl.h"
+#include "flutter/services/platform/ios/system_sound_impl.h"
+#include "flutter/services/platform/ios/url_launcher_impl.h"
+#include "flutter/services/vsync/ios/vsync_provider_ios_impl.h"
#else
-#include "sky/services/vsync/mac/vsync_provider_mac_impl.h"
+#include "flutter/services/vsync/mac/vsync_provider_mac_impl.h"
#endif // TARGET_OS_IPHONE
-#include "sky/services/ns_net/network_service_impl.h"
+#include "flutter/services/ns_net/network_service_impl.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mac/platform_view_mac.h b/sky/shell/platform/mac/platform_view_mac.h
index f3ebe60..28eaac4 100644
--- a/sky/shell/platform/mac/platform_view_mac.h
+++ b/sky/shell/platform/mac/platform_view_mac.h
@@ -7,7 +7,7 @@
#include "base/mac/scoped_nsobject.h"
#include "lib/ftl/memory/weak_ptr.h"
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
@class NSOpenGLView;
@class NSOpenGLContext;
diff --git a/sky/shell/platform/mac/platform_view_mac.mm b/sky/shell/platform/mac/platform_view_mac.mm
index 3222e91..6855434 100644
--- a/sky/shell/platform/mac/platform_view_mac.mm
+++ b/sky/shell/platform/mac/platform_view_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mac/platform_view_mac.h"
+#include "flutter/sky/shell/platform/mac/platform_view_mac.h"
#include <AppKit/AppKit.h>
diff --git a/sky/shell/platform/mac/sky_application.mm b/sky/shell/platform/mac/sky_application.mm
index 71d5919..3fbd8fb 100644
--- a/sky/shell/platform/mac/sky_application.mm
+++ b/sky/shell/platform/mac/sky_application.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mac/sky_application.h"
+#include "flutter/sky/shell/platform/mac/sky_application.h"
#include "base/auto_reset.h"
#include "base/logging.h"
diff --git a/sky/shell/platform/mac/sky_window.mm b/sky/shell/platform/mac/sky_window.mm
index fa507e9..96dc5a1 100644
--- a/sky/shell/platform/mac/sky_window.mm
+++ b/sky/shell/platform/mac/sky_window.mm
@@ -6,15 +6,15 @@
#include "base/command_line.h"
#include "base/time/time.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "sky/services/engine/input_event.mojom.h"
-#include "sky/services/pointer/pointer.mojom.h"
-#include "sky/shell/platform/mac/platform_mac.h"
-#include "sky/shell/platform/mac/platform_view_mac.h"
-#include "sky/shell/platform/mac/platform_service_provider.h"
-#include "sky/shell/platform/mac/view_service_provider.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/switches.h"
-#include "sky/shell/ui_delegate.h"
+#include "flutter/services/engine/input_event.mojom.h"
+#include "flutter/services/pointer/pointer.mojom.h"
+#include "flutter/sky/shell/platform/mac/platform_mac.h"
+#include "flutter/sky/shell/platform/mac/platform_view_mac.h"
+#include "flutter/sky/shell/platform/mac/platform_service_provider.h"
+#include "flutter/sky/shell/platform/mac/view_service_provider.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/switches.h"
+#include "flutter/sky/shell/ui_delegate.h"
static void IgnoreRequest(
mojo::InterfaceRequest<flutter::platform::ApplicationMessages>) {
diff --git a/sky/shell/platform/mac/view_service_provider.cc b/sky/shell/platform/mac/view_service_provider.cc
index 8359240..5f9be52 100644
--- a/sky/shell/platform/mac/view_service_provider.cc
+++ b/sky/shell/platform/mac/view_service_provider.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mac/view_service_provider.h"
+#include "flutter/sky/shell/platform/mac/view_service_provider.h"
#include <utility>
diff --git a/sky/shell/platform/mac/view_service_provider.h b/sky/shell/platform/mac/view_service_provider.h
index 3f968e9..816c79c 100644
--- a/sky/shell/platform/mac/view_service_provider.h
+++ b/sky/shell/platform/mac/view_service_provider.h
@@ -10,11 +10,11 @@
#include "lib/ftl/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "sky/engine/wtf/Assertions.h"
-#include "sky/services/platform/app_messages.mojom.h"
+#include "flutter/sky/engine/wtf/Assertions.h"
+#include "flutter/services/platform/app_messages.mojom.h"
#if TARGET_OS_IPHONE
-#include "sky/services/editing/ios/keyboard_impl.h"
+#include "flutter/services/editing/ios/keyboard_impl.h"
#endif
namespace sky {
diff --git a/sky/shell/platform/mojo/BUILD.gn b/sky/shell/platform/mojo/BUILD.gn
index 9bb0f7e..6eb89c9 100644
--- a/sky/shell/platform/mojo/BUILD.gn
+++ b/sky/shell/platform/mojo/BUILD.gn
@@ -36,13 +36,13 @@
"//mojo/services/input_events/interfaces",
"//mojo/services/ui/input/interfaces",
"//mojo/services/ui/views/interfaces",
- "//services/icu",
- "//skia",
- "//sky/engine/public/sky",
- "//sky/engine/web",
- "//sky/services/raw_keyboard:interfaces",
- "//sky/shell:common",
- "//sky/shell:gpu_mojo",
+ "//flutter/services/icu",
+ "//flutter/skia",
+ "//flutter/sky/engine/public/sky",
+ "//flutter/sky/engine/web",
+ "//flutter/services/raw_keyboard:interfaces",
+ "//flutter/sky/shell:common",
+ "//flutter/sky/shell:gpu_mojo",
"//third_party/icu",
]
diff --git a/sky/shell/platform/mojo/application_impl.cc b/sky/shell/platform/mojo/application_impl.cc
index 530373e..cc10ebf 100644
--- a/sky/shell/platform/mojo/application_impl.cc
+++ b/sky/shell/platform/mojo/application_impl.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mojo/application_impl.h"
+#include "flutter/sky/shell/platform/mojo/application_impl.h"
#include "base/files/file_util.h"
#include "mojo/data_pipe_utils/data_pipe_utils.h"
#include "mojo/public/cpp/application/connect.h"
-#include "sky/shell/platform/mojo/view_impl.h"
+#include "flutter/sky/shell/platform/mojo/view_impl.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/application_impl.h b/sky/shell/platform/mojo/application_impl.h
index 789b851..54fcb96 100644
--- a/sky/shell/platform/mojo/application_impl.h
+++ b/sky/shell/platform/mojo/application_impl.h
@@ -10,7 +10,7 @@
#include "mojo/public/interfaces/application/application.mojom.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
-#include "sky/shell/platform/mojo/platform_view_mojo.h"
+#include "flutter/sky/shell/platform/mojo/platform_view_mojo.h"
#include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
diff --git a/sky/shell/platform/mojo/content_handler_impl.cc b/sky/shell/platform/mojo/content_handler_impl.cc
index 9094f61..ac0c8fe 100644
--- a/sky/shell/platform/mojo/content_handler_impl.cc
+++ b/sky/shell/platform/mojo/content_handler_impl.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mojo/content_handler_impl.h"
+#include "flutter/sky/shell/platform/mojo/content_handler_impl.h"
-#include "sky/shell/platform/mojo/application_impl.h"
+#include "flutter/sky/shell/platform/mojo/application_impl.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/main_mojo.cc b/sky/shell/platform/mojo/main_mojo.cc
index aa28be1..baefe79 100644
--- a/sky/shell/platform/mojo/main_mojo.cc
+++ b/sky/shell/platform/mojo/main_mojo.cc
@@ -13,10 +13,10 @@
#include "mojo/public/cpp/application/run_application.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
-#include "services/icu/icu.h"
-#include "sky/engine/public/platform/sky_settings.h"
-#include "sky/shell/platform/mojo/content_handler_impl.h"
-#include "sky/shell/shell.h"
+#include "flutter/services/icu/icu.h"
+#include "flutter/sky/engine/public/platform/sky_settings.h"
+#include "flutter/sky/shell/platform/mojo/content_handler_impl.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/platform_view_mojo.cc b/sky/shell/platform/mojo/platform_view_mojo.cc
index fc6ed5f..3fd0437 100644
--- a/sky/shell/platform/mojo/platform_view_mojo.cc
+++ b/sky/shell/platform/mojo/platform_view_mojo.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mojo/platform_view_mojo.h"
+#include "flutter/sky/shell/platform/mojo/platform_view_mojo.h"
-#include "glue/movable_wrapper.h"
-#include "sky/shell/gpu/mojo/rasterizer_mojo.h"
+#include "flutter/glue/movable_wrapper.h"
+#include "flutter/sky/shell/gpu/mojo/rasterizer_mojo.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/platform_view_mojo.h b/sky/shell/platform/mojo/platform_view_mojo.h
index 51c2ef5..19b34e8 100644
--- a/sky/shell/platform/mojo/platform_view_mojo.h
+++ b/sky/shell/platform/mojo/platform_view_mojo.h
@@ -11,7 +11,7 @@
#include "lib/ftl/memory/weak_ptr.h"
#include "mojo/public/interfaces/application/application_connector.mojom.h"
#include "mojo/services/gfx/composition/interfaces/scenes.mojom.h"
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/pointer_converter_mojo.cc b/sky/shell/platform/mojo/pointer_converter_mojo.cc
index 06a3798..6586513 100644
--- a/sky/shell/platform/mojo/pointer_converter_mojo.cc
+++ b/sky/shell/platform/mojo/pointer_converter_mojo.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mojo/pointer_converter_mojo.h"
+#include "flutter/sky/shell/platform/mojo/pointer_converter_mojo.h"
#include "base/logging.h"
diff --git a/sky/shell/platform/mojo/pointer_converter_mojo.h b/sky/shell/platform/mojo/pointer_converter_mojo.h
index f2f2545..2b073fd 100644
--- a/sky/shell/platform/mojo/pointer_converter_mojo.h
+++ b/sky/shell/platform/mojo/pointer_converter_mojo.h
@@ -9,7 +9,7 @@
#include "lib/ftl/macros.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "sky/services/pointer/pointer.mojom.h"
+#include "flutter/services/pointer/pointer.mojom.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/view_impl.cc b/sky/shell/platform/mojo/view_impl.cc
index 436fb8b..024b80f 100644
--- a/sky/shell/platform/mojo/view_impl.cc
+++ b/sky/shell/platform/mojo/view_impl.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform/mojo/view_impl.h"
+#include "flutter/sky/shell/platform/mojo/view_impl.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/services/gfx/composition/interfaces/scheduling.mojom.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform/mojo/view_impl.h b/sky/shell/platform/mojo/view_impl.h
index 01192c5..8c908ef 100644
--- a/sky/shell/platform/mojo/view_impl.h
+++ b/sky/shell/platform/mojo/view_impl.h
@@ -16,9 +16,9 @@
#include "mojo/services/ui/views/interfaces/view_manager.mojom.h"
#include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
#include "mojo/services/ui/views/interfaces/views.mojom.h"
-#include "sky/services/raw_keyboard/raw_keyboard.mojom.h"
-#include "sky/shell/platform/mojo/platform_view_mojo.h"
-#include "sky/shell/platform/mojo/pointer_converter_mojo.h"
+#include "flutter/services/raw_keyboard/raw_keyboard.mojom.h"
+#include "flutter/sky/shell/platform/mojo/platform_view_mojo.h"
+#include "flutter/sky/shell/platform/mojo/pointer_converter_mojo.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform_view.cc b/sky/shell/platform_view.cc
index 2b8ab53..7c63ffd 100644
--- a/sky/shell/platform_view.cc
+++ b/sky/shell/platform_view.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
#include <utility>
#include "flutter/lib/ui/painting/resource_context.h"
-#include "glue/movable_wrapper.h"
-#include "sky/shell/rasterizer.h"
+#include "flutter/glue/movable_wrapper.h"
+#include "flutter/sky/shell/rasterizer.h"
#include "third_party/skia/include/gpu/gl/GrGLInterface.h"
namespace sky {
diff --git a/sky/shell/platform_view.h b/sky/shell/platform_view.h
index 759549e..a9b2a6c 100644
--- a/sky/shell/platform_view.h
+++ b/sky/shell/platform_view.h
@@ -10,9 +10,9 @@
#include "lib/ftl/macros.h"
#include "lib/ftl/memory/weak_ptr.h"
#include "lib/ftl/synchronization/waitable_event.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/ui_delegate.h"
-#include "sky/shell/ui/engine.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/ui_delegate.h"
+#include "flutter/sky/shell/ui/engine.h"
#include "third_party/skia/include/core/SkSize.h"
#include "third_party/skia/include/gpu/GrContext.h"
diff --git a/sky/shell/platform_view_service_protocol.cc b/sky/shell/platform_view_service_protocol.cc
index 4964ea2..dfe9a6b 100644
--- a/sky/shell/platform_view_service_protocol.cc
+++ b/sky/shell/platform_view_service_protocol.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/platform_view_service_protocol.h"
+#include "flutter/sky/shell/platform_view_service_protocol.h"
#include <string.h>
#include <string>
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/platform_view_service_protocol.h b/sky/shell/platform_view_service_protocol.h
index 475c5a4..b80fbbf 100644
--- a/sky/shell/platform_view_service_protocol.h
+++ b/sky/shell/platform_view_service_protocol.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
#include "dart/runtime/include/dart_tools_api.h"
namespace sky {
diff --git a/sky/shell/rasterizer.cc b/sky/shell/rasterizer.cc
index 222514d..65de878 100644
--- a/sky/shell/rasterizer.cc
+++ b/sky/shell/rasterizer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/rasterizer.h"
+#include "flutter/sky/shell/rasterizer.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/rasterizer.h b/sky/shell/rasterizer.h
index dfb24da..6a3ecbc 100644
--- a/sky/shell/rasterizer.h
+++ b/sky/shell/rasterizer.h
@@ -7,12 +7,12 @@
#include <memory>
-#include "flow/layers/layer_tree.h"
+#include "flutter/flow/layers/layer_tree.h"
#include "lib/ftl/memory/weak_ptr.h"
#include "lib/ftl/synchronization/waitable_event.h"
#include "lib/ftl/functional/closure.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "sky/services/rasterizer/rasterizer.mojom.h"
+#include "flutter/services/rasterizer/rasterizer.mojom.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/shell.cc b/sky/shell/shell.cc
index 52af493..e93102b 100644
--- a/sky/shell/shell.cc
+++ b/sky/shell/shell.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/shell.h"
#include <fcntl.h>
#include <memory>
@@ -18,16 +18,16 @@
#include "base/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "dart/runtime/include/dart_tools_api.h"
-#include "glue/task_runner_adaptor.h"
+#include "flutter/glue/task_runner_adaptor.h"
#include "lib/ftl/files/unique_fd.h"
#include "mojo/message_pump/message_pump_mojo.h"
-#include "skia/ext/event_tracer_impl.h"
-#include "sky/engine/core/script/dart_init.h"
-#include "sky/engine/public/platform/sky_settings.h"
-#include "sky/shell/diagnostic/diagnostic_server.h"
-#include "sky/shell/platform_view_service_protocol.h"
-#include "sky/shell/switches.h"
-#include "sky/shell/ui/engine.h"
+#include "flutter/skia/ext/event_tracer_impl.h"
+#include "flutter/sky/engine/core/script/dart_init.h"
+#include "flutter/sky/engine/public/platform/sky_settings.h"
+#include "flutter/sky/shell/diagnostic/diagnostic_server.h"
+#include "flutter/sky/shell/platform_view_service_protocol.h"
+#include "flutter/sky/shell/switches.h"
+#include "flutter/sky/shell/ui/engine.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/shell.h b/sky/shell/shell.h
index 6c8509e..a894ee1 100644
--- a/sky/shell/shell.h
+++ b/sky/shell/shell.h
@@ -11,7 +11,7 @@
#include "lib/ftl/memory/weak_ptr.h"
#include "lib/ftl/synchronization/waitable_event.h"
#include "lib/ftl/tasks/task_runner.h"
-#include "sky/shell/tracing_controller.h"
+#include "flutter/sky/shell/tracing_controller.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/switches.cc b/sky/shell/switches.cc
index d949cf1..484db7d 100644
--- a/sky/shell/switches.cc
+++ b/sky/shell/switches.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/switches.h"
+#include "flutter/sky/shell/switches.h"
#include <iostream>
diff --git a/sky/shell/testing/platform_view_test.cc b/sky/shell/testing/platform_view_test.cc
index ef3d3a1..37b51b3 100644
--- a/sky/shell/testing/platform_view_test.cc
+++ b/sky/shell/testing/platform_view_test.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/testing/platform_view_test.h"
+#include "flutter/sky/shell/testing/platform_view_test.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/testing/platform_view_test.h b/sky/shell/testing/platform_view_test.h
index 3dd5e01..1bf8a5e 100644
--- a/sky/shell/testing/platform_view_test.h
+++ b/sky/shell/testing/platform_view_test.h
@@ -7,7 +7,7 @@
#include "lib/ftl/macros.h"
#include "lib/ftl/memory/weak_ptr.h"
-#include "sky/shell/platform_view.h"
+#include "flutter/sky/shell/platform_view.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/testing/test_runner.cc b/sky/shell/testing/test_runner.cc
index d9246d7..bb0c295 100644
--- a/sky/shell/testing/test_runner.cc
+++ b/sky/shell/testing/test_runner.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/testing/test_runner.h"
+#include "flutter/sky/shell/testing/test_runner.h"
#include <iostream>
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
-#include "sky/shell/platform_view.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/testing/platform_view_test.h"
+#include "flutter/sky/shell/platform_view.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/testing/platform_view_test.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/testing/test_runner.h b/sky/shell/testing/test_runner.h
index 9258e90..3838708 100644
--- a/sky/shell/testing/test_runner.h
+++ b/sky/shell/testing/test_runner.h
@@ -11,7 +11,7 @@
#include "lib/ftl/macros.h"
#include "lib/ftl/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "sky/services/engine/sky_engine.mojom.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/testing/testing.cc b/sky/shell/testing/testing.cc
index 5f46a49..8d4f78e 100644
--- a/sky/shell/testing/testing.cc
+++ b/sky/shell/testing/testing.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/testing/testing.h"
+#include "flutter/sky/shell/testing/testing.h"
#include "base/command_line.h"
-#include "sky/shell/switches.h"
-#include "sky/shell/testing/test_runner.h"
+#include "flutter/sky/shell/switches.h"
+#include "flutter/sky/shell/testing/test_runner.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/tracing_controller.cc b/sky/shell/tracing_controller.cc
index c0a414d..d584d00 100644
--- a/sky/shell/tracing_controller.cc
+++ b/sky/shell/tracing_controller.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/tracing_controller.h"
+#include "flutter/sky/shell/tracing_controller.h"
#include "base/trace_event/trace_event.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "lib/ftl/logging.h"
-#include "sky/engine/core/script/dart_init.h"
-#include "sky/engine/wtf/MakeUnique.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/engine/core/script/dart_init.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
+#include "flutter/sky/shell/shell.h"
#include <string>
diff --git a/sky/shell/ui/animator.cc b/sky/shell/ui/animator.cc
index 6d7182f..5847ccb 100644
--- a/sky/shell/ui/animator.cc
+++ b/sky/shell/ui/animator.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/ui/animator.h"
+#include "flutter/sky/shell/ui/animator.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "base/trace_event/trace_event.h"
-#include "sky/services/rasterizer/rasterizer.mojom.h"
+#include "flutter/services/rasterizer/rasterizer.mojom.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/ui/animator.h b/sky/shell/ui/animator.h
index 80e2576..339f34e 100644
--- a/sky/shell/ui/animator.h
+++ b/sky/shell/ui/animator.h
@@ -9,7 +9,7 @@
#include "lib/ftl/time/time_point.h"
#include "mojo/services/gfx/composition/interfaces/scheduling.mojom.h"
#include "mojo/services/vsync/interfaces/vsync.mojom.h"
-#include "sky/shell/ui/engine.h"
+#include "flutter/sky/shell/ui/engine.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/ui/engine.cc b/sky/shell/ui/engine.cc
index 651accc..45e496b 100644
--- a/sky/shell/ui/engine.cc
+++ b/sky/shell/ui/engine.cc
@@ -2,26 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/ui/engine.h"
+#include "flutter/sky/shell/ui/engine.h"
#include <unistd.h>
#include "flutter/assets/directory_asset_bundle.h"
#include "flutter/assets/zip_asset_bundle.h"
#include "flutter/tonic/dart_library_provider_files.h"
-#include "glue/movable_wrapper.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/movable_wrapper.h"
+#include "flutter/glue/trace_event.h"
#include "lib/ftl/files/path.h"
#include "mojo/public/cpp/application/connect.h"
-#include "sky/engine/bindings/mojo_services.h"
-#include "sky/engine/core/script/dart_init.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/web/Sky.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/ui/animator.h"
-#include "sky/shell/ui/flutter_font_selector.h"
-#include "sky/shell/ui/platform_impl.h"
+#include "flutter/sky/engine/bindings/mojo_services.h"
+#include "flutter/sky/engine/core/script/dart_init.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/web/Sky.h"
+#include "flutter/sky/shell/shell.h"
+#include "flutter/sky/shell/ui/animator.h"
+#include "flutter/sky/shell/ui/flutter_font_selector.h"
+#include "flutter/sky/shell/ui/platform_impl.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
diff --git a/sky/shell/ui/engine.h b/sky/shell/ui/engine.h
index 4d71785..d894571 100644
--- a/sky/shell/ui/engine.h
+++ b/sky/shell/ui/engine.h
@@ -16,12 +16,12 @@
#include "mojo/public/cpp/system/handle.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
-#include "sky/engine/public/sky/sky_view_client.h"
-#include "sky/engine/public/sky/sky_view.h"
-#include "sky/services/engine/sky_engine.mojom.h"
-#include "sky/services/rasterizer/rasterizer.mojom.h"
-#include "sky/shell/rasterizer.h"
-#include "sky/shell/ui_delegate.h"
+#include "flutter/sky/engine/public/sky/sky_view_client.h"
+#include "flutter/sky/engine/public/sky/sky_view.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
+#include "flutter/services/rasterizer/rasterizer.mojom.h"
+#include "flutter/sky/shell/rasterizer.h"
+#include "flutter/sky/shell/ui_delegate.h"
#include "third_party/skia/include/core/SkPicture.h"
namespace sky {
diff --git a/sky/shell/ui/flutter_font_selector.cc b/sky/shell/ui/flutter_font_selector.cc
index 823dd96..2377557 100644
--- a/sky/shell/ui/flutter_font_selector.cc
+++ b/sky/shell/ui/flutter_font_selector.cc
@@ -5,11 +5,11 @@
#include "base/json/json_reader.h"
#include "base/values.h"
#include "flutter/assets/zip_asset_store.h"
-#include "sky/engine/core/script/ui_dart_state.h"
-#include "sky/engine/platform/fonts/FontData.h"
-#include "sky/engine/platform/fonts/FontFaceCreationParams.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/shell/ui/flutter_font_selector.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/platform/fonts/FontData.h"
+#include "flutter/sky/engine/platform/fonts/FontFaceCreationParams.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/shell/ui/flutter_font_selector.h"
#include "third_party/skia/include/core/SkStream.h"
#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
diff --git a/sky/shell/ui/flutter_font_selector.h b/sky/shell/ui/flutter_font_selector.h
index 88dc115..07d135a 100644
--- a/sky/shell/ui/flutter_font_selector.h
+++ b/sky/shell/ui/flutter_font_selector.h
@@ -9,9 +9,9 @@
#include <vector>
#include "flutter/assets/zip_asset_store.h"
-#include "sky/engine/platform/fonts/FontCacheKey.h"
-#include "sky/engine/platform/fonts/FontSelector.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
+#include "flutter/sky/engine/platform/fonts/FontCacheKey.h"
+#include "flutter/sky/engine/platform/fonts/FontSelector.h"
+#include "flutter/sky/engine/platform/fonts/SimpleFontData.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/ui/platform_impl.cc b/sky/shell/ui/platform_impl.cc
index 74db961..1911a49 100644
--- a/sky/shell/ui/platform_impl.cc
+++ b/sky/shell/ui/platform_impl.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/ui/platform_impl.h"
+#include "flutter/sky/shell/ui/platform_impl.h"
-#include "sky/shell/shell.h"
+#include "flutter/sky/shell/shell.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/ui/platform_impl.h b/sky/shell/ui/platform_impl.h
index e8ad302..03ad5aa 100644
--- a/sky/shell/ui/platform_impl.h
+++ b/sky/shell/ui/platform_impl.h
@@ -6,7 +6,7 @@
#define SKY_SHELL_UI_PLATFORM_IMPL_H_
#include "lib/ftl/macros.h"
-#include "sky/engine/public/platform/Platform.h"
+#include "flutter/sky/engine/public/platform/Platform.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/ui_delegate.cc b/sky/shell/ui_delegate.cc
index e35b192..1ff5301 100644
--- a/sky/shell/ui_delegate.cc
+++ b/sky/shell/ui_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/ui_delegate.h"
+#include "flutter/sky/shell/ui_delegate.h"
namespace sky {
namespace shell {
diff --git a/sky/shell/ui_delegate.h b/sky/shell/ui_delegate.h
index 7d14b5f..f3b0296 100644
--- a/sky/shell/ui_delegate.h
+++ b/sky/shell/ui_delegate.h
@@ -7,7 +7,7 @@
#include "lib/ftl/functional/closure.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "sky/services/engine/sky_engine.mojom.h"
+#include "flutter/services/engine/sky_engine.mojom.h"
namespace sky {
namespace shell {
diff --git a/sky/tools/gn b/sky/tools/gn
index 4e0b4a7..0ceb0ce 100755
--- a/sky/tools/gn
+++ b/sky/tools/gn
@@ -8,7 +8,7 @@
import sys
import os
-SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
def get_out_dir(args):
if args.target_os is not None:
@@ -144,7 +144,21 @@
def main(argv):
args = parse_args(argv)
- command = ['gn', 'gen', '--check']
+
+ if sys.platform.startswith(('cygwin', 'win')):
+ subdir = 'win'
+ elif sys.platform == 'darwin':
+ subdir = 'mac'
+ elif sys.platform.startswith('linux'):
+ subdir = 'linux64'
+ else:
+ raise Error('Unknown platform: ' + sys.platform)
+
+ command = [
+ '%s/buildtools/%s/gn' % (SRC_ROOT, subdir),
+ 'gen',
+ '--check'
+ ]
gn_args = to_command_line(to_gn_args(args))
out_dir = get_out_dir(args)
print "gn gen --check in %s" % out_dir
diff --git a/sky/tools/sky_snapshot/BUILD.gn b/sky/tools/sky_snapshot/BUILD.gn
index fd90235..1966d58 100644
--- a/sky/tools/sky_snapshot/BUILD.gn
+++ b/sky/tools/sky_snapshot/BUILD.gn
@@ -13,7 +13,7 @@
"//lib/ftl",
"//lib/tonic/converter",
"//lib/tonic/file_loader",
- "//sky/engine/bindings:snapshot_cc",
+ "//flutter/sky/engine/bindings:snapshot_cc",
]
if (!is_ios && !is_mac) {
diff --git a/flutter/tonic/BUILD.gn b/tonic/BUILD.gn
similarity index 97%
rename from flutter/tonic/BUILD.gn
rename to tonic/BUILD.gn
index 2aa1cac..8478fc2 100644
--- a/flutter/tonic/BUILD.gn
+++ b/tonic/BUILD.gn
@@ -27,7 +27,7 @@
deps = [
"//base",
"//dart/runtime/bin:embedded_dart_io",
- "//glue",
+ "//flutter/glue",
"//lib/tonic/parsers",
"//mojo/data_pipe_utils",
"//mojo/public/cpp/system",
diff --git a/flutter/tonic/dart_debugger.cc b/tonic/dart_debugger.cc
similarity index 100%
rename from flutter/tonic/dart_debugger.cc
rename to tonic/dart_debugger.cc
diff --git a/flutter/tonic/dart_debugger.h b/tonic/dart_debugger.h
similarity index 100%
rename from flutter/tonic/dart_debugger.h
rename to tonic/dart_debugger.h
diff --git a/flutter/tonic/dart_dependency_catcher.cc b/tonic/dart_dependency_catcher.cc
similarity index 100%
rename from flutter/tonic/dart_dependency_catcher.cc
rename to tonic/dart_dependency_catcher.cc
diff --git a/flutter/tonic/dart_dependency_catcher.h b/tonic/dart_dependency_catcher.h
similarity index 100%
rename from flutter/tonic/dart_dependency_catcher.h
rename to tonic/dart_dependency_catcher.h
diff --git a/flutter/tonic/dart_io.cc b/tonic/dart_io.cc
similarity index 100%
rename from flutter/tonic/dart_io.cc
rename to tonic/dart_io.cc
diff --git a/flutter/tonic/dart_io.h b/tonic/dart_io.h
similarity index 100%
rename from flutter/tonic/dart_io.h
rename to tonic/dart_io.h
diff --git a/flutter/tonic/dart_isolate_reloader.cc b/tonic/dart_isolate_reloader.cc
similarity index 98%
rename from flutter/tonic/dart_isolate_reloader.cc
rename to tonic/dart_isolate_reloader.cc
index 35421a8..d4bddee 100644
--- a/flutter/tonic/dart_isolate_reloader.cc
+++ b/tonic/dart_isolate_reloader.cc
@@ -10,8 +10,8 @@
#include "flutter/tonic/dart_library_loader.h"
#include "flutter/tonic/dart_library_provider.h"
#include "flutter/tonic/dart_state.h"
-#include "glue/drain_data_pipe_job.h"
-#include "glue/thread.h"
+#include "flutter/glue/drain_data_pipe_job.h"
+#include "flutter/glue/thread.h"
#include "lib/ftl/logging.h"
#include "lib/ftl/synchronization/monitor.h"
#include "lib/tonic/converter/dart_converter.h"
diff --git a/flutter/tonic/dart_isolate_reloader.h b/tonic/dart_isolate_reloader.h
similarity index 98%
rename from flutter/tonic/dart_isolate_reloader.h
rename to tonic/dart_isolate_reloader.h
index b499686..e546fb9 100644
--- a/flutter/tonic/dart_isolate_reloader.h
+++ b/tonic/dart_isolate_reloader.h
@@ -10,7 +10,7 @@
#include <queue>
#include "dart/runtime/include/dart_api.h"
-#include "glue/thread.h"
+#include "flutter/glue/thread.h"
#include "lib/ftl/macros.h"
#include "lib/ftl/synchronization/monitor.h"
diff --git a/flutter/tonic/dart_library_loader.cc b/tonic/dart_library_loader.cc
similarity index 98%
rename from flutter/tonic/dart_library_loader.cc
rename to tonic/dart_library_loader.cc
index 00ce685..b4c69ec 100644
--- a/flutter/tonic/dart_library_loader.cc
+++ b/tonic/dart_library_loader.cc
@@ -10,8 +10,8 @@
#include "flutter/tonic/dart_isolate_reloader.h"
#include "flutter/tonic/dart_library_provider.h"
#include "flutter/tonic/dart_state.h"
-#include "glue/drain_data_pipe_job.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/drain_data_pipe_job.h"
+#include "flutter/glue/trace_event.h"
#include "lib/tonic/converter/dart_converter.h"
#include "lib/tonic/dart_persistent_value.h"
#include "lib/tonic/logging/dart_error.h"
diff --git a/flutter/tonic/dart_library_loader.h b/tonic/dart_library_loader.h
similarity index 100%
rename from flutter/tonic/dart_library_loader.h
rename to tonic/dart_library_loader.h
diff --git a/flutter/tonic/dart_library_provider.cc b/tonic/dart_library_provider.cc
similarity index 100%
rename from flutter/tonic/dart_library_provider.cc
rename to tonic/dart_library_provider.cc
diff --git a/flutter/tonic/dart_library_provider.h b/tonic/dart_library_provider.h
similarity index 100%
rename from flutter/tonic/dart_library_provider.h
rename to tonic/dart_library_provider.h
diff --git a/flutter/tonic/dart_library_provider_files.cc b/tonic/dart_library_provider_files.cc
similarity index 100%
rename from flutter/tonic/dart_library_provider_files.cc
rename to tonic/dart_library_provider_files.cc
diff --git a/flutter/tonic/dart_library_provider_files.h b/tonic/dart_library_provider_files.h
similarity index 100%
rename from flutter/tonic/dart_library_provider_files.h
rename to tonic/dart_library_provider_files.h
diff --git a/flutter/tonic/dart_snapshot_loader.cc b/tonic/dart_snapshot_loader.cc
similarity index 97%
rename from flutter/tonic/dart_snapshot_loader.cc
rename to tonic/dart_snapshot_loader.cc
index 807cac1..c6546df 100644
--- a/flutter/tonic/dart_snapshot_loader.cc
+++ b/tonic/dart_snapshot_loader.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "flutter/tonic/dart_state.h"
-#include "glue/trace_event.h"
+#include "flutter/glue/trace_event.h"
#include "lib/tonic/converter/dart_converter.h"
#include "lib/tonic/logging/dart_error.h"
#include "lib/tonic/scopes/dart_api_scope.h"
diff --git a/flutter/tonic/dart_snapshot_loader.h b/tonic/dart_snapshot_loader.h
similarity index 94%
rename from flutter/tonic/dart_snapshot_loader.h
rename to tonic/dart_snapshot_loader.h
index 4c8271e..237186c 100644
--- a/flutter/tonic/dart_snapshot_loader.h
+++ b/tonic/dart_snapshot_loader.h
@@ -8,7 +8,7 @@
#include <vector>
#include "dart/runtime/include/dart_api.h"
-#include "glue/drain_data_pipe_job.h"
+#include "flutter/glue/drain_data_pipe_job.h"
#include "lib/ftl/functional/closure.h"
#include "lib/ftl/macros.h"
#include "lib/tonic/dart_state.h"
diff --git a/flutter/tonic/dart_state.cc b/tonic/dart_state.cc
similarity index 100%
rename from flutter/tonic/dart_state.cc
rename to tonic/dart_state.cc
diff --git a/flutter/tonic/dart_state.h b/tonic/dart_state.h
similarity index 100%
rename from flutter/tonic/dart_state.h
rename to tonic/dart_state.h
