Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / LinkResource.cpp

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 (file)
--- 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)