X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fhtml%2FLinkResource.cpp;h=f359848465284f35b145fba915d00d4c1420fcb4;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=f25f2319770346f205d81bfbbae1cbcae167ed94;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/core/html/LinkResource.cpp b/src/third_party/WebKit/Source/core/html/LinkResource.cpp index f25f231..f359848 100644 --- a/src/third_party/WebKit/Source/core/html/LinkResource.cpp +++ b/src/third_party/WebKit/Source/core/html/LinkResource.cpp @@ -33,7 +33,7 @@ #include "HTMLNames.h" #include "core/html/HTMLLinkElement.h" -#include "core/html/imports/HTMLImport.h" +#include "core/html/imports/HTMLImportsController.h" namespace WebCore { @@ -50,15 +50,20 @@ LinkResource::~LinkResource() bool LinkResource::shouldLoadResource() const { - return m_owner->document().frame() || m_owner->document().import(); + return m_owner->document().frame() || m_owner->document().importsController(); } LocalFrame* LinkResource::loadingFrame() const { - HTMLImport* import = m_owner->document().import(); + HTMLImportsController* import = m_owner->document().importsController(); if (!import) return m_owner->document().frame(); - return import->master()->frame(); + return import->frame(); +} + +void LinkResource::trace(Visitor* visitor) +{ + visitor->trace(m_owner); } LinkRequestBuilder::LinkRequestBuilder(HTMLLinkElement* owner)