Plumbs through screen size and scale factor to html_viewer

components/html_viewer/html_viewer.cc

Index: components/html_viewer/html_viewer.cc
diff --git a/components/html_viewer/html_viewer.cc b/components/html_viewer/html_viewer.cc
index dc83c77b97f6af0964183537cc8df2f7ee04046c..d9ae92fb04e555dc13040e93c773cdfc0ca1344e 100644
--- a/components/html_viewer/html_viewer.cc
+++ b/components/html_viewer/html_viewer.cc
@@ -2,28 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
 #include "base/command_line.h"
-#include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread.h"
-#include "components/html_viewer/blink_platform_impl.h"
-#include "components/html_viewer/discardable_memory_allocator.h"
 #include "components/html_viewer/html_document.h"
-#include "components/html_viewer/web_media_player_factory.h"
-#include "components/resource_provider/public/cpp/resource_loader.h"
-#include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
-#include "components/scheduler/renderer/renderer_scheduler.h"
-#include "gin/v8_initializer.h"
+#include "components/html_viewer/setup.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
-#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
@@ -32,14 +23,6 @@
 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
-
-#if defined(OS_ANDROID)
-#include "components/html_viewer/ui_setup_android.h"
-#else
-#include "components/html_viewer/ui_setup.h"
-#endif
 
 using mojo::ApplicationConnection;
 using mojo::Array;
@@ -52,34 +35,8 @@ using mojo::ShellPtr;
 using mojo::String;
 using mojo::URLLoaderPtr;
 using mojo::URLResponsePtr;
