From ab927e23e7cd32d628e0bcc662676eb9c6893c2f Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Mon, 28 Sep 2015 12:20:28 -0700
Subject: [PATCH 1/3] Allow displaying compositor statistics from Dart

---
 sky/compositor/BUILD.gn                      |  2 +
 sky/compositor/compositor_options.cc         |  9 ++++
 sky/compositor/compositor_options.h          |  2 +
 sky/compositor/paint_context.cc              | 30 --------------
 sky/compositor/paint_context.h               | 12 +++---
 sky/compositor/statistics_layer.cc           | 43 ++++++++++++++++++++
 sky/compositor/statistics_layer.h            | 30 ++++++++++++++
 sky/engine/core/compositing/SceneBuilder.cpp | 14 ++++++-
 sky/engine/core/compositing/SceneBuilder.h   |  2 +
 sky/engine/core/compositing/SceneBuilder.idl |  1 +
 10 files changed, 107 insertions(+), 38 deletions(-)
 create mode 100644 sky/compositor/statistics_layer.cc
 create mode 100644 sky/compositor/statistics_layer.h

diff --git a/sky/compositor/BUILD.gn b/sky/compositor/BUILD.gn
index e5826886169..715fd759c73 100644
--- a/sky/compositor/BUILD.gn
+++ b/sky/compositor/BUILD.gn
@@ -32,6 +32,8 @@ source_set("compositor") {
     "picture_layer.h",
     "picture_serializer.cc",
     "picture_serializer.h",
+    "statistics_layer.cc",
+    "statistics_layer.h",
     "transform_layer.cc",
     "transform_layer.h",
   ]
diff --git a/sky/compositor/compositor_options.cc b/sky/compositor/compositor_options.cc
index 8317da170cd..28e6aab4a1d 100644
--- a/sky/compositor/compositor_options.cc
+++ b/sky/compositor/compositor_options.cc
@@ -13,6 +13,15 @@ CompositorOptions::CompositorOptions() {
   options_.resize(static_cast<OptionType>(Option::TerminationSentinel), false);
 }
 
