Fix sky_viewer when being run from a skyx snapshot.

dattto · Aug 26, 2015 · d63163d · d63163d
1 parent 82bf8bc
commit d63163d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/services/sky/document_view.cc b/services/sky/document_view.cc
@@ -130,9 +130,10 @@ void DocumentView::OnEmbed(
   services_provided_by_embedder_ = services_provided_by_embedder.Pass();
 
   Load(response_.Pass());
+}
 
+void DocumentView::UpdateRootMetricsAndAddObserver() {
   UpdateRootSizeAndViewportMetrics(root_->bounds());
-
   root_->AddObserver(this);
 }
 
@@ -142,8 +143,10 @@ void DocumentView::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
 
 void DocumentView::LoadFromSnapshotStream(
     String name, mojo::ScopedDataPipeConsumerHandle snapshot) {
-  if (sky_view_)
+  if (sky_view_) {
     sky_view_->RunFromSnapshot(name, snapshot.Pass());
+    UpdateRootMetricsAndAddObserver();
+  }
 }
 
 void DocumentView::Load(mojo::URLResponsePtr response) {
@@ -168,6 +171,7 @@ void DocumentView::Load(mojo::URLResponsePtr response) {
       network_service_.get(),
       CreatePrefetchedLibraryIfNeeded(name, response.Pass())));
   sky_view_->RunFromLibrary(name, library_provider_.get());
+  UpdateRootMetricsAndAddObserver();
 }
 
 scoped_ptr<Rasterizer> DocumentView::CreateRasterizer() {

diff --git a/services/sky/document_view.h b/services/sky/document_view.h
@@ -109,6 +109,8 @@ class DocumentView : public blink::ServiceProvider,
   void LoadFromSnapshotStream(String name,
                               mojo::ScopedDataPipeConsumerHandle snapshot);
 
+  void UpdateRootMetricsAndAddObserver();
+
   void UpdateRootSizeAndViewportMetrics(const mojo::Rect& new_bounds);
 
   void InitServiceRegistry();