-using resource_provider::ResourceLoader;
 
 namespace html_viewer {
-namespace {
-// Switches for html_viewer.
-
-// Enable MediaRenderer in media pipeline instead of using the internal
-// media::Renderer implementation.
-const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
-
-// Disables support for (unprefixed) Encrypted Media Extensions.
-const char kDisableEncryptedMedia[] = "disable-encrypted-media";
-
-// Prevents creation of any output surface.
-const char kIsHeadless[] = "is-headless";
-
-size_t kDesiredMaxMemory = 20 * 1024 * 1024;
-
-// Paths resources are loaded from.
-const char kResourceIcudtl[] = "icudtl.dat";
-const char kResourceResourcesPak[] = "html_viewer_resources.pak";
-const char kResourceUIPak[] = "ui_test.pak";
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-const char kResourceNativesBlob[] = "natives_blob.bin";
-const char kResourceSnapshotBlob[] = "snapshot_blob.bin";
-#endif
-
-}  // namespace
 
 class HTMLViewer;
 
@@ -87,15 +44,11 @@ class HTMLViewerApplication : public mojo::Application {
  public:
   HTMLViewerApplication(InterfaceRequest<Application> request,
                         URLResponsePtr response,
-                        scoped_refptr<base::MessageLoopProxy> compositor_thread,
-                        WebMediaPlayerFactory* web_media_player_factory,
-                        bool is_headless)
+                        Setup* setup)
       : url_(response->url),
         binding_(this, request.Pass()),
         initial_response_(response.Pass()),
-        compositor_thread_(compositor_thread),
-        web_media_player_factory_(web_media_player_factory),
-        is_headless_(is_headless) {}
+        setup_(setup) {}
 
   void Initialize(ShellPtr shell,
                   Array<String> args,
@@ -139,9 +92,9 @@ class HTMLViewerApplication : public mojo::Application {
   void OnResponseReceived(URLLoaderPtr loader,
                           InterfaceRequest<ServiceProvider> services,
                           URLResponsePtr response) {
-    new HTMLDocument(services.Pass(), response.Pass(), shell_.get(),
-                     compositor_thread_, web_media_player_factory_,
-                     is_headless_);
+    // HTMLDocument is destroyed when the hosting view is destroyed.
+    // TODO(sky): when headless, this leaks.
+    new HTMLDocument(services.Pass(), response.Pass(), shell_.get(), setup_);
   }
 
   String url_;
@@ -149,33 +102,25 @@ class HTMLViewerApplication : public mojo::Application {
   ShellPtr shell_;
   mojo::NetworkServicePtr network_service_;
   URLResponsePtr initial_response_;
-  scoped_refptr<base::MessageLoopProxy> compositor_thread_;
-  WebMediaPlayerFactory* web_media_player_factory_;
-  bool is_headless_;
+  Setup* setup_;
+
+  DISALLOW_COPY_AND_ASSIGN(HTMLViewerApplication);
 };
 
 class ContentHandlerImpl : public mojo::InterfaceImpl<ContentHandler> {
  public:
-  ContentHandlerImpl(scoped_refptr<base::MessageLoopProxy> compositor_thread,
-                     WebMediaPlayerFactory* web_media_player_factory,
-                     bool is_headless)
-      : compositor_thread_(compositor_thread),
-        web_media_player_factory_(web_media_player_factory),
-        is_headless_(is_headless) {}
+  explicit ContentHandlerImpl(Setup* setup) : setup_(setup) {}
   ~ContentHandlerImpl() override {}
 
  private:
   // Overridden from ContentHandler:
   void StartApplication(InterfaceRequest<mojo::Application> request,
                         URLResponsePtr response) override {
-    new HTMLViewerApplication(request.Pass(), response.Pass(),
-                              compositor_thread_, web_media_player_factory_,
-                              is_headless_);
+    // HTMLViewerApplication is owned by the binding.
+    new HTMLViewerApplication(request.Pass(), response.Pass(), setup_);
   }
 
-  scoped_refptr<base::MessageLoopProxy> compositor_thread_;
-  WebMediaPlayerFactory* web_media_player_factory_;
-  bool is_headless_;
+  Setup* setup_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
@@ -183,88 +128,23 @@ class ContentHandlerImpl : public mojo::InterfaceImpl<ContentHandler> {
 class HTMLViewer : public mojo::ApplicationDelegate,
                    public mojo::InterfaceFactory<ContentHandler> {
  public:
-  HTMLViewer()
-      : discardable_memory_allocator_(kDesiredMaxMemory),
-        compositor_thread_("compositor thread"),
-        is_headless_(false) {}
-
+  HTMLViewer() {}
   ~HTMLViewer() override { blink::shutdown(); }
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
-    std::set<std::string> paths;
-    paths.insert(kResourceResourcesPak);
-    paths.insert(kResourceIcudtl);
-    paths.insert(kResourceUIPak);
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-    paths.insert(kResourceNativesBlob);
-    paths.insert(kResourceSnapshotBlob);
-#endif
-    ResourceLoader resource_loader(app->shell(), paths);
-    if (!resource_loader.BlockUntilLoaded()) {
-      // Assume on error we're being shut down.
-      LOG(WARNING) << "html_viewer errored getting resources, exiting";
-      mojo::ApplicationImpl::Terminate();
-      return;
-    }
-
-    ui_setup_.reset(new UISetup);
-    base::DiscardableMemoryAllocator::SetInstance(
-        &discardable_memory_allocator_);
-
-    renderer_scheduler_ = scheduler::RendererScheduler::Create();
-    blink_platform_.reset(
-        new BlinkPlatformImpl(app, renderer_scheduler_.get()));
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-    // Note: this requires file system access.
-    CHECK(gin::V8Initializer::LoadV8SnapshotFromFD(
-        resource_loader.ReleaseFile(kResourceNativesBlob).TakePlatformFile(),
-        0u, 0u,
-        resource_loader.ReleaseFile(kResourceSnapshotBlob).TakePlatformFile(),
-        0u, 0u));
-#endif
-    blink::initialize(blink_platform_.get());
-    base::i18n::InitializeICUWithFileDescriptor(
-        resource_loader.ReleaseFile(kResourceIcudtl).TakePlatformFile(),
-        base::MemoryMappedFile::Region::kWholeFile);
-
-    ui::RegisterPathProvider();
-
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-
-    logging::LoggingSettings settings;
-    settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-    logging::InitLogging(settings);
-    // Display process ID, thread ID and timestamp in logs.
-    logging::SetLogItems(true, true, true, false);
-
-    if (command_line->HasSwitch(kDisableEncryptedMedia))
-      blink::WebRuntimeFeatures::enableEncryptedMedia(false);
-
-    is_headless_ = command_line->HasSwitch(kIsHeadless);
-    if (!is_headless_) {
-      ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
-          resource_loader.ReleaseFile(kResourceResourcesPak),
-          base::MemoryMappedFile::Region::kWholeFile);
-      ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
-          resource_loader.ReleaseFile(kResourceUIPak), ui::SCALE_FACTOR_100P);
-    }
-
-    compositor_thread_.Start();
-#if defined(OS_ANDROID)
-    // TODO(sky): Get WebMediaPlayerFactory working on android.
-    NOTIMPLEMENTED();
-#else
-    bool enable_mojo_media_renderer =
-        command_line->HasSwitch(kEnableMojoMediaRenderer);
-
-    web_media_player_factory_.reset(new WebMediaPlayerFactory(
-        compositor_thread_.message_loop_proxy(), enable_mojo_media_renderer));
-#endif
+    setup_.reset(new Setup(app));
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
+    // If we're not being connected to from the view manager assume we're being
+    // run in tests, or a headless environment, in which case we'll never get a
+    // ui and there is no point in waiting for it.
+    if (connection->GetRemoteApplicationURL() != "mojo://view_manager/" &&
+        !setup_->did_init()) {
+      setup_->InitHeadless();
+    }
     connection->AddService(this);
     return true;
   }
@@ -272,28 +152,10 @@ class HTMLViewer : public mojo::ApplicationDelegate,
   // Overridden from InterfaceFactory<ContentHandler>
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<ContentHandler> request) override {
-    BindToRequest(
-        new ContentHandlerImpl(compositor_thread_.message_loop_proxy(),
-                               web_media_player_factory_.get(), is_headless_),
-        &request);
+    BindToRequest(new ContentHandlerImpl(setup_.get()), &request);
   }
 
-  scoped_ptr<UISetup> ui_setup_;
-
-  // Skia requires that we have one of these. Unlike the one used in chrome,
-  // this doesn't use purgable shared memory. Instead, it tries to free the
-  // oldest unlocked chunks on allocation.
-  //
-  // TODO(erg): In the long run, delete this allocator and get the real shared
-  // memory based purging allocator working here.
-  DiscardableMemoryAllocator discardable_memory_allocator_;
-
-  scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_;
-  scoped_ptr<BlinkPlatformImpl> blink_platform_;
-  base::Thread compositor_thread_;
-  scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_;
-  // Set if the content will never be displayed.
-  bool is_headless_;
+  scoped_ptr<Setup> setup_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };