third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp - Issue 2149893003: Rename Node::inShadowIncludingDocument() to Node::isConnected()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp

Issue 2149893003: Rename Node::inShadowIncludingDocument() to Node::isConnected() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLImageElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp b/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp

index 71a42e5b6bd23f8a49e4bd30ecc18550a24ab784..06650b0a17907ec5cace4471563a75f51188d6f6 100644

--- a/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp

@@ -96,7 +96,7 @@ void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName

void HTMLIFrameElement::parseAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& value)

{

if (name == nameAttr) {

- if (inShadowIncludingDocument() && document().isHTMLDocument() && !isInShadowTree()) {

+ if (isConnected() && document().isHTMLDocument() && !isInShadowTree()) {

HTMLDocument& document = toHTMLDocument(this->document());

document.removeExtraNamedItem(m_name);

document.addExtraNamedItem(value);

@@ -137,7 +137,7 @@ LayoutObject* HTMLIFrameElement::createLayoutObject(const ComputedStyle&)

Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode* insertionPoint)

{

InsertionNotificationRequest result = HTMLFrameElementBase::insertedInto(insertionPoint);

- if (insertionPoint->inShadowIncludingDocument() && document().isHTMLDocument() && !insertionPoint->isInShadowTree())

+ if (insertionPoint->isConnected() && document().isHTMLDocument() && !insertionPoint->isInShadowTree())

toHTMLDocument(document()).addExtraNamedItem(m_name);

logAddElementIfIsolatedWorldAndInDocument("iframe", srcAttr);

return result;

@@ -146,7 +146,7 @@ Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode

void HTMLIFrameElement::removedFrom(ContainerNode* insertionPoint)

{

HTMLFrameElementBase::removedFrom(insertionPoint);

- if (insertionPoint->inShadowIncludingDocument() && document().isHTMLDocument() && !insertionPoint->isInShadowTree())

+ if (insertionPoint->isConnected() && document().isHTMLDocument() && !insertionPoint->isInShadowTree())

toHTMLDocument(document()).removeExtraNamedItem(m_name);

}