Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Side by Side Diff: Source/WebCore/dom/ContainerNodeAlgorithms.cpp

Issue 10914322: Merge 127534 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/dom/ContainerNodeAlgorithms.h ('k') | Source/WebCore/dom/Node.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2012 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 if (ElementShadow* shadow = toElement(node)->shadow()) { 103 if (ElementShadow* shadow = toElement(node)->shadow()) {
104 ShadowRootVector roots(shadow); 104 ShadowRootVector roots(shadow);
105 for (size_t i = 0; i < roots.size(); ++i) 105 for (size_t i = 0; i < roots.size(); ++i)
106 notifyNodeRemovedFromTree(roots[i].get()); 106 notifyNodeRemovedFromTree(roots[i].get());
107 } 107 }
108 } 108 }
109 109
110 void ChildFrameDisconnector::collectDescendant(ElementShadow* shadow) 110 void ChildFrameDisconnector::collectDescendant(ElementShadow* shadow)
111 { 111 {
112 for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->old erShadowRoot()) 112 for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->old erShadowRoot())
113 collectDescendant(root); 113 collectDescendant(root, IncludeRoot);
114 } 114 }
115 115
116 void ChildFrameDisconnector::Target::disconnect() 116 void ChildFrameDisconnector::Target::disconnect()
117 { 117 {
118 ASSERT(isValid()); 118 ASSERT(isValid());
119 toFrameOwnerElement(m_owner.get())->disconnectContentFrame(); 119 toFrameOwnerElement(m_owner.get())->disconnectContentFrame();
120 } 120 }
121 121
122 } 122 }
OLDNEW
« no previous file with comments | « Source/WebCore/dom/ContainerNodeAlgorithms.h ('k') | Source/WebCore/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698