Preliminary interactive layout of window manager's demo_launcher

mojo/examples/html_viewer/html_document_view.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/examples/html_viewer/html_document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 84 matching lines @@
 
 void HTMLDocumentView::AttachToNode(view_manager::Node* node) {
   node->SetActiveView(view_);
   view_->SetColor(SK_ColorCYAN);  // Dummy background color.
 
   web_view_ = blink::WebView::create(this);
   ConfigureSettings(web_view_->settings());
   web_view_->setMainFrame(blink::WebLocalFrame::create(this));
 
   web_view_->resize(gfx::Size(node->bounds().size()));
+
+  node->AddObserver(this);

[sky, 2014/07/14 19:15:27]

You need to remove this observer too.

[hansmuller, 2014/07/14 22:16:42]

Done.

 }
 
 void HTMLDocumentView::Load(URLResponsePtr response) {
   DCHECK(web_view_);
 
   GURL url(response->url);
 
   WebURLRequestExtraData* extra_data = new WebURLRequestExtraData;
   extra_data->synthetic_response = response.Pass();
 
@@ skipping 62 matching lines @@
 
 void HTMLDocumentView::OnViewInputEvent(view_manager::View* view,
                                         const EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       TypeConverter<EventPtr, scoped_ptr<blink::WebInputEvent> >::ConvertTo(
           event);
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
+void HTMLDocumentView::OnNodeBoundsChanged(view_manager::Node* node,
+                                           const gfx::Rect&,
+                                           const gfx::Rect&) {
+  web_view_->resize(gfx::Size(node->bounds().size()));

[sky, 2014/07/14 19:15:27]

You don't need the gfx::Size here. node->bounds().size() already returns a
gfx::Size.

[hansmuller, 2014/07/14 22:16:42]

Done.

+}
+
 void HTMLDocumentView::Repaint() {
   repaint_pending_ = false;
 
   web_view_->animate(0.0);
   web_view_->layout();
 
   int width = web_view_->size().width;
   int height = web_view_->size().height;
 
   skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(SkCanvas::NewRaster(
       SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType)));
 
   web_view_->paint(canvas.get(), gfx::Rect(0, 0, width, height));
 
   view_->SetContents(canvas->getDevice()->accessBitmap(false));
 }
 
 }  // namespace examples
 }  // namespace mojo