+CompositorOptions::CompositorOptions(uint64_t mask) : CompositorOptions() {
+  OptionType sentinel = static_cast<OptionType>(Option::TerminationSentinel);
+  for (OptionType i = 0; i < sentinel; i++) {
+    if ((1 << i) & mask) {
+      setEnabled(static_cast<Option>(i), true);
+    }
+  }
+}
+
 bool CompositorOptions::isEnabled(Option option) const {
   if (option >= Option::TerminationSentinel) {
     return false;
diff --git a/sky/compositor/compositor_options.h b/sky/compositor/compositor_options.h
index 676d876c488..621fae82bae 100644
--- a/sky/compositor/compositor_options.h
+++ b/sky/compositor/compositor_options.h
@@ -21,6 +21,8 @@ class CompositorOptions {
   };
 
   CompositorOptions();
+  CompositorOptions(uint64_t mask);
+
   ~CompositorOptions();
 
   bool isEnabled(Option option) const;
diff --git a/sky/compositor/paint_context.cc b/sky/compositor/paint_context.cc
index 694cc875137..175aa6935b7 100644
--- a/sky/compositor/paint_context.cc
+++ b/sky/compositor/paint_context.cc
@@ -21,36 +21,6 @@ void PaintContext::beginFrame(ScopedFrame& frame) {
 
 void PaintContext::endFrame(ScopedFrame& frame) {
   frame_time_.stop();
-
-  DisplayStatistics(frame);
-}
-
-static void PaintContext_DrawStatisticsText(SkCanvas& canvas,
-                                            const std::string& string,
-                                            int x,
-                                            int y) {
-  SkPaint paint;
-  paint.setTextSize(14);
-  paint.setLinearText(false);
-  paint.setColor(SK_ColorRED);
-  canvas.drawText(string.c_str(), string.size(), x, y, paint);
-}
-
-void PaintContext::DisplayStatistics(ScopedFrame& frame) {
-  // TODO: We just draw text text on the top left corner for now. Make this
-  // better
-  const int x = 10;
-  int y = 20;
-  static const int kLineSpacing = 18;
-
-  if (options_.isEnabled(CompositorOptions::Option::DisplayFrameStatistics)) {
-    // Frame (2032): 3.26ms
-    std::stringstream stream;
-    stream << "Frame (" << frame_count_.count()
-           << "): " << frame_time_.lastLap().InMillisecondsF() << "ms";
-    PaintContext_DrawStatisticsText(frame.canvas(), stream.str(), x, y);
-    y += kLineSpacing;
-  }
 }
 
 PaintContext::ScopedFrame PaintContext::AcquireFrame(SkCanvas& canvas) {
diff --git a/sky/compositor/paint_context.h b/sky/compositor/paint_context.h
index f72b0215311..8e61005859e 100644
--- a/sky/compositor/paint_context.h
+++ b/sky/compositor/paint_context.h
@@ -9,7 +9,6 @@
 
 #include "base/macros.h"
 #include "base/logging.h"
-#include "sky/compositor/compositor_options.h"
 #include "sky/compositor/instrumentation.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ -24,6 +23,8 @@ class PaintContext {
    public:
     SkCanvas& canvas() { return *canvas_; }
 
+    const PaintContext& context() const { return context_; };
+
     ScopedFrame(ScopedFrame&& frame);
 
     ~ScopedFrame();
@@ -48,22 +49,21 @@ class PaintContext {
   PaintContext();
   ~PaintContext();
 
-  CompositorOptions& options() { return options_; };
-
   ScopedFrame AcquireFrame(SkCanvas& canvas);
 
   ScopedFrame AcquireFrame(const std::string& trace_file_name,
                            gfx::Size frame_size);
 
- private:
-  CompositorOptions options_;
+  const instrumentation::Counter& frame_count() const { return frame_count_; }
 
+  const instrumentation::Stopwatch& frame_time() const { return frame_time_; }
+
+ private:
   instrumentation::Counter frame_count_;
   instrumentation::Stopwatch frame_time_;
 
   void beginFrame(ScopedFrame& frame);
   void endFrame(ScopedFrame& frame);
-  void DisplayStatistics(ScopedFrame& frame);
 
   DISALLOW_COPY_AND_ASSIGN(PaintContext);
 };
diff --git a/sky/compositor/statistics_layer.cc b/sky/compositor/statistics_layer.cc
new file mode 100644
index 00000000000..b699140a57e
--- /dev/null
+++ b/sky/compositor/statistics_layer.cc
@@ -0,0 +1,43 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "sky/compositor/statistics_layer.h"
+
+namespace sky {
+namespace compositor {
+
+StatisticsLayer::StatisticsLayer(uint64_t enabledOptions)
+    : options_(enabledOptions) {
+}
+
+static void PaintContext_DrawStatisticsText(SkCanvas& canvas,
+                                            const std::string& string,
+                                            int x,
+                                            int y) {
+  SkPaint paint;
+  paint.setTextSize(14);
+  paint.setLinearText(false);
+  paint.setColor(SK_ColorRED);
+  canvas.drawText(string.c_str(), string.size(), x, y, paint);
+}
+
+void StatisticsLayer::Paint(PaintContext::ScopedFrame& frame) {
+  const int x = 10;
+  int y = 20;
+  static const int kLineSpacing = 18;
+
+  const PaintContext& context = frame.context();
+
+  if (options_.isEnabled(CompositorOptions::Option::DisplayFrameStatistics)) {
+    // Frame (2032): 3.26ms
+    std::stringstream stream;
+    stream << "Frame (" << context.frame_count().count()
+           << "): " << context.frame_time().lastLap().InMillisecondsF() << "ms";
+    PaintContext_DrawStatisticsText(frame.canvas(), stream.str(), x, y);
+    y += kLineSpacing;
+  }
+}
+
+}  // namespace compositor
+}  // namespace sky
diff --git a/sky/compositor/statistics_layer.h b/sky/compositor/statistics_layer.h
new file mode 100644
index 00000000000..9961f2bbb5f
--- /dev/null
+++ b/sky/compositor/statistics_layer.h
@@ -0,0 +1,30 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SKY_COMPOSITOR_STATISTICS_LAYER_H_
+#define SKY_COMPOSITOR_STATISTICS_LAYER_H_
+
+#include "base/macros.h"
+#include "sky/compositor/compositor_options.h"
+#include "sky/compositor/layer.h"
+
+namespace sky {
+namespace compositor {
+
+class StatisticsLayer : public Layer {
+ public:
+  StatisticsLayer(uint64_t enabledOptions);
+
+  void Paint(PaintContext::ScopedFrame& frame) override;
+
+ private:
+  CompositorOptions options_;
+
+  DISALLOW_COPY_AND_ASSIGN(StatisticsLayer);
+};
+
+}  // namespace compositor
+}  // namespace sky
+
+#endif  // SKY_COMPOSITOR_STATISTICS_LAYER_H_
diff --git a/sky/engine/core/compositing/SceneBuilder.cpp b/sky/engine/core/compositing/SceneBuilder.cpp
index d41b9b7798a..4255f534457 100644
--- a/sky/engine/core/compositing/SceneBuilder.cpp
+++ b/sky/engine/core/compositing/SceneBuilder.cpp
@@ -4,9 +4,8 @@
 
 #include "sky/engine/core/compositing/SceneBuilder.h"
 
-#include "sky/engine/core/painting/Matrix.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
-#include "sky/compositor/transform_layer.h"
+#include "sky/engine/core/painting/Matrix.h"
 #include "sky/compositor/clip_path_layer.h"
 #include "sky/compositor/clip_rect_layer.h"
 #include "sky/compositor/clip_rrect_layer.h"
@@ -14,6 +13,8 @@
 #include "sky/compositor/container_layer.h"
 #include "sky/compositor/opacity_layer.h"
 #include "sky/compositor/picture_layer.h"
+#include "sky/compositor/statistics_layer.h"
+#include "sky/compositor/transform_layer.h"
 
 namespace blink {
 
@@ -110,6 +111,15 @@ void SceneBuilder::addPicture(const Offset& offset, Picture* picture, const Rect
     m_currentLayer->Add(std::move(layer));
 }
 
+void SceneBuilder::pushStatistics(uint64_t enabledOptions, const Rect& bounds)
+{
+    if (!m_currentLayer)
+        return;
+    std::unique_ptr<sky::compositor::StatisticsLayer> layer(new sky::compositor::StatisticsLayer(enabledOptions));
+    layer->set_paint_bounds(bounds.sk_rect);
+    m_currentLayer->Add(std::move(layer));
+}
+
 PassRefPtr<Scene> SceneBuilder::build()
 {
     m_currentLayer = nullptr;
diff --git a/sky/engine/core/compositing/SceneBuilder.h b/sky/engine/core/compositing/SceneBuilder.h
index 053ac62bb45..a2587b5a861 100644
--- a/sky/engine/core/compositing/SceneBuilder.h
+++ b/sky/engine/core/compositing/SceneBuilder.h
@@ -40,6 +40,8 @@ public:
     void pushClipPath(const CanvasPath* path, const Rect& bounds);
     void pushOpacity(int alpha, const Rect& bounds);
     void pushColorFilter(SkColor color, SkXfermode::Mode transferMode, const Rect& bounds);
+    void pushStatistics(uint64_t enabledOptions, const Rect& bounds);
+
     void pop();
     void addPicture(const Offset& offset, Picture* picture, const Rect& bounds);
 
diff --git a/sky/engine/core/compositing/SceneBuilder.idl b/sky/engine/core/compositing/SceneBuilder.idl
index 17182c6e4f5..73551a510b5 100644
--- a/sky/engine/core/compositing/SceneBuilder.idl
+++ b/sky/engine/core/compositing/SceneBuilder.idl
@@ -11,6 +11,7 @@
   void pushClipPath(Path path, Rect bounds);
   void pushOpacity(long alpha, Rect bounds);
   void pushColorFilter(Color color, TransferMode transferMode, Rect bounds);
+  void pushStatistics(unsigned long enabledOptions, Rect bounds);
   void pop();
 
   void addPicture(Offset offset, Picture picture, Rect bounds);

From bfb9855c2420842129b8e84a1171f6684ad397ac Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Mon, 28 Sep 2015 12:40:19 -0700
Subject: [PATCH 2/3] Since the statistics scene is not a container layer,
 rename the API in SceneBuilder

---
 sky/engine/core/compositing/SceneBuilder.cpp | 2 +-
 sky/engine/core/compositing/SceneBuilder.h   | 4 ++--
 sky/engine/core/compositing/SceneBuilder.idl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sky/engine/core/compositing/SceneBuilder.cpp b/sky/engine/core/compositing/SceneBuilder.cpp
index 4255f534457..c3488d86a88 100644
--- a/sky/engine/core/compositing/SceneBuilder.cpp
+++ b/sky/engine/core/compositing/SceneBuilder.cpp
@@ -111,7 +111,7 @@ void SceneBuilder::addPicture(const Offset& offset, Picture* picture, const Rect
     m_currentLayer->Add(std::move(layer));
 }
 
-void SceneBuilder::pushStatistics(uint64_t enabledOptions, const Rect& bounds)
+void SceneBuilder::addStatistics(uint64_t enabledOptions, const Rect& bounds)
 {
     if (!m_currentLayer)
         return;
diff --git a/sky/engine/core/compositing/SceneBuilder.h b/sky/engine/core/compositing/SceneBuilder.h
index a2587b5a861..1c19cfd6908 100644
--- a/sky/engine/core/compositing/SceneBuilder.h
+++ b/sky/engine/core/compositing/SceneBuilder.h
@@ -40,10 +40,10 @@ public:
     void pushClipPath(const CanvasPath* path, const Rect& bounds);
     void pushOpacity(int alpha, const Rect& bounds);
     void pushColorFilter(SkColor color, SkXfermode::Mode transferMode, const Rect& bounds);
-    void pushStatistics(uint64_t enabledOptions, const Rect& bounds);
-
     void pop();
+
     void addPicture(const Offset& offset, Picture* picture, const Rect& bounds);
+    void addStatistics(uint64_t enabledOptions, const Rect& bounds);
 
     PassRefPtr<Scene> build();
 
diff --git a/sky/engine/core/compositing/SceneBuilder.idl b/sky/engine/core/compositing/SceneBuilder.idl
index 73551a510b5..9daa4ba293f 100644
--- a/sky/engine/core/compositing/SceneBuilder.idl
+++ b/sky/engine/core/compositing/SceneBuilder.idl
@@ -11,10 +11,10 @@
   void pushClipPath(Path path, Rect bounds);
   void pushOpacity(long alpha, Rect bounds);
   void pushColorFilter(Color color, TransferMode transferMode, Rect bounds);
-  void pushStatistics(unsigned long enabledOptions, Rect bounds);
   void pop();
 
   void addPicture(Offset offset, Picture picture, Rect bounds);
+  void addStatistics(unsigned long enabledOptions, Rect bounds);
 
   Scene build();
 };

From 982731bf91beaa2c697ab32b1d388054c78aa05f Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Mon, 28 Sep 2015 15:03:59 -0700
Subject: [PATCH 3/3] Make the single argument constructor to CompositorOptions
 explicit

---
 sky/compositor/compositor_options.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sky/compositor/compositor_options.h b/sky/compositor/compositor_options.h
index 621fae82bae..94773da211e 100644
--- a/sky/compositor/compositor_options.h
+++ b/sky/compositor/compositor_options.h
@@ -21,7 +21,7 @@ class CompositorOptions {
   };
 
   CompositorOptions();
-  CompositorOptions(uint64_t mask);
+  explicit CompositorOptions(uint64_t mask);
 
   ~CompositorOptions();