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

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

Issue 1569273004: Move ResourceOwner on to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win_chromium_compile_dbg_ng is the worst Created 4 years, 11 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
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 148eba27bca841209b44c02459e4d5a4ceb6849d..e18c443f1caca3a6d4529b352760b7b0e6e79e76 100644
--- a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
@@ -139,7 +139,7 @@ void HTMLLinkElement::parseSizesAttribute(const AtomicString& value, Vector<IntS
inline HTMLLinkElement::HTMLLinkElement(Document& document, bool createdByParser)
: HTMLElement(linkTag, document)
- , m_linkLoader(this)
+ , m_linkLoader(LinkLoader::create(this))
, m_sizes(DOMSettableTokenList::create(this))
, m_relList(RelList::create(this))
, m_createdByParser(createdByParser)
@@ -205,7 +205,7 @@ bool HTMLLinkElement::shouldLoadLink()
bool HTMLLinkElement::loadLink(const String& type, const String& as, const KURL& url)
{
- return m_linkLoader.loadLink(m_relAttribute, crossOriginAttributeValue(fastGetAttribute(HTMLNames::crossoriginAttr)), type, as, url, document(), NetworkHintsInterfaceImpl());
+ return m_linkLoader->loadLink(m_relAttribute, crossOriginAttributeValue(fastGetAttribute(HTMLNames::crossoriginAttr)), type, as, url, document(), NetworkHintsInterfaceImpl());
}
LinkResource* HTMLLinkElement::linkResourceToProcess()
@@ -291,7 +291,7 @@ void HTMLLinkElement::removedFrom(ContainerNode* insertionPoint)
if (!insertionPoint->inDocument())
return;
- m_linkLoader.released();
+ m_linkLoader->released();
if (m_isInShadowTree) {
ASSERT(!linkStyle() || !linkStyle()->hasSheet());
@@ -770,6 +770,7 @@ DEFINE_TRACE(LinkStyle)
{
visitor->trace(m_sheet);
LinkResource::trace(visitor);
+ ResourceOwner<StyleSheetResource>::trace(visitor);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698