Rename ViewportObserver to SkyEngine

The term ViewportObserver doesn't mean anything. This interface has evolved to
control the engine. This new name reflects that.

TBR=eseidel@google.com

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

engine/src/flutter/shell/BUILD.gn

@@ -19,8 +19,8 @@ common_deps = [
   "//sky/engine",
   "//sky/engine/tonic",
   "//sky/engine/wtf",
+  "//sky/services/engine",
   "//sky/services/platform",
-  "//sky/services/viewport",
   "//sky/shell/dart",
   "//ui/gfx/geometry",
   "//ui/gl",
@@ -116,8 +116,8 @@ if (is_android) {
       "//mojo/public/java:system",
       "//mojo/services/network/public/interfaces:interfaces_java",
       "//services/keyboard",
+      "//sky/services/engine:engine_java",
       "//sky/services/oknet",
-      "//sky/services/viewport:viewport_java",
     ]
   }
 

engine/src/flutter/shell/android/org/domokit/sky/shell/PlatformViewAndroid.java

@@ -23,7 +23,7 @@ import org.chromium.mojom.sky.EventType;
 import org.chromium.mojom.sky.InputEvent;
 import org.chromium.mojom.sky.PointerData;
 import org.chromium.mojom.sky.PointerKind;
-import org.chromium.mojom.sky.ViewportObserver;
+import org.chromium.mojom.sky.SkyEngine;
 
 /**
  * A view containing Sky
@@ -34,7 +34,7 @@ public class PlatformViewAndroid extends SurfaceView
     private static final String TAG = "PlatformViewAndroid";
 
     private long mNativePlatformView;
-    private ViewportObserver.Proxy mViewportObserver;
+    private SkyEngine.Proxy mSkyEngine;
     private final SurfaceHolder.Callback mSurfaceCallback;
     private GestureProvider mGestureProvider;
 
@@ -52,8 +52,8 @@ public class PlatformViewAndroid extends SurfaceView
         mSurfaceCallback = new SurfaceHolder.Callback() {
             @Override
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-                assert mViewportObserver != null;
-                mViewportObserver.onViewportMetricsChanged(width, height, density);
+                assert mSkyEngine != null;
+                mSkyEngine.onViewportMetricsChanged(width, height, density);
             }
 
             @Override
@@ -145,7 +145,7 @@ public class PlatformViewAndroid extends SurfaceView
 
 
 
-        mViewportObserver.onInputEvent(inputEvent);
+        mSkyEngine.onInputEvent(inputEvent);
     }
 
     @Override
@@ -173,28 +173,28 @@ public class PlatformViewAndroid extends SurfaceView
 
     @Override
     public void onGestureEvent(InputEvent event) {
-        mViewportObserver.onInputEvent(event);
+        mSkyEngine.onInputEvent(event);
     }
 
     public void onBackPressed() {
         InputEvent event = new InputEvent();
         event.type = EventType.BACK;
-        mViewportObserver.onInputEvent(event);
+        mSkyEngine.onInputEvent(event);
     }
 
     public void loadSnapshot(String path) {
-        mViewportObserver.runFromSnapshot(path);
+        mSkyEngine.runFromSnapshot(path);
     }
 
     public void loadUrl(String url) {
-        mViewportObserver.runFromNetwork(url);
+        mSkyEngine.runFromNetwork(url);
     }
 
     private void attach() {
         Core core = CoreImpl.getInstance();
-        Pair<ViewportObserver.Proxy, InterfaceRequest<ViewportObserver>> result =
-                ViewportObserver.MANAGER.getInterfaceRequest(core);
-        mViewportObserver = result.first;
+        Pair<SkyEngine.Proxy, InterfaceRequest<SkyEngine>> result =
+                SkyEngine.MANAGER.getInterfaceRequest(core);
+        mSkyEngine = result.first;
         mNativePlatformView = nativeAttach(result.second.passHandle().releaseNativeHandle());
     }
 

engine/src/flutter/shell/android/platform_view_android.cc

@@ -17,13 +17,13 @@
 namespace sky {
 namespace shell {
 
-static jlong Attach(JNIEnv* env, jclass clazz, jint viewportObserverHandle) {
+static jlong Attach(JNIEnv* env, jclass clazz, jint skyEngineHandle) {
   ShellView* shell_view = new ShellView(Shell::Shared());
   auto view = static_cast<PlatformViewAndroid*>(shell_view->view());
   view->SetShellView(make_scoped_ptr(shell_view));
-  view->ConnectToViewportObserver(
-      mojo::MakeRequest<ViewportObserver>(mojo::ScopedMessagePipeHandle(
-          mojo::MessagePipeHandle(viewportObserverHandle))));
+  view->ConnectToEngine(
+      mojo::MakeRequest<SkyEngine>(mojo::ScopedMessagePipeHandle(
+          mojo::MessagePipeHandle(skyEngineHandle))));
   return reinterpret_cast<jlong>(shell_view->view());
 }
 

engine/src/flutter/shell/ios/sky_surface.mm

@@ -8,14 +8,13 @@
 #import <OpenGLES/EAGL.h>
 #import <OpenGLES/EAGLDrawable.h>
 
-#include "sky/shell/ios/platform_view_ios.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/shell_view.h"
-#include "sky/shell/ui_delegate.h"
-
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "sky/services/viewport/input_event.mojom.h"
 #include "base/time/time.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
+#include "sky/services/engine/input_event.mojom.h"
+#include "sky/shell/ios/platform_view_ios.h"
+#include "sky/shell/shell_view.h"
+#include "sky/shell/shell.h"
+#include "sky/shell/ui_delegate.h"
 
 static inline sky::EventType EventTypeFromUITouchPhase(UITouchPhase phase) {
   switch (phase) {
@@ -60,7 +59,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
 @implementation SkySurface {
   BOOL _platformViewInitialized;
 
-  sky::ViewportObserverPtr _viewport_observer;
+  sky::SkyEnginePtr _sky_engine;
   scoped_ptr<sky::shell::ShellView> _shell_view;
 }
 
@@ -87,8 +86,8 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
   CGSize size = self.bounds.size;
   CGFloat scale = [UIScreen mainScreen].scale;
 
-  _viewport_observer->OnViewportMetricsChanged(size.width * scale,
-                                               size.height * scale, scale);
+  _sky_engine->OnViewportMetricsChanged(size.width * scale,
+                                        size.height * scale, scale);
 }
 
 - (void)configureLayerDefaults {
@@ -109,7 +108,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
   _platformViewInitialized = YES;
 
   [self notifySurfaceCreation];
-  [self connectToViewportObserverAndLoad];
+  [self connectToEngineAndLoad];
 }
 
 - (sky::shell::PlatformViewIOS*)platformView {
@@ -126,12 +125,12 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
   return [NSBundle mainBundle].infoDictionary[@"com.google.sky.load_url"];
 }
 
-- (void)connectToViewportObserverAndLoad {
-  auto interface_request = mojo::GetProxy(&_viewport_observer);
-  self.platformView->ConnectToViewportObserver(interface_request.Pass());
+- (void)connectToEngineAndLoad {
+  auto interface_request = mojo::GetProxy(&_sky_engine);
+  self.platformView->ConnectToEngine(interface_request.Pass());
 
   mojo::String string(self.skyInitialLoadURL.UTF8String);
-  _viewport_observer->RunFromNetwork(string);
+  _sky_engine->RunFromNetwork(string);
 }
 
 - (void)notifySurfaceDestruction {
@@ -157,7 +156,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
     input->pointer_data->x = windowCoordinates.x * scale;
     input->pointer_data->y = windowCoordinates.y * scale;
 
-    _viewport_observer->OnInputEvent(input.Pass());
+    _sky_engine->OnInputEvent(input.Pass());
   }
 }
 
@@ -223,7 +222,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
 
   auto input = BasicInputEventFromRecognizer(
     sky::EVENT_TYPE_GESTURE_FLING_START, recognizer);
-  _viewport_observer->OnInputEvent(input.Pass());
+  _sky_engine->OnInputEvent(input.Pass());
 }
 
 -(void) onLongPress:(UILongPressGestureRecognizer *) recognizer {
@@ -233,7 +232,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
 
   auto input = BasicInputEventFromRecognizer(sky::EVENT_TYPE_GESTURE_LONG_PRESS,
                                              recognizer);
-  _viewport_observer->OnInputEvent(input.Pass());
+  _sky_engine->OnInputEvent(input.Pass());
 }
 
 -(void) onScroll:(UIPanGestureRecognizer *) recognizer {
@@ -268,7 +267,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
   input->gesture_data->velocityX = velocity.x * scale;
   input->gesture_data->velocityY =  velocity.y * scale;
 
-  _viewport_observer->OnInputEvent(input.Pass());
+  _sky_engine->OnInputEvent(input.Pass());
 }
 
 -(void) onTap:(UITapGestureRecognizer *) recognizer {
@@ -279,7 +278,7 @@ static sky::InputEventPtr BasicInputEventFromRecognizer(
 
   auto input = BasicInputEventFromRecognizer(sky::EVENT_TYPE_GESTURE_TAP,
                                              recognizer);
-  _viewport_observer->OnInputEvent(input.Pass());
+  _sky_engine->OnInputEvent(input.Pass());
 }
 
 #pragma mark - Misc.

engine/src/flutter/shell/platform_view.cc

@@ -24,10 +24,10 @@ PlatformView::PlatformView(const PlatformView::Config& config)
 PlatformView::~PlatformView() {
 }
 
-void PlatformView::ConnectToViewportObserver(
-    mojo::InterfaceRequest<ViewportObserver> request) {
+void PlatformView::ConnectToEngine(
+    mojo::InterfaceRequest<SkyEngine> request) {
   config_.ui_task_runner->PostTask(
-      FROM_HERE, base::Bind(&UIDelegate::ConnectToViewportObserver,
+      FROM_HERE, base::Bind(&UIDelegate::ConnectToEngine,
                             config_.ui_delegate, base::Passed(&request)));
 }
 

engine/src/flutter/shell/platform_view.h

@@ -26,8 +26,7 @@ class PlatformView {
 
   virtual ~PlatformView();
 
-  void ConnectToViewportObserver(
-      mojo::InterfaceRequest<ViewportObserver> request);
+  void ConnectToEngine(mojo::InterfaceRequest<SkyEngine> request);
 
  protected:
   explicit PlatformView(const Config& config);

engine/src/flutter/shell/testing/test_runner.cc

@@ -60,8 +60,8 @@ TestRunner::TestRunner()
     weak_ptr_factory_(this) {
   CHECK(!g_test_runner) << "Only create one TestRunner.";
 
-  shell_view_->view()->ConnectToViewportObserver(GetProxy(&viewport_observer_));
-  viewport_observer_->OnViewportMetricsChanged(320, 640, 1.0);
+  shell_view_->view()->ConnectToEngine(GetProxy(&sky_engine_));
+  sky_engine_->OnViewportMetricsChanged(320, 640, 1.0);
 }
 
 TestRunner::~TestRunner() {
@@ -121,7 +121,7 @@ void TestRunner::Run() {
 
   if (StartsWithASCII(data.url, kFileUrlPrefix, true))
     ReplaceFirstSubstringAfterOffset(&data.url, 0, kFileUrlPrefix, "");
-  viewport_observer_->RunFromFile(data.url, package_root_);
+  sky_engine_->RunFromFile(data.url, package_root_);
 }
 
 }  // namespace shell

engine/src/flutter/shell/testing/test_runner.h

@@ -11,8 +11,8 @@
 #include "base/memory/weak_ptr.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
+#include "sky/services/engine/sky_engine.mojom.h"
 #include "sky/services/testing/test_harness.mojom.h"
-#include "sky/services/viewport/viewport_observer.mojom.h"
 
 namespace sky {
 namespace shell {
@@ -46,7 +46,7 @@ class TestRunner : public mojo::InterfaceFactory<TestHarness>,
 
   std::string package_root_;
   scoped_ptr<ShellView> shell_view_;
-  ViewportObserverPtr viewport_observer_;
+  SkyEnginePtr sky_engine_;
 
   std::string single_test_url_;
   mojo::WeakBindingSet<TestHarness> bindings_;

engine/src/flutter/shell/ui/engine.cc

@@ -54,7 +54,7 @@ Engine::Engine(const Config& config)
     : config_(config),
       animator_(new Animator(config, this)),
       device_pixel_ratio_(1.0f),
-      viewport_observer_binding_(this),
+      binding_(this),
       weak_factory_(this) {
 }
 
@@ -105,9 +105,8 @@ skia::RefPtr<SkPicture> Engine::Paint() {
   return skia::AdoptRef(recorder.endRecordingAsPicture());
 }
 
-void Engine::ConnectToViewportObserver(
-    mojo::InterfaceRequest<ViewportObserver> request) {
-  viewport_observer_binding_.Bind(request.Pass());
+void Engine::ConnectToEngine(mojo::InterfaceRequest<SkyEngine> request) {
+  binding_.Bind(request.Pass());
 }
 
 void Engine::OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) {

engine/src/flutter/shell/ui/engine.h

@@ -29,7 +29,7 @@ namespace shell {
 class Animator;
 
 class Engine : public UIDelegate,
-               public ViewportObserver,
+               public SkyEngine,
                public blink::ServiceProvider,
                public mojo::NavigatorHost,
                public blink::SkyViewClient {
@@ -55,13 +55,12 @@ class Engine : public UIDelegate,
   skia::RefPtr<SkPicture> Paint();
 
  private:
-  // UIDelegate methods:
-  void ConnectToViewportObserver(
-      mojo::InterfaceRequest<ViewportObserver> request) override;
+  // UIDelegate implementation:
+  void ConnectToEngine(mojo::InterfaceRequest<SkyEngine> request) override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override;
   void OnOutputSurfaceDestroyed() override;
 
-  // ViewportObserver:
+  // SkyEngine implementation:
   void OnViewportMetricsChanged(int width, int height,
                                 float device_pixel_ratio) override;
   void OnInputEvent(InputEventPtr event) override;
@@ -96,7 +95,7 @@ class Engine : public UIDelegate,
 
   float device_pixel_ratio_;
   gfx::Size physical_size_;
-  mojo::Binding<ViewportObserver> viewport_observer_binding_;
+  mojo::Binding<SkyEngine> binding_;
 
   base::WeakPtrFactory<Engine> weak_factory_;
 

engine/src/flutter/shell/ui/input_event_converter.h

@@ -6,7 +6,7 @@
 #define SKY_SHELL_UI_INPUT_EVENT_CONVERTER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "sky/services/viewport/input_event.mojom.h"
+#include "sky/services/engine/input_event.mojom.h"
 
 namespace blink {
 class WebInputEvent;

engine/src/flutter/shell/ui_delegate.h

@@ -6,7 +6,7 @@
 #define SKY_SHELL_UI_DELEGATE_H_
 
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "sky/services/viewport/viewport_observer.mojom.h"
+#include "sky/services/engine/sky_engine.mojom.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -15,8 +15,7 @@ namespace shell {
 
 class UIDelegate {
  public:
-  virtual void ConnectToViewportObserver(
-      mojo::InterfaceRequest<ViewportObserver> request) = 0;
+  virtual void ConnectToEngine(mojo::InterfaceRequest<SkyEngine> request) = 0;
   virtual void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) = 0;
   virtual void OnOutputSurfaceDestroyed() = 0;