Detach old frame on WebFrame::swap.

components/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 "components/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"
 #include "base/single_thread_task_runner.h"
@@ skipping 257 matching lines @@
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& frameName,
     blink::WebSandboxFlags sandboxFlags) {
   blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(scope, this);
   parent->appendChild(web_frame);
   return web_frame;
 }
 
 void HTMLDocument::frameDetached(blink::WebFrame* frame) {
+  frameDetached(frame, blink::WebFrameClient::DetachType::Remove);

[dcheng, 2015/06/01 21:15:54]

Ditto. DetachType::Remove should work. Similar comment for the
blink::WebFrameClient/blink::WebRemoteFrameClient qualifiers elsewhere in this
patch.

[lfg, 2015/06/01 21:34:19]

Done.

+}
+
+void HTMLDocument::frameDetached(blink::WebFrame* frame,
+                                 blink::DetachType type) {
+  DCHECK(type == blink::DetachType::Remove);

[dcheng, 2015/06/01 21:15:54]

DCHECK_EQ(DetatchType::Remove, type) here and elsewhere.

I guess this is to assert that we don't support OOPI in mandoline yet? I think
we've been planning to make sure it works there though?

[lfg, 2015/06/01 21:34:19]

Yes, this assert is here because we don't support OOPIF in mandoline. There are
plans to support it, but since it's a non-trivial amount of work I've added the
assert. When we start adding the OOPIF support, it'll be easy to remove the
assert.

We can't use DCHECK_EQ, because base::logging doesn't know how to print the enum
type.

   if (frame->parent())
     frame->parent()->removeChild(frame);
 
   // |frame| is invalid after here.
   frame->close();
 }
 
 blink::WebCookieJar* HTMLDocument::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.
@@ skipping 99 matching lines @@
   return media_permission_.get();
 }
 
 media::CdmFactory* HTMLDocument::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
 
 }  // namespace html_viewer