Add some simple HTMLViewer apptests.

mojo/services/html_viewer/html_document.cc

 // Copyright 2014 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 "mojo/services/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 81 matching lines @@
     return true;
 
   // Otherwise we don't know if we're the right app to handle this request. Ask
   // host to do the navigation for us.
   return false;
 }
 
 }  // namespace
 
 HTMLDocument::HTMLDocument(
-    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderImpl* service_provider,
     URLResponsePtr response,
     mojo::Shell* shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread,
     WebMediaPlayerFactory* web_media_player_factory,
     bool is_headless)
     : response_(response.Pass()),
       shell_(shell),
       web_view_(nullptr),
       root_(nullptr),
       view_manager_client_factory_(shell_, this),
       compositor_thread_(compositor_thread),
       web_media_player_factory_(web_media_player_factory),
       is_headless_(is_headless) {
-  exported_services_.AddService(this);
-  exported_services_.AddService(&view_manager_client_factory_);
-  exported_services_.Bind(services.Pass());
+  printf("MSW HTMLDocument::HTMLDocument\n");
+  service_provider->AddService(this);
+  service_provider->AddService(&view_manager_client_factory_);
   Load(response_.Pass());
 }
 
 HTMLDocument::~HTMLDocument() {
-  STLDeleteElements(&ax_provider_impls_);
+  STLDeleteElements(&ax_providers_);
 
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
 void HTMLDocument::OnEmbed(
     View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
+  printf("MSW HTMLDocument::OnEmbed\n");
   DCHECK(!is_headless_);
   root_ = root;
   embedder_service_provider_ = exposed_services.Pass();
   navigator_host_.set_service_provider(embedder_service_provider_.get());
   UpdateWebviewSizeFromViewSize();
   web_layer_tree_view_impl_->set_view(root_);
   root_->AddObserver(this);
 }
 
-void HTMLDocument::Create(mojo::ApplicationConnection* connection,
-                          mojo::InterfaceRequest<AxProvider> request) {
-  if (!web_view_)
-    return;
-  ax_provider_impls_.insert(
-      WeakBindToRequest(new AxProviderImpl(web_view_), &request));
-}
-
 void HTMLDocument::OnViewManagerDisconnected(ViewManager* view_manager) {
   // TODO(aa): Need to figure out how shutdown works.
 }
 
+void HTMLDocument::Create(mojo::ApplicationConnection* connection,
+                          mojo::InterfaceRequest<AxProvider> request) {
+  printf("MSW HTMLDocument::Create (AxProvider) web_view=%p\n", web_view_);
+  if (!did_finish_load_) {
+    // Cache AxProvider interface requests until the document finishes loading.
+    mojo::InterfaceRequest<AxProvider>* cached_request =
+        new mojo::InterfaceRequest<AxProvider>();
+    *cached_request = request.Pass();
+    ax_provider_requests_.insert(cached_request);
+  } else {
+    ax_providers_.insert(
+        WeakBindToRequest(new AxProviderImpl(web_view_), &request));
+  }
+}
+
+// void HTMLDocument::GetLayoutTreeAsText(
+//     const GetLayoutTreeAsTextCallback& callback) {
+//   //callback.Run("foo");
+//   callback.Run(web_view_->mainFrame()->layoutTreeAsText()->utf8());
+// }
+
+// void HTMLDocument::Create(
+//     mojo::ApplicationConnection* connection,
+//     mojo::InterfaceRequest<mojo::HTMLDocumentTestAPI> request) {
+//   WeakBindToRequest(this, &request);
+//   //BindToRequest(this, &request);
+// }
+
 void HTMLDocument::Load(URLResponsePtr response) {
+  printf("MSW HTMLDocument::Load\n");
   web_view_ = blink::WebView::create(this);
   web_layer_tree_view_impl_->set_widget(web_view_);
   ConfigureSettings(web_view_->settings());
   web_view_->setMainFrame(blink::WebLocalFrame::create(this));
 
   GURL url(response->url);
 
   WebURLRequestExtraData* extra_data = new WebURLRequestExtraData;
   extra_data->synthetic_response = response.Pass();
 
   blink::WebURLRequest web_request;
   web_request.initialize();
   web_request.setURL(url);
   web_request.setExtraData(extra_data);
 
   web_view_->mainFrame()->loadRequest(web_request);
+  web_view_->layout();
 }
 
 void HTMLDocument::UpdateWebviewSizeFromViewSize() {
+  printf("MSW HTMLDocument::UpdateWebviewSizeFromViewSize\n");
   web_view_->setDeviceScaleFactor(root_->viewport_metrics().device_pixel_ratio);
   const gfx::Size size_in_pixels(root_->bounds().width, root_->bounds().height);
   const gfx::Size size_in_dips = gfx::ConvertSizeToDIP(
       root_->viewport_metrics().device_pixel_ratio, size_in_pixels);
   web_view_->resize(
       blink::WebSize(size_in_dips.width(), size_in_dips.height()));
   web_layer_tree_view_impl_->setViewportSize(size_in_pixels);
 }
 
 blink::WebStorageNamespace* HTMLDocument::createSessionStorageNamespace() {
   return new WebStorageNamespaceImpl();
 }
 
 void HTMLDocument::initializeLayerTreeView() {
+  printf("MSW HTMLDocument::initializeLayerTreeView\n");
   if (is_headless_) {
     web_layer_tree_view_impl_.reset(
         new WebLayerTreeViewImpl(compositor_thread_, nullptr, nullptr));
     return;
   }
 
   ServiceProviderPtr surfaces_service_provider;
   shell_->ConnectToApplication("mojo:surfaces_service",
                                GetProxy(&surfaces_service_provider), nullptr);
   mojo::SurfacePtr surface;
@@ skipping 81 matching lines @@
 
 void HTMLDocument::didAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line,
     const blink::WebString& stack_trace) {
   VLOG(1) << "[" << source_name.utf8() << "(" << source_line << ")] "
           << message.text.utf8();
 }
 
+void HTMLDocument::didFinishLoad(blink::WebLocalFrame* frame) {
+  did_finish_load_ = true;
+  printf("MSW HTMLDocument::didFinishLoad\n");
+  // Bind any pending AxProviderImpl interface requests... 
+  for (auto it : ax_provider_requests_)
+    ax_providers_.insert(WeakBindToRequest(new AxProviderImpl(web_view_), it));
+  STLDeleteElements(&ax_provider_requests_);
+}
+
 void HTMLDocument::didNavigateWithinPage(
     blink::WebLocalFrame* frame,
     const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType commit_type) {
+  printf("MSW HTMLDocument::didNavigateWithinPage\n");
   if (navigator_host_.get())
     navigator_host_->DidNavigateLocally(history_item.urlString().utf8());
 }
 
 blink::WebEncryptedMediaClient* HTMLDocument::encryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     if (!media_permission_)
       media_permission_.reset(new media::DefaultMediaPermission(true));
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
         make_scoped_ptr(new media::DefaultCdmFactory()),
@@ skipping 15 matching lines @@
 }
 
 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace html_viewer