Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7

1 files changed, 9 insertions, 16 deletions

diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp
index f6588c7..d63123e 100644
--- a/WebCore/loader/DocLoader.cpp
+++ b/WebCore/loader/DocLoader.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "DocLoader.h"
 
+#include "loader.h"
 #include "Cache.h"
 #include "CachedCSSStyleSheet.h"
 #include "CachedFont.h"
@@ -40,7 +41,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
-#include "loader.h"
+#include "PingLoader.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include <wtf/text/CString.h>
@@ -128,6 +129,13 @@ CachedImage* DocLoader::requestImage(const String& url)
         Settings* settings = f->settings();
         if (!f->loader()->client()->allowImages(!settings || settings->areImagesEnabled()))
             return 0;
+
+        if (f->loader()->pageDismissalEventBeingDispatched()) {
+            KURL completeURL = m_doc->completeURL(url);
+            if (completeURL.isValid() && canRequest(CachedResource::ImageResource, completeURL))
+                PingLoader::loadImage(f, completeURL);
+            return 0;
+        }
     }
     CachedImage* resource = static_cast<CachedImage*>(requestResource(CachedResource::ImageResource, url, String()));
     if (autoLoadImages() && resource && resource->stillNeedsLoad()) {
@@ -169,13 +177,6 @@ CachedXSLStyleSheet* DocLoader::requestXSLStyleSheet(const String& url)
 }
 #endif
 
-#if ENABLE(XBL)
-CachedXBLDocument* DocLoader::requestXBLDocument(const String& url)
-{
-    return static_cast<CachedXSLStyleSheet*>(requestResource(CachedResource::XBL, url, String()));
-}
-#endif
-
 #if ENABLE(LINK_PREFETCH)
 CachedResource* DocLoader::requestLinkPrefetch(const String& url)
 {
@@ -201,11 +202,6 @@ bool DocLoader::canRequest(CachedResource::Type type, const KURL& url)
         break;
 #if ENABLE(XSLT)
     case CachedResource::XSLStyleSheet:
-#endif
-#if ENABLE(XBL)
-    case CachedResource::XBL:
-#endif
-#if ENABLE(XSLT) || ENABLE(XBL)
         if (!m_doc->securityOrigin()->canRequest(url)) {
             printAccessDeniedMessage(url);
             return false;
@@ -229,9 +225,6 @@ bool DocLoader::canRequest(CachedResource::Type type, const KURL& url)
 #if ENABLE(XSLT)
     case CachedResource::XSLStyleSheet:
 #endif
-#if ENABLE(XBL)
-    case CachedResource::XBL:
-#endif
         // These resource can inject script into the current document.
         if (Frame* f = frame())
             f->loader()->checkIfRunInsecureContent(m_doc->securityOrigin(), url);