Copy back the upstreamed version of prefetch

https://bugs.webkit.org/show_bug.cgi?id=3652

Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca

1 files changed, 7 insertions, 9 deletions

diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp
index c0ba2f3..f6588c7 100644
--- a/WebCore/loader/DocLoader.cpp
+++ b/WebCore/loader/DocLoader.cpp
@@ -45,10 +45,6 @@
 #include "Settings.h"
 #include <wtf/text/CString.h>
 
-#if ENABLE(LINK_PREFETCH)
-#include "CachedLinkPrefetch.h"
-#endif
-
 #define PRELOAD_DEBUG 0
 
 namespace WebCore {
@@ -181,9 +177,9 @@ CachedXBLDocument* DocLoader::requestXBLDocument(const String& url)
 #endif
 
 #if ENABLE(LINK_PREFETCH)
-CachedLinkPrefetch* DocLoader::requestLinkPrefetch(const String& url)
+CachedResource* DocLoader::requestLinkPrefetch(const String& url)
 {
-    return static_cast<CachedLinkPrefetch*>(requestResource(CachedResource::LinkPrefetch, url, String()));
+    return requestResource(CachedResource::LinkPrefetch, url, String());
 }
 #endif
 
@@ -242,9 +238,6 @@ bool DocLoader::canRequest(CachedResource::Type type, const KURL& url)
         break;
     case CachedResource::ImageResource:
     case CachedResource::CSSStyleSheet:
-#if ENABLE(LINK_PREFETCH)
-    case CachedResource::LinkPrefetch:
-#endif
     case CachedResource::FontResource: {
         // These resources can corrupt only the frame's pixels.
         if (Frame* f = frame()) {
@@ -253,6 +246,11 @@ bool DocLoader::canRequest(CachedResource::Type type, const KURL& url)
         }
         break;
     }
+#if ENABLE(LINK_PREFETCH)
+    case CachedResource::LinkPrefetch:
+        // Prefetch cannot affect the current document.
+        break;
+#endif
     default:
         ASSERT_NOT_REACHED();
         break;