Make shake-to-reload actually work

sky/shell/ui/engine.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 "sky/shell/ui/engine.h"
 
 #include "base/bind.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
 #include "sky/engine/public/web/Sky.h"
 #include "sky/engine/public/web/WebLocalFrame.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/services/platform/platform_impl.h"
+#include "sky/shell/java_service_provider.h"
 #include "sky/shell/ui/animator.h"
 #include "sky/shell/ui/input_event_converter.h"
 #include "sky/shell/ui/internals.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace sky {
 namespace shell {
 
 namespace {
 
 void ConfigureSettings(blink::WebSettings* settings) {
   settings->setDefaultFixedFontSize(13);
   settings->setDefaultFontSize(16);
   settings->setLoadsImagesAutomatically(true);
 }
 
 }
 
 Engine::Engine(const Config& config)
-    : animator_(new Animator(config, this)),
+    : java_task_runner_(config.java_task_runner),
+      animator_(new Animator(config, this)),
       web_view_(nullptr),
       device_pixel_ratio_(1.0f),
       viewport_observer_binding_(this),
       weak_factory_(this) {
 }
 
 Engine::~Engine() {
   if (web_view_)
     web_view_->close();
 }
 
 base::WeakPtr<Engine> Engine::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
-void Engine::Init(mojo::ScopedMessagePipeHandle service_provider_handle) {
-  service_provider_ =
-      mojo::MakeProxy<mojo::ServiceProvider>(service_provider_handle.Pass());
+mojo::ServiceProviderPtr Engine::CreateServiceProvider() {
+  mojo::MessagePipe pipe;
+  java_task_runner_->PostTask(FROM_HERE, base::Bind(
+    CreateJavaServiceProvider,
+    base::Passed(mojo::MakeRequest<mojo::ServiceProvider>(
+        pipe.handle1.Pass()))));
+  return mojo::MakeProxy<mojo::ServiceProvider>(pipe.handle0.Pass());
+}
+
+void Engine::Init() {
+  service_provider_ = CreateServiceProvider();
   mojo::NetworkServicePtr network_service;
   mojo::ConnectToService(service_provider_.get(), &network_service);
   platform_impl_.reset(new PlatformImpl(network_service.Pass()));
 
   blink::initialize(platform_impl_.get());
 }
 
 void Engine::BeginFrame(base::TimeTicks frame_time) {
   double frame_time_sec = (frame_time - base::TimeTicks()).InSecondsF();
   double deadline_sec = frame_time_sec;
@@ skipping 73 matching lines @@
 
 void Engine::initializeLayerTreeView() {
 }
 
 void Engine::scheduleVisualUpdate() {
   animator_->RequestFrame();
 }
 
 void Engine::didCreateIsolate(blink::WebLocalFrame* frame,
                               Dart_Isolate isolate) {
-  Internals::Create(isolate, service_provider_.Pass());
+  Internals::Create(isolate, CreateServiceProvider());
 }
 
 blink::ServiceProvider* Engine::services() {
   return this;
 }
 
 mojo::NavigatorHost* Engine::NavigatorHost() {
   return this;
 }
 
 void Engine::RequestNavigate(mojo::Target target,
                              mojo::URLRequestPtr request) {
   // Ignoring target for now.
   base::MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&Engine::LoadURL, GetWeakPtr(), request->url));
 }
 
 void Engine::DidNavigateLocally(const mojo::String& url) {
 }
 
 void Engine::RequestNavigateHistory(int32_t delta) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace shell
 }  // namespace sky