Rename flow namespace to flutter (flutter#8615)

This follows our namespace change from shell to flutter: flutter#8520.
liemvo · Apr 17, 2019 · 8ff631f · 8ff631f
1 parent 0534b6a
commit 8ff631f
Show file tree

Hide file tree

Showing 115 changed files with 310 additions and 301 deletions.
diff --git a/flow/compositor_context.cc b/flow/compositor_context.cc
@@ -7,7 +7,7 @@
 #include "flutter/flow/layers/layer_tree.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
-namespace flow {
+namespace flutter {
 
 CompositorContext::CompositorContext() = default;
 
@@ -60,7 +60,7 @@ CompositorContext::ScopedFrame::~ScopedFrame() {
   context_.EndFrame(*this, instrumentation_enabled_);
 }
 
-bool CompositorContext::ScopedFrame::Raster(flow::LayerTree& layer_tree,
+bool CompositorContext::ScopedFrame::Raster(flutter::LayerTree& layer_tree,
                                             bool ignore_raster_cache) {
   layer_tree.Preroll(*this, ignore_raster_cache);
   // Clearing canvas after preroll reduces one render target switch when preroll
@@ -82,4 +82,4 @@ void CompositorContext::OnGrContextDestroyed() {
   raster_cache_.Clear();
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/compositor_context.h b/flow/compositor_context.h
@@ -16,7 +16,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
-namespace flow {
+namespace flutter {
 
 class LayerTree;
 
@@ -97,6 +97,6 @@ class CompositorContext {
   FML_DISALLOW_COPY_AND_ASSIGN(CompositorContext);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_COMPOSITOR_CONTEXT_H_
diff --git a/flow/debug_print.cc b/flow/debug_print.cc
@@ -8,7 +8,8 @@
 
 #include "third_party/skia/include/core/SkString.h"
 
-std::ostream& operator<<(std::ostream& os, const flow::MatrixDecomposition& m) {
+std::ostream& operator<<(std::ostream& os,
+                         const flutter::MatrixDecomposition& m) {
   if (!m.IsValid()) {
     os << "Invalid Matrix!" << std::endl;
     return os;
@@ -72,7 +73,7 @@ std::ostream& operator<<(std::ostream& os, const SkPoint& r) {
 }
 
 std::ostream& operator<<(std::ostream& os,
-                         const flow::PictureRasterCacheKey& k) {
+                         const flutter::PictureRasterCacheKey& k) {
   os << "Picture: " << k.id() << " matrix: " << k.matrix();
   return os;
 }

diff --git a/flow/debug_print.h b/flow/debug_print.h
@@ -15,8 +15,8 @@
 
 #define DEF_PRINTER(x) std::ostream& operator<<(std::ostream&, const x&);
 
-DEF_PRINTER(flow::MatrixDecomposition);
-DEF_PRINTER(flow::PictureRasterCacheKey);
+DEF_PRINTER(flutter::MatrixDecomposition);
+DEF_PRINTER(flutter::PictureRasterCacheKey);
 DEF_PRINTER(SkISize);
 DEF_PRINTER(SkMatrix);
 DEF_PRINTER(SkMatrix44);

diff --git a/flow/embedded_views.cc b/flow/embedded_views.cc
@@ -4,9 +4,9 @@
 
 #include "flutter/flow/embedded_views.h"
 
-namespace flow {
+namespace flutter {
 
 bool ExternalViewEmbedder::SubmitFrame(GrContext* context) {
   return false;
 };
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
@@ -12,7 +12,7 @@
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkSize.h"
 
-namespace flow {
+namespace flutter {
 
 class EmbeddedViewParams {
  public:
@@ -44,6 +44,6 @@ class ExternalViewEmbedder {
   FML_DISALLOW_COPY_AND_ASSIGN(ExternalViewEmbedder);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_EMBEDDED_VIEWS_H_
diff --git a/flow/export_node.cc b/flow/export_node.cc
@@ -9,15 +9,15 @@
 namespace {
 
 using ExportNodeBindings =
-    std::unordered_map<zx_koid_t, std::unique_ptr<flow::ExportNode>>;
+    std::unordered_map<zx_koid_t, std::unique_ptr<flutter::ExportNode>>;
 
 FML_THREAD_LOCAL fml::ThreadLocal tls_export_node_bindings([](intptr_t value) {
   delete reinterpret_cast<ExportNodeBindings*>(value);
 });
 
 }  // namespace
 
-namespace flow {
+namespace flutter {
 
 ExportNode::ExportNode(zx::eventpair export_token)
     : pending_export_token_(std::move(export_token)) {
@@ -82,4 +82,4 @@ void ExportNode::UpdateScene(SceneUpdateContext& context,
                    : fuchsia::ui::gfx::HitTestBehavior::kSuppress);
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/export_node.h b/flow/export_node.h
@@ -17,7 +17,7 @@
 #include "flutter/flow/scene_update_context.h"
 #include "flutter/fml/macros.h"
 
-namespace flow {
+namespace flutter {
 
 // Represents a Scenic |ExportNode| resource that exports an |EntityNode| to
 // another session.
@@ -45,6 +45,6 @@ class ExportNode {
   FML_DISALLOW_COPY_AND_ASSIGN(ExportNode);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_EXPORT_NODE_H_
diff --git a/flow/flow_run_all_unittests.cc b/flow/flow_run_all_unittests.cc
@@ -23,9 +23,9 @@
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   fml::CommandLine cmd = fml::CommandLineFromArgcArgv(argc, argv);
-  flow::SetGoldenDir(
+  flutter::SetGoldenDir(
       cmd.GetOptionValueWithDefault("golden-dir", "flutter/testing/resources"));
-  flow::SetFontFile(cmd.GetOptionValueWithDefault(
+  flutter::SetFontFile(cmd.GetOptionValueWithDefault(
       "font-file",
       "flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf"));
   return RUN_ALL_TESTS();

diff --git a/flow/flow_test_utils.cc b/flow/flow_test_utils.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 
-namespace flow {
+namespace flutter {
 
 static std::string gGoldenDir;
 static std::string gFontFile;
@@ -37,4 +37,4 @@ void SetFontFile(const std::string& file) {
   gFontFile = file;
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/flow_test_utils.h b/flow/flow_test_utils.h
@@ -16,7 +16,7 @@
 
 #include <string>
 
-namespace flow {
+namespace flutter {
 
 const std::string& GetGoldenDir();
 
@@ -26,4 +26,4 @@ const std::string& GetFontFile();
 
 void SetFontFile(const std::string& dir);
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/instrumentation.cc b/flow/instrumentation.cc
@@ -10,7 +10,7 @@
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
-namespace flow {
+namespace flutter {
 
 static const size_t kMaxSamples = 120;
 static const size_t kMaxFrameMarkers = 8;
@@ -311,4 +311,4 @@ int64_t CounterValues::GetMinValue() const {
   return min;
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/instrumentation.h b/flow/instrumentation.h
@@ -12,7 +12,7 @@
 #include "flutter/fml/time/time_point.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
-namespace flow {
+namespace flutter {
 
 // DEPRECATED
 // The frame per second FPS could be different than 60 (e.g., 120).
@@ -94,6 +94,6 @@ class CounterValues {
   FML_DISALLOW_COPY_AND_ASSIGN(CounterValues);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_INSTRUMENTATION_H_
diff --git a/flow/layers/backdrop_filter_layer.cc b/flow/layers/backdrop_filter_layer.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/backdrop_filter_layer.h"
 
-namespace flow {
+namespace flutter {
 
 BackdropFilterLayer::BackdropFilterLayer() = default;
 
@@ -20,4 +20,4 @@ void BackdropFilterLayer::Paint(PaintContext& context) const {
   PaintChildren(context);
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/layers/backdrop_filter_layer.h b/flow/layers/backdrop_filter_layer.h
@@ -9,7 +9,7 @@
 
 #include "third_party/skia/include/core/SkImageFilter.h"
 
-namespace flow {
+namespace flutter {
 
 class BackdropFilterLayer : public ContainerLayer {
  public:
@@ -26,6 +26,6 @@ class BackdropFilterLayer : public ContainerLayer {
   FML_DISALLOW_COPY_AND_ASSIGN(BackdropFilterLayer);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
diff --git a/flow/layers/child_scene_layer.cc b/flow/layers/child_scene_layer.cc
@@ -7,7 +7,7 @@
 #include "flutter/flow/export_node.h"
 #include "flutter/flow/view_holder.h"
 
-namespace flow {
+namespace flutter {
 
 ChildSceneLayer::ChildSceneLayer(zx_koid_t layer_id,
                                  bool use_view_holder,
@@ -44,4 +44,4 @@ void ChildSceneLayer::UpdateScene(SceneUpdateContext& context) {
   }
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/layers/child_scene_layer.h b/flow/layers/child_scene_layer.h
@@ -12,7 +12,7 @@
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/scene_update_context.h"
 
-namespace flow {
+namespace flutter {
 
 // Layer that represents an embedded child.
 class ChildSceneLayer : public Layer {
@@ -40,6 +40,6 @@ class ChildSceneLayer : public Layer {
   FML_DISALLOW_COPY_AND_ASSIGN(ChildSceneLayer);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
@@ -10,7 +10,7 @@
 
 #endif  // defined(OS_FUCHSIA)
 
-namespace flow {
+namespace flutter {
 
 ClipPathLayer::ClipPathLayer(Clip clip_behavior)
     : clip_behavior_(clip_behavior) {
@@ -69,4 +69,4 @@ void ClipPathLayer::Paint(PaintContext& context) const {
   }
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/layers/clip_path_layer.h b/flow/layers/clip_path_layer.h
@@ -7,7 +7,7 @@
 
 #include "flutter/flow/layers/container_layer.h"
 
-namespace flow {
+namespace flutter {
 
 class ClipPathLayer : public ContainerLayer {
  public:
@@ -31,6 +31,6 @@ class ClipPathLayer : public ContainerLayer {
   FML_DISALLOW_COPY_AND_ASSIGN(ClipPathLayer);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_LAYERS_CLIP_PATH_LAYER_H_
diff --git a/flow/layers/clip_rect_layer.cc b/flow/layers/clip_rect_layer.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/clip_rect_layer.h"
 
-namespace flow {
+namespace flutter {
 
 ClipRectLayer::ClipRectLayer(Clip clip_behavior)
     : clip_behavior_(clip_behavior) {
@@ -59,4 +59,4 @@ void ClipRectLayer::Paint(PaintContext& context) const {
   }
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/layers/clip_rect_layer.h b/flow/layers/clip_rect_layer.h
@@ -7,7 +7,7 @@
 
 #include "flutter/flow/layers/container_layer.h"
 
-namespace flow {
+namespace flutter {
 
 class ClipRectLayer : public ContainerLayer {
  public:
@@ -30,6 +30,6 @@ class ClipRectLayer : public ContainerLayer {
   FML_DISALLOW_COPY_AND_ASSIGN(ClipRectLayer);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_LAYERS_CLIP_RECT_LAYER_H_
diff --git a/flow/layers/clip_rrect_layer.cc b/flow/layers/clip_rrect_layer.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/clip_rrect_layer.h"
 
-namespace flow {
+namespace flutter {
 
 ClipRRectLayer::ClipRRectLayer(Clip clip_behavior)
     : clip_behavior_(clip_behavior) {
@@ -67,4 +67,4 @@ void ClipRRectLayer::Paint(PaintContext& context) const {
   }
 }
 
-}  // namespace flow
+}  // namespace flutter
diff --git a/flow/layers/clip_rrect_layer.h b/flow/layers/clip_rrect_layer.h
@@ -7,7 +7,7 @@
 
 #include "flutter/flow/layers/container_layer.h"
 
-namespace flow {
+namespace flutter {
 
 class ClipRRectLayer : public ContainerLayer {
  public:
@@ -31,6 +31,6 @@ class ClipRRectLayer : public ContainerLayer {
   FML_DISALLOW_COPY_AND_ASSIGN(ClipRRectLayer);
 };
 
-}  // namespace flow
+}  // namespace flutter
 
 #endif  // FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
diff --git a/flow/layers/color_filter_layer.cc b/flow/layers/color_filter_layer.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/color_filter_layer.h"
 
-namespace flow {
+namespace flutter {
 
 ColorFilterLayer::ColorFilterLayer() = default;
 
@@ -22,4 +22,4 @@ void ColorFilterLayer::Paint(PaintContext& context) const {
   PaintChildren(context);
 }
 
-}  // namespace flow
+}  // namespace flutter