Mozart: Improve tracing and backpressure.

services/gfx/compositor/render/render_frame.cc

Index: services/gfx/compositor/render/render_frame.cc
diff --git a/services/gfx/compositor/render/render_frame.cc b/services/gfx/compositor/render/render_frame.cc
index 6fedceadb2419d5b816a7a1bf985a8ff81a3dd42..d39753b8ba4481f3c6e29540a1ea86f999a35313 100644
--- a/services/gfx/compositor/render/render_frame.cc
+++ b/services/gfx/compositor/render/render_frame.cc
@@ -5,29 +5,30 @@
 #include "services/gfx/compositor/render/render_frame.h"
 
 #include "base/logging.h"
+#include "base/trace_event/trace_event.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace compositor {
 
-RenderFrame::RenderFrame(const SkIRect& viewport,
-                         const mojo::gfx::composition::FrameInfo& frame_info)
-    : viewport_(viewport), frame_info_(frame_info) {
+RenderFrame::RenderFrame(const Metadata& metadata, const SkIRect& viewport)
+    : metadata_(metadata), viewport_(viewport) {
   DCHECK(!viewport_.isEmpty());
 }
 
-RenderFrame::RenderFrame(const SkIRect& viewport,
-                         const mojo::gfx::composition::FrameInfo& frame_info,
+RenderFrame::RenderFrame(const Metadata& metadata,
+                         const SkIRect& viewport,
                          const skia::RefPtr<SkPicture>& picture)
-    : viewport_(viewport), frame_info_(frame_info), picture_(picture) {
+    : metadata_(metadata), viewport_(viewport), picture_(picture) {
   DCHECK(!viewport_.isEmpty());
 }
 
 RenderFrame::~RenderFrame() {}
 
-void RenderFrame::Paint(SkCanvas* canvas) const {
+void RenderFrame::Draw(SkCanvas* canvas) const {
   DCHECK(canvas);
+  TRACE_EVENT0("gfx", "RenderFrame::Draw");
 
   // TODO: Consider using GrDrawContext instead of SkCanvas.
   canvas->clear(SK_ColorBLACK);
@@ -35,4 +36,11 @@ void RenderFrame::Paint(SkCanvas* canvas) const {
     canvas->drawPicture(picture_.get());
 }
 
+RenderFrame::Metadata::Metadata(
+    const mojo::gfx::composition::FrameInfo& frame_info,
+    int64_t composition_time)
+    : frame_info_(frame_info), composition_time_(composition_time) {}
+
+RenderFrame::Metadata::~Metadata() {}
+
 }  // namespace compositor