Detach old frame on WebFrame::swap.

components/html_viewer/html_document.cc

Index: components/html_viewer/html_document.cc
diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
index 39472d4ccc55b3bc82b459f87b87aa2a280bb49f..78abe55664f55507f6482b7ae49fe14058cb98c6 100644
--- a/components/html_viewer/html_document.cc
+++ b/components/html_viewer/html_document.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -276,6 +276,12 @@ blink::WebFrame* HTMLDocument::createChildFrame(
 }
 
 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);