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"
@@ skipping 255 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::WebDetachReason::Remove);

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

Once this is defined inside WebFrameClient, we should be able to just say:
DetachReason::Remove.

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

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

DCHECK_EQ

   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 105 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