Teach SkyView path to draw a circle

This CL adds a global view object that can receive a Picture and be signaled to
draw. When using SkyView, this Picture shows up on screen.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/1134913003

engine/bindings/builtin_sky.cc

@@ -8,6 +8,7 @@
 #include "sky/engine/bindings/builtin.h"
 #include "sky/engine/core/frame/LocalDOMWindow.h"
 #include "sky/engine/core/script/dom_dart_state.h"
+#include "sky/engine/core/view/View.h"
 #include "sky/engine/tonic/dart_error.h"
 
 namespace blink {
@@ -27,6 +28,11 @@ void BuiltinSky::InstallWindow(DOMDartState* dart_state) {
   // TODO(abarth): Retain the document wrapper.
 }
 
+void BuiltinSky::InstallView(View* view) {
+  CHECK(!LogIfError(
+      Dart_SetField(library_.value(), ToDart("view"), ToDart(view))));
+}
+
 Dart_Handle BuiltinSky::GetClassByName(const char* class_name) {
   Dart_Handle name_handle = ToDart(class_name);
   Dart_Handle class_handle = Dart_GetType(library_.value(), name_handle, 0, nullptr);

engine/bindings/builtin_sky.h

@@ -12,6 +12,7 @@
 
 namespace blink {
 class DOMDartState;
+class View;
 
 class BuiltinSky : public DartClassProvider {
  public:
@@ -19,6 +20,7 @@ class BuiltinSky : public DartClassProvider {
   ~BuiltinSky();
 
   void InstallWindow(DOMDartState* dart_state);
+  void InstallView(View* view);
 
   // DartClassProvider:
   Dart_Handle GetClassByName(const char* class_name) override;

engine/bindings/scripts/templates/dart_blink.template

@@ -18,4 +18,6 @@ part '{{callback.name}}.dart';
 Window window;
 Document get document => window.document;
 
+View view;
+
 typedef EventListener(Event event);

engine/core/core.gni

@@ -1026,6 +1026,8 @@ sky_core_files = [
   "script/dom_dart_state.cc",
   "script/dom_dart_state.h",
   "script/monitor.h",
+  "view/View.cpp",
+  "view/View.h",
 ]
 
 core_idl_files = get_path_info([
@@ -1107,6 +1109,7 @@ core_idl_files = get_path_info([
                                  "painting/PaintingContext.idl",
                                  "painting/Picture.idl",
                                  "painting/PictureRecorder.idl",
+                                 "view/View.idl",
                                ],
                                "abspath")
 

engine/core/painting/Canvas.cpp

@@ -117,7 +117,7 @@ void Canvas::drawPicture(Picture* picture)
         return;
     ASSERT(picture);
     ASSERT(m_displayList->isRecording());
-    m_canvas->drawPicture(picture->displayList()->picture());
+    m_canvas->drawPicture(picture->toSkia());
 }
 
 void Canvas::drawPaint(const Paint* paint)

engine/core/painting/Picture.h

@@ -18,6 +18,7 @@ public:
     ~Picture() override;
     static PassRefPtr<Picture> create(PassRefPtr<DisplayList>);
 
+    SkPicture* toSkia() const { return m_displayList->picture(); }
     DisplayList* displayList() const { return m_displayList.get(); }
 
 private:

engine/core/script/dart_controller.cc

@@ -348,6 +348,13 @@ void DartController::CreateIsolateFor(PassOwnPtr<DOMDartState> state,
   Dart_ExitIsolate();
 }
 
+void DartController::InstallView(View* view) {
+  DartIsolateScope isolate_scope(dart_state()->isolate());
+  DartApiScope dart_api_scope;
+
+  builtin_sky_->InstallView(view);
+}
+
 void DartController::ClearForClose() {
   // Don't use a DartIsolateScope here since we never exit the isolate.
   Dart_EnterIsolate(dom_dart_state_->isolate());

engine/core/script/dart_controller.h

@@ -20,6 +20,7 @@ class DOMDartState;
 class DartValue;
 class HTMLScriptElement;
 class KURL;
+class View;
 
 class DartController {
  public:
@@ -44,6 +45,7 @@ class DartController {
   void ClearForClose();
   void CreateIsolateFor(PassOwnPtr<DOMDartState> dom_dart_state,
                         const KURL& url);
+  void InstallView(View* view);
 
   DOMDartState* dart_state() const { return dom_dart_state_.get(); }
 

engine/core/view/View.cpp

+// 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/engine/config.h"
+#include "sky/engine/core/view/View.h"
+
+namespace blink {
+
+PassRefPtr<View> View::create(const base::Closure& schedulePaintCallback)
+{
+    return adoptRef(new View(schedulePaintCallback));
+}
+
+View::View(const base::Closure& schedulePaintCallback)
+    : m_schedulePaintCallback(schedulePaintCallback)
+{
+}
+
+View::~View()
+{
+}
+
+void View::schedulePaint()
+{
+    m_schedulePaintCallback.Run();
+}
+
+} // namespace blink

engine/core/view/View.h

+// 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_ENGINE_CORE_VIEW_VIEW_H_
+#define SKY_ENGINE_CORE_VIEW_VIEW_H_
+
+#include "base/callback.h"
+#include "sky/engine/core/painting/Picture.h"
+#include "sky/engine/tonic/dart_wrappable.h"
+#include "sky/engine/wtf/PassRefPtr.h"
+#include "sky/engine/wtf/RefCounted.h"
+
+namespace blink {
+
+class View : public RefCounted<View>, public DartWrappable {
+    DEFINE_WRAPPERTYPEINFO();
+public:
+    ~View() override;
+    static PassRefPtr<View> create(const base::Closure& schedulePaintCallback);
+
+    Picture* picture() const { return m_picture.get(); }
+    void setPicture(Picture* picture) { m_picture = picture; }
+
+    void schedulePaint();
+
+private:
+    explicit View(const base::Closure& schedulePaintCallback);
+
+    base::Closure m_schedulePaintCallback;
+    RefPtr<Picture> m_picture;
+};
+
+} // namespace blink
+
+#endif  // SKY_ENGINE_CORE_VIEW_VIEW_H_

engine/core/view/View.idl

+// 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.
+
+interface View {
+  attribute Picture picture;
+
+  void schedulePaint();
+};

engine/public/sky/BUILD.gn

@@ -4,6 +4,7 @@
 
 source_set("sky") {
   deps = [
+    "//base",
     "//skia",
     "//sky/engine/core",
     "//sky/engine/platform",
@@ -19,5 +20,7 @@ source_set("sky") {
     "sky_display_metrics.h",
     "sky_view.cc",
     "sky_view.h",
+    "sky_view_client.cc",
+    "sky_view_client.h",
   ]
 }

engine/public/sky/sky_view.cc

@@ -5,17 +5,27 @@
 #include "config.h"
 #include "sky/engine/public/sky/sky_view.h"
 
+#include "base/bind.h"
 #include "sky/engine/core/script/dart_controller.h"
 #include "sky/engine/core/script/dom_dart_state.h"
+#include "sky/engine/core/view/View.h"
 #include "sky/engine/platform/weborigin/KURL.h"
+#include "sky/engine/public/sky/sky_view_client.h"
 
 namespace blink {
 
-std::unique_ptr<SkyView> SkyView::Create() {
-  return std::unique_ptr<SkyView>(new SkyView);
+struct SkyView::Data {
+  RefPtr<View> view_;
+};
+
+std::unique_ptr<SkyView> SkyView::Create(SkyViewClient* client) {
+  return std::unique_ptr<SkyView>(new SkyView(client));
 }
 
-SkyView::SkyView() {
+SkyView::SkyView(SkyViewClient* client)
+    : client_(client),
+      data_(new Data),
+      weak_factory_(this) {
 }
 
 SkyView::~SkyView() {
@@ -29,12 +39,18 @@ void SkyView::SetDisplayMetrics(const SkyDisplayMetrics& metrics) {
 }
 
 void SkyView::Load(const WebURL& url) {
+  data_->view_ = View::create(base::Bind(
+      &SkyView::SchedulePaint, weak_factory_.GetWeakPtr()));
+
   dart_controller_.reset(new DartController);
   dart_controller_->CreateIsolateFor(adoptPtr(new DOMDartState(nullptr)), url);
+  dart_controller_->InstallView(data_->view_.get());
   dart_controller_->LoadMainLibrary(url);
 }
 
 skia::RefPtr<SkPicture> SkyView::Paint() {
+  if (Picture* picture = data_->view_->picture())
+    return skia::SharePtr(picture->toSkia());
   return skia::RefPtr<SkPicture>();
 }
 
@@ -42,4 +58,8 @@ bool SkyView::HandleInputEvent(const WebInputEvent& event) {
   return false;
 }
 
+void SkyView::SchedulePaint() {
+  client_->SchedulePaint();
+}
+
 } // namespace blink

engine/public/sky/sky_view.h

@@ -6,6 +6,7 @@
 #define SKY_ENGINE_PUBLIC_SKY_SKY_VIEW_H_
 
 #include <memory>
+#include "base/memory/weak_ptr.h"
 #include "skia/ext/refptr.h"
 #include "sky/engine/public/platform/WebCommon.h"
 #include "sky/engine/public/platform/WebURL.h"
@@ -14,11 +15,12 @@
 
 namespace blink {
 class DartController;
+class SkyViewClient;
 class WebInputEvent;
 
 class SkyView {
  public:
-  static std::unique_ptr<SkyView> Create();
+  static std::unique_ptr<SkyView> Create(SkyViewClient* client);
   ~SkyView();
 
   void SetDisplayMetrics(const SkyDisplayMetrics& metrics);
@@ -27,9 +29,17 @@ class SkyView {
   bool HandleInputEvent(const WebInputEvent& event);
 
  private:
-  SkyView();
+  explicit SkyView(SkyViewClient* client);
 
+  void SchedulePaint();
+
+  class Data;
+
+  SkyViewClient* client_;
   std::unique_ptr<DartController> dart_controller_;
+  std::unique_ptr<Data> data_;
+
+  base::WeakPtrFactory<SkyView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SkyView);
 };

engine/public/sky/sky_view_client.cc

+// 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 "config.h"
+#include "sky/engine/public/sky/sky_view_client.h"
+
+namespace blink {
+
+SkyViewClient::~SkyViewClient() {
+}
+
+} // namespace blink

engine/public/sky/sky_view_client.h

+// 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_ENGINE_PUBLIC_SKY_SKY_VIEW_CLIENT_H_
+#define SKY_ENGINE_PUBLIC_SKY_SKY_VIEW_CLIENT_H_
+
+namespace blink {
+
+class SkyViewClient {
+ public:
+  virtual void SchedulePaint() = 0;
+
+ protected:
+  virtual ~SkyViewClient();
+};
+
+} // namespace blink
+
+#endif  // SKY_ENGINE_PUBLIC_SKY_SKY_VIEW_CLIENT_H_

examples/raw/hello_world.dart

@@ -2,6 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import "dart:math";
+import 'dart:sky';
+
 void main() {
-    print("Hello, world");
+  print("Hello, world");
+
+  double width = 500.0;
+  double height = 500.0;
+
+  PictureRecorder recorder = new PictureRecorder(width, height);
+  double radius = min(width, height) * 0.45;
+
+  Paint paint = new Paint()..setARGB(255, 0, 255, 0);
+
+  recorder.drawCircle(width / 2, height / 2, radius, paint);
+
+  print("Storing picture");
+  view.picture = recorder.endRecording();
+
+  print("Scheduling paint");
+  view.schedulePaint();
 }

shell/ui/engine.cc

@@ -85,6 +85,13 @@ skia::RefPtr<SkPicture> Engine::Paint() {
       physical_size_.width(), physical_size_.height(), &factory,
       SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag));
 
+  if (sky_view_) {
+    skia::RefPtr<SkPicture> picture = sky_view_->Paint();
+    canvas->clear(SK_ColorBLACK);
+    if (picture)
+      canvas->drawPicture(picture.get());
+  }
+
   if (web_view_)
     web_view_->paint(canvas.get(), blink::WebRect(gfx::Rect(physical_size_)));
 
@@ -149,7 +156,7 @@ void Engine::OnInputEvent(InputEventPtr event) {
 void Engine::LoadURL(const mojo::String& url) {
   // Enable SkyView here.
   if (false) {
-    sky_view_ = blink::SkyView::Create();
+    sky_view_ = blink::SkyView::Create(this);
     sky_view_->Load(GURL(url));
     return;
   }
@@ -182,6 +189,10 @@ void Engine::didCreateIsolate(blink::WebLocalFrame* frame,
                     CreateServiceProvider(config_.service_provider_context));
 }
 
+void Engine::SchedulePaint() {
+  animator_->RequestFrame();
+}
+
 blink::ServiceProvider* Engine::services() {
   return this;
 }

shell/ui/engine.h

@@ -16,6 +16,7 @@
 #include "skia/ext/refptr.h"
 #include "sky/engine/public/platform/ServiceProvider.h"
 #include "sky/engine/public/sky/sky_view.h"
+#include "sky/engine/public/sky/sky_view_client.h"
 #include "sky/engine/public/web/WebFrameClient.h"
 #include "sky/engine/public/web/WebViewClient.h"
 #include "sky/shell/gpu_delegate.h"
@@ -34,7 +35,8 @@ class Engine : public UIDelegate,
                public blink::ServiceProvider,
                public mojo::NavigatorHost,
                public blink::WebFrameClient,
-               public blink::WebViewClient {
+               public blink::WebViewClient,
+               public blink::SkyViewClient {
  public:
   struct Config {
     ServiceProviderContext* service_provider_context;
@@ -75,6 +77,9 @@ class Engine : public UIDelegate,
   void didCreateIsolate(blink::WebLocalFrame* frame,
                         Dart_Isolate isolate) override;
 
+  // SkyViewClient methods:
+  void SchedulePaint() override;
+
   // Services methods:
   mojo::NavigatorHost* NavigatorHost() override;