| Index: third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
|
| index bf542455627384c567cc92ad43c54f09e8481c31..d4e02bdc2ac2614850fd547f16057e9eff501f51 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
|
| @@ -134,7 +134,7 @@ void HTMLLinkElement::parseAttribute(const QualifiedName& name, const AtomicStri
|
|
|
| bool HTMLLinkElement::shouldLoadLink()
|
| {
|
| - return inShadowIncludingDocument();
|
| + return isConnected();
|
| }
|
|
|
| bool HTMLLinkElement::loadLink(const String& type, const String& as, const String& media, const KURL& url)
|
| @@ -144,7 +144,7 @@ bool HTMLLinkElement::loadLink(const String& type, const String& as, const Strin
|
|
|
| LinkResource* HTMLLinkElement::linkResourceToProcess()
|
| {
|
| - bool visible = inShadowIncludingDocument() && !m_isInShadowTree;
|
| + bool visible = isConnected() && !m_isInShadowTree;
|
| if (!visible) {
|
| ASSERT(!linkStyle() || !linkStyle()->hasSheet());
|
| return nullptr;
|
| @@ -202,7 +202,7 @@ Node::InsertionNotificationRequest HTMLLinkElement::insertedInto(ContainerNode*
|
| {
|
| HTMLElement::insertedInto(insertionPoint);
|
| logAddElementIfIsolatedWorldAndInDocument("link", relAttr, hrefAttr);
|
| - if (!insertionPoint->inShadowIncludingDocument())
|
| + if (!insertionPoint->isConnected())
|
| return InsertionDone;
|
|
|
| m_isInShadowTree = isInShadowTree();
|
| @@ -225,7 +225,7 @@ Node::InsertionNotificationRequest HTMLLinkElement::insertedInto(ContainerNode*
|
| void HTMLLinkElement::removedFrom(ContainerNode* insertionPoint)
|
| {
|
| HTMLElement::removedFrom(insertionPoint);
|
| - if (!insertionPoint->inShadowIncludingDocument())
|
| + if (!insertionPoint->isConnected())
|
| return;
|
|
|
| m_linkLoader->released();
|
| @@ -440,7 +440,7 @@ enum StyleSheetCacheStatus {
|
|
|
| void LinkStyle::setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CSSStyleSheetResource* cachedStyleSheet)
|
| {
|
| - if (!m_owner->inShadowIncludingDocument()) {
|
| + if (!m_owner->isConnected()) {
|
| ASSERT(!m_sheet);
|
| return;
|
| }
|
|
|