Mojo: simple iframe support.

mojo/services/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/services/html_viewer/html_document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
@@ skipping 63 matching lines @@
   // 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
 
 HTMLDocumentView::HTMLDocumentView(ServiceProvider* service_provider,
                                    ViewManager* view_manager)
     : view_manager_(view_manager),
+      navigator_host_(service_provider),
       web_view_(NULL),
       root_(NULL),
       repaint_pending_(false),
-      navigator_host_(service_provider),
       weak_factory_(this) {
 }
 
 HTMLDocumentView::~HTMLDocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
@@ skipping 40 matching lines @@
 
 bool HTMLDocumentView::allowsBrokenNullLayerTreeView() const {
   // TODO(darin): Switch to using compositor bindings.
   //
   // NOTE: Note to Blink maintainers, feel free to break this code if it is the
   // last NOT using compositor bindings and you want to delete this code path.
   //
   return true;
 }
 
+blink::WebFrame* HTMLDocumentView::createChildFrame(
+    blink::WebLocalFrame* parent,
+    const blink::WebString& frameName) {
+  blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(this);
+  parent->appendChild(web_frame);
+  return web_frame;
+}
+
+void HTMLDocumentView::frameDetached(blink::WebFrame* frame) {
+  if (frame->parent())
+    frame->parent()->removeChild(frame);
+
+  // |frame| is invalid after here.
+  frame->close();
+}
+
 blink::WebCookieJar* HTMLDocumentView::cookieJar(blink::WebLocalFrame* frame) {
   // TODO(darin): Blink does not fallback to the Platform provided WebCookieJar.
   // Either it should, as it once did, or we should find another solution here.
   return blink::Platform::current()->cookieJar();
 }
 
 blink::WebNavigationPolicy HTMLDocumentView::decidePolicyForNavigation(
     blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* data,
     const blink::WebURLRequest& request, blink::WebNavigationType nav_type,
     blink::WebNavigationPolicy default_policy, bool is_redirect) {
@@ skipping 57 matching lines @@
 
   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));
 
   root_->SetContents(canvas->getDevice()->accessBitmap(false));
 }
 
 }  // namespace mojo