Attachment 377027 Details for Bug 134488 – Patch

[patch] Patch

bug-134488-20190822200840.patch (text/plain), 73.61 KB, created by Rob Buis on 2019-08-22 11:08:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-08-22 11:08:41 PDT

Size: 73.61 KB

patch

obsolete

>Subversion Revision: 248940
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7a5abe8313e5427b46d2095728d983e29b362279..7eee996c4341b78d304a640b1d2a64814b7adc60 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,44 @@
>+2019-08-22  Rob Buis  <rbuis@igalia.com>
>+
>+        Async loading of image resources
>+        https://bugs.webkit.org/show_bug.cgi?id=134488
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch changes image loading to be asynchronous (per spec), in order
>+        for it to be agnostic to property setting order when it comes to src, srcset and crossorigin,
>+        as well as to enable <picture>-based selection logic without double downloads.
>+
>+        Tests: fast/dom/HTMLImageElement/image-load-post-onload.html
>+               fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse.html
>+               loader/data-uri-images-load-asynchronously.html
>+
>+        * html/HTMLImageElement.cpp:
>+        (WebCore::HTMLImageElement::didMoveToNewDocument): Add the old document to call of elementDidMoveToNewDocument.
>+        * html/HTMLInputElement.cpp:
>+        (WebCore::HTMLInputElement::didMoveToNewDocument): Add the old document to call of elementDidMoveToNewDocument.
>+        * html/HTMLPlugInImageElement.cpp:
>+        (WebCore::HTMLPlugInImageElement::didMoveToNewDocument): Add the old document to call of elementDidMoveToNewDocument.
>+        * html/HTMLVideoElement.cpp:
>+        (WebCore::HTMLVideoElement::didMoveToNewDocument): Add the old document to call of elementDidMoveToNewDocument.
>+        * loader/ImageLoader.cpp: Move image resource loading to be asynchronous.
>+        (WebCore::ImageLoader::ImageLoader):
>+        (WebCore::ImageLoader::doUpdateFromElement): This is split from the previous updateFromElement, and performs the actual resource loading.
>+        (WebCore::ImageLoader::updateFromElement): Now only prepares the stage for the actual image resource loading.
>+        (WebCore::ImageLoader::shouldLoadImmediately const): If this returns true, the image resource is loaded immediately, without queueing a microtask.
>+        (WebCore::ImageLoader::elementDidMoveToNewDocument): Handle document load event counters decrementing and incrementing.
>+        * loader/ImageLoader.h:
>+        (WebCore::ImageLoader::imageComplete const):
>+        (WebCore::ImageLoader::hasPendingActivity const):
>+        (WebCore::ImageLoader::hasPendingTask const):
>+        * loader/cache/CachedResourceLoader.cpp:
>+        (WebCore::CachedResourceLoader::requestImage): Add a 'shouldBypassMainWorldContentSecurityPolicy' flag.
>+        (WebCore::CachedResourceLoader::canRequest): Add a 'shouldBypassMainWorldContentSecurityPolicy' flag and act upon it.
>+        (WebCore::CachedResourceLoader::requestResource): Add a 'shouldBypassMainWorldContentSecurityPolicy' flag.
>+        * loader/cache/CachedResourceLoader.h:
>+        * svg/SVGImageElement.cpp:
>+        (WebCore::SVGImageElement::didMoveToNewDocument): Add the old document to call of elementDidMoveToNewDocument.
>+
> 2019-08-20  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         nextElementWithGreaterTabIndex should use shadowAdjustedTabIndex
>diff --git a/Source/WebCore/html/HTMLImageElement.cpp b/Source/WebCore/html/HTMLImageElement.cpp
>index 93ead5cccb0d27845536f7c7a73cfcd343efac45..9090ca772bb5f136fba02ca6956dbc10b3cb2d2e 100644
>--- a/Source/WebCore/html/HTMLImageElement.cpp
>+++ b/Source/WebCore/html/HTMLImageElement.cpp
>@@ -658,7 +658,7 @@ void HTMLImageElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) const
> 
> void HTMLImageElement::didMoveToNewDocument(Document& oldDocument, Document& newDocument)
> {
>-    m_imageLoader.elementDidMoveToNewDocument();
>+    m_imageLoader.elementDidMoveToNewDocument(oldDocument);
>     HTMLElement::didMoveToNewDocument(oldDocument, newDocument);
> }
> 
>diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
>index 1af4f124c1333356dc07a6f9f868f6aedffdf0d0..7c05c193ccfd4f0fbaa5fdca0a07bee581736e6a 100644
>--- a/Source/WebCore/html/HTMLInputElement.cpp
>+++ b/Source/WebCore/html/HTMLInputElement.cpp
>@@ -1563,7 +1563,7 @@ void HTMLInputElement::removedFromAncestor(RemovalType removalType, ContainerNod
> void HTMLInputElement::didMoveToNewDocument(Document& oldDocument, Document& newDocument)
> {
>     if (imageLoader())
>-        imageLoader()->elementDidMoveToNewDocument();
>+        imageLoader()->elementDidMoveToNewDocument(oldDocument);
> 
>     // Always unregister for cache callbacks when leaving a document, even if we would otherwise like to be registered
>     if (needsSuspensionCallback()) {
>diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp
>index 5b99d555530497093c6bca99587c7a2f7255909b..837edf810aa0ead1585743e14ca4daacec49db82 100644
>--- a/Source/WebCore/html/HTMLPlugInImageElement.cpp
>+++ b/Source/WebCore/html/HTMLPlugInImageElement.cpp
>@@ -314,7 +314,7 @@ void HTMLPlugInImageElement::didMoveToNewDocument(Document& oldDocument, Documen
>     }
> 
>     if (m_imageLoader)
>-        m_imageLoader->elementDidMoveToNewDocument();
>+        m_imageLoader->elementDidMoveToNewDocument(oldDocument);
> 
>     if (m_hasUpdateScheduledForAfterStyleResolution) {
>         oldDocument.decrementLoadEventDelayCount();
>diff --git a/Source/WebCore/html/HTMLVideoElement.cpp b/Source/WebCore/html/HTMLVideoElement.cpp
>index 67ff21252f1b8e8310a1d7cbb232ea8c73938a03..885917c1b9d2d489887e88cd34eb6124bdb224e1 100644
>--- a/Source/WebCore/html/HTMLVideoElement.cpp
>+++ b/Source/WebCore/html/HTMLVideoElement.cpp
>@@ -375,7 +375,7 @@ void HTMLVideoElement::setWebkitWirelessVideoPlaybackDisabled(bool disabled)
> void HTMLVideoElement::didMoveToNewDocument(Document& oldDocument, Document& newDocument)
> {
>     if (m_imageLoader)
>-        m_imageLoader->elementDidMoveToNewDocument();
>+        m_imageLoader->elementDidMoveToNewDocument(oldDocument);
>     HTMLMediaElement::didMoveToNewDocument(oldDocument, newDocument);
> }
> 
>diff --git a/Source/WebCore/loader/ImageLoader.cpp b/Source/WebCore/loader/ImageLoader.cpp
>index 86d64ea39ac43ed9f1562c34fe82ee7323f864d3..742f1cf1d671917f598b4baf5690ce99018ef86a 100644
>--- a/Source/WebCore/loader/ImageLoader.cpp
>+++ b/Source/WebCore/loader/ImageLoader.cpp
>@@ -38,6 +38,7 @@
> #include "HTMLObjectElement.h"
> #include "HTMLParserIdioms.h"
> #include "InspectorInstrumentation.h"
>+#include "Microtasks.h"
> #include "Page.h"
> #include "RenderImage.h"
> #include "RenderSVGImage.h"
>@@ -66,6 +67,46 @@ template<> struct ValueCheck<WebCore::ImageLoader*> {
> 
> namespace WebCore {
> 
>+class ImageLoader::ImageLoaderTask final : public Microtask {
>+    WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    ImageLoaderTask(WeakPtr<ImageLoader>&& loader, CachedResourceLoader::ShouldBypassMainWorldContentSecurityPolicy shouldBypassMainWorldContentSecurityPolicy)
>+        : m_loader(loader)
>+        , m_shouldBypassMainWorldContentSecurityPolicy(shouldBypassMainWorldContentSecurityPolicy)
>+    {
>+    }
>+
>+private:
>+    Result run() final
>+    {
>+        if (m_loader && m_loader->hasPendingTask())
>+            m_loader->doUpdateFromElement(m_shouldBypassMainWorldContentSecurityPolicy);
>+        return Result::Done;
>+    }
>+
>+    WeakPtr<ImageLoader> m_loader;
>+    CachedResourceLoader::ShouldBypassMainWorldContentSecurityPolicy m_shouldBypassMainWorldContentSecurityPolicy;
>+};
>+
>+class ImageLoader::ImageDecodeTask final : public Microtask {
>+    WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    ImageDecodeTask(WeakPtr<ImageLoader>&& loader)
>+        : m_loader(loader)
>+    {
>+    }
>+
>+private:
>+    Result run() final
>+    {
>+        if (m_loader && m_loader->imageComplete())
>+            m_loader->decode();
>+        return Result::Done;
>+    }
>+
>+    WeakPtr<ImageLoader> m_loader;
>+};
>+
> static ImageEventSender& beforeLoadEventSender()
> {
>     static NeverDestroyed<ImageEventSender> sender(eventNames().beforeloadEvent);
>@@ -100,6 +141,7 @@ ImageLoader::ImageLoader(Element& element)
>     , m_imageComplete(true)
>     , m_loadManually(false)
>     , m_elementIsProtected(false)
>+    , m_hasPendingTask(false)
> {
> }
> 
>@@ -157,8 +199,9 @@ void ImageLoader::clearImageWithoutConsideringPendingLoadEvent()
>         imageResource->resetAnimation();
> }
> 
>-void ImageLoader::updateFromElement()
>+void ImageLoader::doUpdateFromElement(CachedResourceLoader::ShouldBypassMainWorldContentSecurityPolicy shouldBypassMainWorldContentSecurityPolicy)
> {
>+    m_hasPendingTask = false;
>     // If we're not making renderers for the page, then don't load images. We don't want to slow
>     // down the raw HTML parsing case by loading images we don't intend to display.
>     Document& document = element().document();
>@@ -167,21 +210,23 @@ void ImageLoader::updateFromElement()
> 
>     AtomString attr = element().imageSourceURL();
> 
>-    // Avoid loading a URL we already failed to load.
>-    if (!m_failedLoadURL.isEmpty() && attr == m_failedLoadURL)
>-        return;
>+    String srcURI = sourceURI(attr);
>+    URL url;
>+    // Set url value only if srcURI is not empty. Otherwise, url will be the URL for the document itself.
>+    if (!srcURI.isEmpty())
>+        url = document.completeURL(srcURI);
> 
>     // Do not load any image if the 'src' attribute is missing or if it is
>     // an empty string.
>     CachedResourceHandle<CachedImage> newImage = nullptr;
>-    if (!attr.isNull() && !stripLeadingAndTrailingHTMLSpaces(attr).isEmpty()) {
>+    if (!url.isNull()) {
>         ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>         options.contentSecurityPolicyImposition = element().isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
>         options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
> 
>         auto crossOriginAttribute = element().attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
> 
>-        ResourceRequest resourceRequest(document.completeURL(sourceURI(attr)));
>+        ResourceRequest resourceRequest(url);
>         resourceRequest.setInspectorInitiatorNodeIdentifier(InspectorInstrumentation::identifierForNode(m_element));
> 
>         auto request = createPotentialAccessControlRequest(WTFMove(resourceRequest), document, crossOriginAttribute, WTFMove(options));
>@@ -197,7 +242,7 @@ void ImageLoader::updateFromElement()
>             document.cachedResourceLoader().m_documentResources.set(newImage->url(), newImage.get());
>             document.cachedResourceLoader().setAutoLoadImages(autoLoadOtherImages);
>         } else
>-            newImage = document.cachedResourceLoader().requestImage(WTFMove(request)).value_or(nullptr);
>+            newImage = document.cachedResourceLoader().requestImage(WTFMove(request), shouldBypassMainWorldContentSecurityPolicy).value_or(nullptr);
> 
>         // If we do not have an image here, it means that a cross-site
>         // violation occurred, or that the image was blocked via Content
>@@ -267,6 +312,49 @@ void ImageLoader::updateFromElement()
>     // Only consider updating the protection ref-count of the Element immediately before returning
>     // from this function as doing so might result in the destruction of this ImageLoader.
>     updatedHasPendingEvent();
>+    document.decrementLoadEventDelayCount();
>+}
>+
>+void ImageLoader::updateFromElement()
>+{
>+    AtomString attribute = m_element.imageSourceURL();
>+
>+    // Avoid loading a URL we already failed to load.
>+    if (!m_failedLoadURL.isEmpty() && attribute == m_failedLoadURL)
>+        return;
>+
>+    // If we're not making renderers for the page, then don't load images. We don't want to slow
>+    // down the raw HTML parsing case by loading images we don't intend to display.
>+    Document& document = element().document();
>+    if (!document.hasLivingRenderTree())
>+        return;
>+
>+    if (!m_hasPendingTask) {
>+        m_hasPendingTask = true;
>+        document.incrementLoadEventDelayCount();
>+        auto shouldBypassPolicy = CachedResourceLoader::ShouldBypassMainWorldContentSecurityPolicy::No;
>+        if (shouldLoadImmediately(attribute))
>+            doUpdateFromElement(shouldBypassPolicy);
>+        else
>+            MicrotaskQueue::mainThreadQueue().append(WTF::makeUnique<ImageLoaderTask>(makeWeakPtr(*this), shouldBypassPolicy));
>+    }
>+}
>+
>+bool ImageLoader::shouldLoadImmediately(const AtomString& attribute) const
>+{
>+    if (m_loadManually || !is<HTMLImageElement>(m_element))
>+        return true;
>+    String srcURI = sourceURI(attribute);
>+    if (srcURI.isEmpty())
>+        return true;
>+    URL url = element().document().completeURL(srcURI);
>+    if (url.isEmpty())
>+        return true;
>+    if (url.protocolIsData())
>+        return true;
>+    ResourceRequest resourceRequest(url);
>+    auto* resource = MemoryCache::singleton().resourceForRequest(resourceRequest, element().document().page()->sessionID());
>+    return resource && !resource->errorOccurred();
> }
> 
> void ImageLoader::updateFromElementIgnoringPreviousError()
>@@ -398,8 +486,7 @@ void ImageLoader::decode(Ref<DeferredPromise>&& promise)
>         return;
>     }
>     
>-    if (m_imageComplete)
>-        decode();
>+    MicrotaskQueue::mainThreadQueue().append(WTF::makeUnique<ImageDecodeTask>(makeWeakPtr(*this)));
> }
> 
> void ImageLoader::decodeError(const char* message)
>@@ -531,8 +618,12 @@ void ImageLoader::dispatchPendingErrorEvents()
>     errorEventSender().dispatchPendingEvents();
> }
> 
>-void ImageLoader::elementDidMoveToNewDocument()
>+void ImageLoader::elementDidMoveToNewDocument(const Document& oldDocument)
> {
>+    if (m_hasPendingTask) {
>+        const_cast<Document&>(oldDocument).decrementLoadEventDelayCount();
>+        m_element.document().incrementLoadEventDelayCount();
>+    }
>     clearFailedLoadURL();
>     clearImage();
> }
>diff --git a/Source/WebCore/loader/ImageLoader.h b/Source/WebCore/loader/ImageLoader.h
>index 0cdfaad75bbdf7b0bc7dd265d5bf0e32118f057e..9387c6e6e4a20971c57c261c1c875f026cd9a50e 100644
>--- a/Source/WebCore/loader/ImageLoader.h
>+++ b/Source/WebCore/loader/ImageLoader.h
>@@ -24,13 +24,16 @@
> 
> #include "CachedImageClient.h"
> #include "CachedResourceHandle.h"
>+#include "CachedResourceLoader.h"
> #include "JSDOMPromiseDeferred.h"
> #include "Timer.h"
> #include <wtf/Vector.h>
>+#include <wtf/WeakPtr.h>
> #include <wtf/text/AtomString.h>
> 
> namespace WebCore {
> 
>+class Document;
> class Element;
> class ImageLoader;
> class RenderImageResource;
>@@ -38,7 +41,7 @@ class RenderImageResource;
> template<typename T> class EventSender;
> typedef EventSender<ImageLoader> ImageEventSender;
> 
>-class ImageLoader : public CachedImageClient {
>+class ImageLoader : public CachedImageClient, public CanMakeWeakPtr<ImageLoader> {
>     WTF_MAKE_FAST_ALLOCATED;
> public:
>     virtual ~ImageLoader();
>@@ -51,12 +54,12 @@ public:
>     // doesn't change; starts new load unconditionally (matches Firefox and Opera behavior).
>     void updateFromElementIgnoringPreviousError();
> 
>-    void elementDidMoveToNewDocument();
>+    void elementDidMoveToNewDocument(const Document& oldDocument);
> 
>     Element& element() { return m_element; }
>     const Element& element() const { return m_element; }
> 
>-    bool imageComplete() const { return m_imageComplete; }
>+    bool imageComplete() const { return m_imageComplete && !m_hasPendingTask; }
> 
>     CachedImage* image() const { return m_image.get(); }
>     void clearImage(); // Cancels pending beforeload and load events, and doesn't dispatch new ones.
>@@ -66,7 +69,7 @@ public:
>     void setLoadManually(bool loadManually) { m_loadManually = loadManually; }
> 
>     bool hasPendingBeforeLoadEvent() const { return m_hasPendingBeforeLoadEvent; }
>-    bool hasPendingActivity() const { return m_hasPendingLoadEvent || m_hasPendingErrorEvent; }
>+    bool hasPendingActivity() const { return m_hasPendingLoadEvent || m_hasPendingErrorEvent || m_hasPendingTask; }
> 
>     void dispatchPendingEvent(ImageEventSender*);
> 
>@@ -74,11 +77,19 @@ public:
>     static void dispatchPendingLoadEvents();
>     static void dispatchPendingErrorEvents();
> 
>+    bool hasPendingTask() const { return m_hasPendingTask; }
>+
> protected:
>     explicit ImageLoader(Element&);
>     void notifyFinished(CachedResource&) override;
> 
> private:
>+    class ImageLoaderTask;
>+    class ImageDecodeTask;
>+
>+    // Called from the task or from updateFromElement to initiate the load.
>+    void doUpdateFromElement(CachedResourceLoader::ShouldBypassMainWorldContentSecurityPolicy);
>+
>     virtual void dispatchLoadEvent() = 0;
>     virtual String sourceURI(const AtomString&) const = 0;
> 
>@@ -100,6 +111,9 @@ private:
>     
>     void timerFired();
> 
>+    // Determine whether to initiate a synchronous load or to schedule a microtask.
>+    bool shouldLoadImmediately(const AtomString& attribtue) const;
>+
>     Element& m_element;
>     CachedResourceHandle<CachedImage> m_image;
>     Timer m_derefElementTimer;
>@@ -112,6 +126,7 @@ private:
>     bool m_imageComplete : 1;
>     bool m_loadManually : 1;
>     bool m_elementIsProtected : 1;
>+    bool m_hasPendingTask : 1;
> };
> 
> }
>diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>index b34b8fd35c1077a5452abb3432361b4cc3d11c98..d86551df521580542750c0e01307b7b3fbdacf27 100644
>--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>@@ -197,7 +197,7 @@ PAL::SessionID CachedResourceLoader::sessionID() const
>     return sessionID;
> }
> 
>-ResourceErrorOr<CachedResourceHandle<CachedImage>> CachedResourceLoader::requestImage(CachedResourceRequest&& request)
>+ResourceErrorOr<CachedResourceHandle<CachedImage>> CachedResourceLoader::requestImage(CachedResourceRequest&& request, ShouldBypassMainWorldContentSecurityPolicy shouldBypassMainWorldContentSecurityPolicy)
> {
>     if (Frame* frame = this->frame()) {
>         if (frame->loader().pageDismissalEventBeingDispatched() != FrameLoader::PageDismissalType::None) {
>@@ -211,7 +211,7 @@ ResourceErrorOr<CachedResourceHandle<CachedImage>> CachedResourceLoader::request
>     }
> 
>     auto defer = clientDefersImage(request.resourceRequest().url()) ? DeferOption::DeferredByClient : DeferOption::NoDefer;
>-    return castCachedResourceTo<CachedImage>(requestResource(CachedResource::Type::ImageResource, WTFMove(request), ForPreload::No, defer));
>+    return castCachedResourceTo<CachedImage>(requestResource(CachedResource::Type::ImageResource, WTFMove(request), ForPreload::No, defer, shouldBypassMainWorldContentSecurityPolicy));
> }
> 
> ResourceErrorOr<CachedResourceHandle<CachedFont>> CachedResourceLoader::requestFont(CachedResourceRequest&& request, bool isSVG)
>@@ -496,7 +496,7 @@ static inline bool isSameOriginDataURL(const URL& url, const ResourceLoaderOptio
> }
> 
> // Security checks defined in https://fetch.spec.whatwg.org/#main-fetch step 2 and 5.
>-bool CachedResourceLoader::canRequest(CachedResource::Type type, const URL& url, const CachedResourceRequest& request, ForPreload forPreload)
>+bool CachedResourceLoader::canRequest(CachedResource::Type type, const URL& url, const CachedResourceRequest& request, ForPreload forPreload, ShouldBypassMainWorldContentSecurityPolicy bypassMainWorldContentSecurityPolicy)
> {
>     auto& options = request.options();
> 
>@@ -518,7 +518,7 @@ bool CachedResourceLoader::canRequest(CachedResource::Type type, const URL& url,
>         return false;
>     }
> 
>-    if (!allowedByContentSecurityPolicy(type, url, options, ContentSecurityPolicy::RedirectResponseReceived::No))
>+    if (!allowedByContentSecurityPolicy(type, url, options, ContentSecurityPolicy::RedirectResponseReceived::No) && bypassMainWorldContentSecurityPolicy == ShouldBypassMainWorldContentSecurityPolicy::No)
>         return false;
> 
>     // SVG Images have unique security rules that prevent all subresource requests except for data urls.
>@@ -784,7 +784,7 @@ static FetchOptions::Destination destinationForType(CachedResource::Type type)
>     return FetchOptions::Destination::EmptyString;
> }
> 
>-ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requestResource(CachedResource::Type type, CachedResourceRequest&& request, ForPreload forPreload, DeferOption defer)
>+ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requestResource(CachedResource::Type type, CachedResourceRequest&& request, ForPreload forPreload, DeferOption defer, ShouldBypassMainWorldContentSecurityPolicy shouldBypassMainWorldContentSecurityPolicy)
> {
>     request.setDestinationIfNotSet(destinationForType(type));
> 
>@@ -812,7 +812,7 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
>     prepareFetch(type, request);
> 
>     // We are passing url as well as request, as request url may contain a fragment identifier.
>-    if (!canRequest(type, url, request, forPreload)) {
>+    if (!canRequest(type, url, request, forPreload, shouldBypassMainWorldContentSecurityPolicy)) {
>         RELEASE_LOG_IF_ALLOWED("requestResource: Not allowed to request resource (frame = %p)", frame());
>         return makeUnexpected(ResourceError { errorDomainWebKitInternal, 0, url, "Not allowed to request resource"_s, ResourceError::Type::AccessControl });
>     }
>diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
>index 4e9c1a050da4512ec7344cd6d3cd208270915322..fffb19950834665cecc1b5d653d7f0adfc73a37f 100644
>--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
>+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
>@@ -79,7 +79,8 @@ public:
>     static Ref<CachedResourceLoader> create(DocumentLoader* documentLoader) { return adoptRef(*new CachedResourceLoader(documentLoader)); }
>     ~CachedResourceLoader();
> 
>-    ResourceErrorOr<CachedResourceHandle<CachedImage>> requestImage(CachedResourceRequest&&);
>+    enum class ShouldBypassMainWorldContentSecurityPolicy { No, Yes };
>+    ResourceErrorOr<CachedResourceHandle<CachedImage>> requestImage(CachedResourceRequest&&, ShouldBypassMainWorldContentSecurityPolicy = ShouldBypassMainWorldContentSecurityPolicy::No);
>     ResourceErrorOr<CachedResourceHandle<CachedCSSStyleSheet>> requestCSSStyleSheet(CachedResourceRequest&&);
>     CachedResourceHandle<CachedCSSStyleSheet> requestUserCSSStyleSheet(Page&, CachedResourceRequest&&);
>     ResourceErrorOr<CachedResourceHandle<CachedScript>> requestScript(CachedResourceRequest&&);
>@@ -166,14 +167,14 @@ private:
>     enum class ForPreload { Yes, No };
>     enum class DeferOption { NoDefer, DeferredByClient };
> 
>-    ResourceErrorOr<CachedResourceHandle<CachedResource>> requestResource(CachedResource::Type, CachedResourceRequest&&, ForPreload = ForPreload::No, DeferOption = DeferOption::NoDefer);
>+    ResourceErrorOr<CachedResourceHandle<CachedResource>> requestResource(CachedResource::Type, CachedResourceRequest&&, ForPreload = ForPreload::No, DeferOption = DeferOption::NoDefer, ShouldBypassMainWorldContentSecurityPolicy = ShouldBypassMainWorldContentSecurityPolicy::No);
>     CachedResourceHandle<CachedResource> revalidateResource(CachedResourceRequest&&, CachedResource&);
>     CachedResourceHandle<CachedResource> loadResource(CachedResource::Type, CachedResourceRequest&&, const CookieJar*);
> 
>     void prepareFetch(CachedResource::Type, CachedResourceRequest&);
>     void updateHTTPRequestHeaders(CachedResource::Type, CachedResourceRequest&);
> 
>-    bool canRequest(CachedResource::Type, const URL&, const CachedResourceRequest&, ForPreload);
>+    bool canRequest(CachedResource::Type, const URL&, const CachedResourceRequest&, ForPreload, ShouldBypassMainWorldContentSecurityPolicy = ShouldBypassMainWorldContentSecurityPolicy::No);
> 
>     enum RevalidationPolicy { Use, Revalidate, Reload, Load };
>     RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, CachedResourceRequest&, CachedResource* existingResource, ForPreload, DeferOption) const;
>diff --git a/Source/WebCore/svg/SVGImageElement.cpp b/Source/WebCore/svg/SVGImageElement.cpp
>index 9670e2644067cfdab347303519b14f0fc18f16b7..d31ed47e66b927a8e9d122f4c82e8f3ca97f8f8f 100644
>--- a/Source/WebCore/svg/SVGImageElement.cpp
>+++ b/Source/WebCore/svg/SVGImageElement.cpp
>@@ -174,7 +174,7 @@ void SVGImageElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) const
> 
> void SVGImageElement::didMoveToNewDocument(Document& oldDocument, Document& newDocument)
> {
>-    m_imageLoader.elementDidMoveToNewDocument();
>+    m_imageLoader.elementDidMoveToNewDocument(oldDocument);
>     SVGGraphicsElement::didMoveToNewDocument(oldDocument, newDocument);
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 0452dd79dc5abfe73400c01f523b5ff32dec6e7d..803ce430f9afcfd9c307c006b182045d3ee87c53 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,50 @@
>+2019-08-22  Rob Buis  <rbuis@igalia.com>
>+
>+        Async loading of image resources
>+        https://bugs.webkit.org/show_bug.cgi?id=134488
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/dom/HTMLImageElement/image-load-post-onload-expected.txt: Added.
>+        * fast/dom/HTMLImageElement/image-load-post-onload.html: Added.
>+        * fast/dom/HTMLImageElement/image-loading-gc.html:
>+        * fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse-expected.txt: Added.
>+        * fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse.html: Added.
>+        * fast/dom/image-object.html:
>+        * http/tests/contentextensions/block-csp-report-expected.txt:
>+        * http/tests/contentextensions/block-image-load-in-onunload-expected.txt:
>+        * http/tests/contentextensions/make-https-expected.txt:
>+        * http/tests/misc/image-blocked-src-change-expected.txt: Removed line numbers from console.
>+        * http/tests/misc/image-blocked-src-no-change-expected.txt: Removed line numbers from console.
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html:
>+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/report-blocked-file-uri-expected.txt: Removed line numbers from console.
>+        * http/tests/security/local-image-from-remote-expected.txt: Removed line numbers from console.
>+        * http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt:
>+        * http/tests/security/mixedContent/insecure-basic-auth-image.https-expected.txt:
>+        * http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt:
>+        * http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-expected.txt:
>+        * http/tests/security/mixedContent/insecure-image-with-securecookie-block-expected.txt:
>+        * http/tests/security/mixedcontent-geolocation-block-insecure-content-expected.txt:
>+        * http/tests/security/mixedcontent-geolocation-expected.txt:
>+        * loader/data-uri-images-load-asynchronously-expected.txt: Added.
>+        * loader/data-uri-images-load-asynchronously.html: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt:
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt:
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt:
>+        * platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt:
>+        * platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt:
>+
> 2019-08-20  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Implement `queryHolders` Command Line API
>diff --git a/LayoutTests/fast/dom/HTMLImageElement/image-load-post-onload-expected.txt b/LayoutTests/fast/dom/HTMLImageElement/image-load-post-onload-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..484c1d559e70fc1cc5c158f375759bb115893f3a
>--- /dev/null
>+++ b/LayoutTests/fast/dom/HTMLImageElement/image-load-post-onload-expected.txt
>@@ -0,0 +1,2 @@
>+This tests that an image element is loading even if its src was changed after the page's onload event.
>+SUCCESS
>diff --git a/LayoutTests/fast/dom/HTMLImageElement/image-load-post-onload.html b/LayoutTests/fast/dom/HTMLImageElement/image-load-post-onload.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..95ae520a4c3d02a9caa1c58380090d6592b4bc51
>--- /dev/null
>+++ b/LayoutTests/fast/dom/HTMLImageElement/image-load-post-onload.html
>@@ -0,0 +1,29 @@
>+<!DOCTYPE html>
>+<html>
>+<script>
>+function runTest() {
>+    if (window.testRunner) {
>+        testRunner.dumpAsText();
>+        testRunner.waitUntilDone();
>+    }
>+
>+    var image = new Image();
>+    var first = true;
>+    image.onload = function () {
>+        if (!first) {
>+            document.getElementById('result').innerHTML = 'SUCCESS';
>+            if (window.testRunner)
>+                testRunner.notifyDone();
>+        }
>+        image.src = 'resources/image-set-4x.png';
>+        first = false;
>+    }
>+
>+    image.src = 'resources/blue_rect.jpg'
>+}
>+</script>
>+<body onload="runTest()">
>+    <div>This tests that an image element is loading even if its src was changed after the page's onload event.</div>
>+<div id="result">FAILURE</div>
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html b/LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html
>index 7203500d031315e1cde0cfb9c4f5ca948b8f1938..869dad36229b2a0daf89c7f68a775d89963cd5f3 100644
>--- a/LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html
>+++ b/LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html
>@@ -32,7 +32,7 @@ function runTest() {
> }
> </script>
> <body onload="runTest()">
>-<div>This tests that an image element won't be garbage collected when it's loading, even if it doesn't have any references.
>+    <div>This tests that an image element won't be garbage collected when it's loading, even if it doesn't have any references.</div>
> <div id="result">FAILURE</div>
> </body>
> </html>
>diff --git a/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse-expected.txt b/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..1599929865526e86ed41db104b11df0df564e87b
>--- /dev/null
>+++ b/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse-expected.txt
>@@ -0,0 +1,6 @@
>+image-set-4x.png has MIME type image/png
>+PASS currentSrcFileName("foo") is "image-set-4x.png"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse.html b/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a17e4fe2b2610ea42455841fa6191fca8b3431c1
>--- /dev/null
>+++ b/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-reverse.html
>@@ -0,0 +1,28 @@
>+<!DOCTYPE html>
>+<script src="../../../../resources/srcset-helper.js"></script>
>+<script src="../../../../resources/js-test.js"></script>
>+<script src="../resources/currentSrcHelper.js"></script>
>+<script>
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
>+
>+    function updateSrc() {
>+        var img = document.getElementById("foo");
>+        // Here we're setting sizes last, and srcset after src to make sure image loading is done is "stable-state"
>+        img.src = "../resources/blue-100-px-square.png"
>+        img.srcset = "../../../hidpi/resources/image-set-1x.png 200w, ../../../hidpi/resources/image-set-2x.png 400w, ../resources/image-set-4x.png 800w";
>+        img.sizes = "400px";
>+    }
>+
>+    addEventListener("DOMContentLoaded", function() {
>+        if (sessionStorage.pageReloaded)
>+            testRunner.dumpResourceResponseMIMETypes();
>+        updateSrc();
>+    }, false);
>+
>+    function runTest()
>+    {
>+        shouldBe('currentSrcFileName("foo")', '"image-set-4x.png"');
>+    }
>+</script>
>+<img id="foo">
>diff --git a/LayoutTests/fast/dom/image-object.html b/LayoutTests/fast/dom/image-object.html
>index 94729336ba2171e51ec6f2aa7ba1fb5752700d92..0b7512f299777921f86052516d4f321f1f10352d 100644
>--- a/LayoutTests/fast/dom/image-object.html
>+++ b/LayoutTests/fast/dom/image-object.html
>@@ -46,8 +46,7 @@ function runTests() {
>         debug('FAILURE: Empty image should have complete set to true.');
>         numErrs++;
>     }
>-    
>-    i2 = new Image()
>+    i2 = new Image();
>     i2.onload = imageLoaded;
>     i2.src = 'resources/apple.gif';
> }
>diff --git a/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt b/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt
>index 85a3e07fb6e071caf7ca306904df2af2f1ffb38a..fcca35b53680431f0ae9a6b6b1965be9236dc70c 100644
>--- a/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt
>+++ b/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: Refused to load http://localhost/foo.png because it does not appear in the img-src directive of the Content Security Policy.
>-CONSOLE MESSAGE: line 33: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-csp-report.php from loading a resource from http://localhost:8000/contentextensions/resources/save-ping.php?test=contentextensions-block-csp-report
>+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-csp-report.php from loading a resource from http://localhost:8000/contentextensions/resources/save-ping.php?test=contentextensions-block-csp-report
> This test creates a CSP violation report, but the report URL matches a 'block' rule.  
> 
> --------
>diff --git a/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload-expected.txt b/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload-expected.txt
>index 0c71d768315094c4afab1dde98f5545e96d7ddbd..d4f1a9606d9d3f29e8b329871aa12762d055961e 100644
>--- a/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload-expected.txt
>+++ b/LayoutTests/http/tests/contentextensions/block-image-load-in-onunload-expected.txt
>@@ -1,3 +1,3 @@
> main frame - has 1 onunload handler(s)
>-CONSOLE MESSAGE: line 29: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-image-load-in-onunload.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/save-ping.php?test=contentextensions-block-image-load-in-onunload
>+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-image-load-in-onunload.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/save-ping.php?test=contentextensions-block-image-load-in-onunload
> Ping not received - timed out.
>diff --git a/LayoutTests/http/tests/contentextensions/make-https-expected.txt b/LayoutTests/http/tests/contentextensions/make-https-expected.txt
>index 0c3b99bfb8e01bbf33d15d177d8e827af8f67ad0..51455ff3bc2ad1068f28159fab9f4dd77ab0d666 100644
>--- a/LayoutTests/http/tests/contentextensions/make-https-expected.txt
>+++ b/LayoutTests/http/tests/contentextensions/make-https-expected.txt
>@@ -1,6 +1,6 @@
>-CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://127.0.0.1/promote to https
>-CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://127.0.0.1/promote to https
>-CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://127.0.0.1/promote to https
>-CONSOLE MESSAGE: line 29: Content blocker promoted URL from http://promote/ to https
>+CONSOLE MESSAGE: Content blocker promoted URL from http://127.0.0.1/promote to https
>+CONSOLE MESSAGE: Content blocker promoted URL from http://127.0.0.1/promote to https
>+CONSOLE MESSAGE: Content blocker promoted URL from http://127.0.0.1/promote to https
>+CONSOLE MESSAGE: Content blocker promoted URL from http://promote/ to https
> Blocked access to external URL https://promote/
> URLs with http, port 80, and promote in the url should be promoted to https with port 443. Four URLs should be promoted as should be shown by four CONSOLE MESSAGE lines.
>diff --git a/LayoutTests/http/tests/misc/image-blocked-src-change-expected.txt b/LayoutTests/http/tests/misc/image-blocked-src-change-expected.txt
>index 65ab53fac2409bdad10150cf8d557dd0f532dad0..6b53db77168541082d043eaddf06489dc2aac613 100644
>--- a/LayoutTests/http/tests/misc/image-blocked-src-change-expected.txt
>+++ b/LayoutTests/http/tests/misc/image-blocked-src-change-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 44: Not allowed to load local resource: compass.jpg
>+CONSOLE MESSAGE: Not allowed to load local resource: compass.jpg
> Test case for bug 17897 : Not Rendering Images Imported from XHTML Document
> 
> You should see PASSED once and 250 x 50 green box. The console should also show a blocked attempt to load a local resource.
>diff --git a/LayoutTests/http/tests/misc/image-blocked-src-no-change-expected.txt b/LayoutTests/http/tests/misc/image-blocked-src-no-change-expected.txt
>index 552f00a733cec49365c56e0443401c0d9dbba7f7..7ec9097e901900c983fe6e640aa2eb8bdd1f32c4 100644
>--- a/LayoutTests/http/tests/misc/image-blocked-src-no-change-expected.txt
>+++ b/LayoutTests/http/tests/misc/image-blocked-src-no-change-expected.txt
>@@ -1,5 +1,5 @@
>-CONSOLE MESSAGE: line 27: Not allowed to load local resource: compass.jpg
>-CONSOLE MESSAGE: line 21: Not allowed to load local resource: compass.jpg
>+CONSOLE MESSAGE: Not allowed to load local resource: compass.jpg
>+CONSOLE MESSAGE: Not allowed to load local resource: compass.jpg
> Test case for bug 17897 : Not Rendering Images Imported from XHTML Document
> 
> This test checks that setting an image url should lead to load even if the image was in error and the url is not changed.
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt
>index 57179bbf71cf8189cb806508c1374db1a33aae37..75a2b29cee7cd555bcb1970af8594251a51bc8c4 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt
>@@ -11,9 +11,9 @@ PASS window.e.blockedURI is "http://localhost:8000"
> PASS window.e.violatedDirective is "img-src 'none'"
> PASS window.e.effectiveDirective is "img-src"
> PASS window.e.originalPolicy is "img-src 'none'"
>-PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html"
>-PASS window.e.lineNumber is 25
>-PASS window.e.columnNumber is 16
>+PASS window.e.sourceFile is ""
>+PASS window.e.lineNumber is 0
>+PASS window.e.columnNumber is 0
> PASS window.e.statusCode is 200
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt
>index 3631972148710a74683da105d54c2d433b79f7a9..f03001e4caccbb70f8d21d28084b6ea80e7303cd 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt
>@@ -11,9 +11,9 @@ PASS window.e.blockedURI is "http://127.0.0.1:8000/security/resources/abe.png"
> PASS window.e.violatedDirective is "img-src 'none'"
> PASS window.e.effectiveDirective is "img-src"
> PASS window.e.originalPolicy is "img-src 'none'"
>-PASS window.e.sourceFile is "http://localhost:8000"
>-PASS window.e.lineNumber is 3
>-PASS window.e.columnNumber is 2
>+PASS window.e.sourceFile is ""
>+PASS window.e.lineNumber is 0
>+PASS window.e.columnNumber is 0
> PASS window.e.statusCode is 200
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html
>index 596506971c20ae93ea97dcddfdfa1c6df3ab183f..671941c862f5464a5127a0024571f39377714a65 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html
>@@ -14,9 +14,9 @@
>             'violatedDirective': 'img-src \'none\'',
>             'effectiveDirective': 'img-src',
>             'originalPolicy': 'img-src \'none\'',
>-            'sourceFile': 'http://localhost:8000',
>-            'lineNumber': 3,
>-            'columnNumber': 2,
>+            'sourceFile': '',
>+            'lineNumber': 0,
>+            'columnNumber': 0,
>             'statusCode': 200,
>         };
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html
>index 6685cd506a4f01dd22552e131112850def4fad68..9ca90d43b5e6a9d6bdffa5aab27bffc9b939d490 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html
>@@ -14,9 +14,9 @@
>             'violatedDirective': 'img-src \'none\'',
>             'effectiveDirective': 'img-src',
>             'originalPolicy': 'img-src \'none\'',
>-            'sourceFile': document.location.toString(),
>-            'lineNumber': 25,
>-            'columnNumber': 16,
>+            'sourceFile': '',
>+            'lineNumber': 0,
>+            'columnNumber': 0,
>             'statusCode': 200,
>         };
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
>index 7d7d8a5c4bdda5cb9a8eea35146de841bc0f76d7..d178d0aafc6e5a8771391170e5eb82c0496f870c 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
>@@ -11,9 +11,9 @@ PASS window.e.blockedURI is "http://127.0.0.1:8000/security/resources/abe.png"
> PASS window.e.violatedDirective is "img-src 'none'"
> PASS window.e.effectiveDirective is "img-src"
> PASS window.e.originalPolicy is "img-src 'none'"
>-PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"
>-PASS window.e.lineNumber is 25
>-PASS window.e.columnNumber is 16
>+PASS window.e.sourceFile is ""
>+PASS window.e.lineNumber is 0
>+PASS window.e.columnNumber is 0
> PASS window.e.statusCode is 200
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt
>index bddf1b971f56bf22c2441d98b7839802146c36c2..3dc6444f3b326f2dd60042adc8e2f8d7a8adb60a 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt
>@@ -11,9 +11,9 @@ PASS window.e.blockedURI is "http://127.0.0.1:8000/security/resources/abe.png"
> PASS window.e.violatedDirective is "img-src 'none'"
> PASS window.e.effectiveDirective is "img-src"
> PASS window.e.originalPolicy is "img-src 'none'"
>-PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js"
>-PASS window.e.lineNumber is 3
>-PASS window.e.columnNumber is 2
>+PASS window.e.sourceFile is ""
>+PASS window.e.lineNumber is 0
>+PASS window.e.columnNumber is 0
> PASS window.e.statusCode is 200
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html
>index 57173643998db6ab984f205513c79edfba63519f..f4a020f68f6de135898add12cb4580cc9cf77343 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html
>@@ -14,9 +14,9 @@
>             'violatedDirective': 'img-src \'none\'',
>             'effectiveDirective': 'img-src',
>             'originalPolicy': 'img-src \'none\'',
>-            'sourceFile': 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js',
>-            'lineNumber': 3,
>-            'columnNumber': 2,
>+            'sourceFile': '',
>+            'lineNumber': 0,
>+            'columnNumber': 0,
>             'statusCode': 200,
>         };
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt
>index 5209e8ed2f6829675d39c863be05753bafa4f442..54f0514c6b66926022f76f471ae2a2b883ac2e10 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt
>@@ -16,9 +16,9 @@ FAIL window.e.blockedURI should be http://127.0.0.1:8000/security/resources/abe.
> PASS window.e.violatedDirective is "img-src 'none'"
> PASS window.e.effectiveDirective is "img-src"
> PASS window.e.originalPolicy is "img-src 'none'"
>-PASS window.e.sourceFile is "https://127.0.0.1:8443/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"
>-PASS window.e.lineNumber is 25
>-PASS window.e.columnNumber is 16
>+PASS window.e.sourceFile is ""
>+PASS window.e.lineNumber is 0
>+PASS window.e.columnNumber is 0
> PASS window.e.statusCode is 0
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
>index d2790234ef176700d10a6953aaf971b20c24aba5..00e97390b175cb2dd99a80f50a3b21702f8f7b00 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
>@@ -14,9 +14,9 @@
>             'violatedDirective': 'img-src \'none\'',
>             'effectiveDirective': 'img-src',
>             'originalPolicy': 'img-src \'none\'',
>-            'sourceFile': document.location.toString(),
>-            'lineNumber': 25,
>-            'columnNumber': 16,
>+            'sourceFile': '',
>+            'lineNumber': 0,
>+            'columnNumber': 0,
>             'statusCode': document.location.protocol === 'http:' ? 200 : 0,
>         };
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>index a4f7560fe97f4b9fb2e1ba202a4e398f8d7225dc..38e8ffb60e7ecd6b65fbf7060477ad4e13cff04d 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>@@ -23,9 +23,9 @@ blockedURI: http://127.0.0.1:8000
> violatedDirective: block-all-mixed-content
> effectiveDirective: block-all-mixed-content
> originalPolicy: block-all-mixed-content
>-sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php
>-lineNumber: 9
>-columnNumber: 15
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
> statusCode: 0
> 
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>index 7d1b1706b986e18b9b294f9f997f0cc50f5a4222..042c3562197edac3ab10a1257c81e437fc1254c6 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>@@ -1,7 +1,7 @@
> frame "" - didStartProvisionalLoadForFrame
> main frame - didFinishDocumentLoadForFrame
> frame "" - didCommitLoadForFrame
>-CONSOLE MESSAGE: line 1: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+CONSOLE MESSAGE: line 7: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
> 
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>index 0ed28a1d4a9594ad7096de960e4a1e1d39428c1f..9533b3e18d38ef3bb481ebe215543e32f9bf15ab 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>@@ -2,7 +2,7 @@ frame "" - didStartProvisionalLoadForFrame
> main frame - didFinishDocumentLoadForFrame
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
>-CONSOLE MESSAGE: line 2: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-in-xslt-document.xml was not allowed to display insecure content from http://127.0.0.1:8000/security/resources/compass.jpg.
>+CONSOLE MESSAGE: line 6: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-in-xslt-document.xml was not allowed to display insecure content from http://127.0.0.1:8000/security/resources/compass.jpg.
> 
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/report-blocked-file-uri-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/report-blocked-file-uri-expected.txt
>index fd2ead2b3caa72ca20909a4fc2ceb9d04f85d80e..38277d803dc4d211cddac67671d6767e14f17d3d 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/report-blocked-file-uri-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/report-blocked-file-uri-expected.txt
>@@ -6,4 +6,4 @@ HTTP_REFERER: http://127.0.0.1:8000/security/contentSecurityPolicy/report-blocke
> REQUEST_METHOD: POST
> REQUEST_URI: /security/contentSecurityPolicy/resources/save-report.php
> === POST DATA ===
>-{"csp-report":{"document-uri":"http://127.0.0.1:8000/security/contentSecurityPolicy/report-blocked-file-uri.php","referrer":"","violated-directive":"img-src 'none'","effective-directive":"img-src","original-policy":"img-src 'none'; report-uri resources/save-report.php","blocked-uri":"file","status-code":200,"source-file":"http://127.0.0.1:8000/security/contentSecurityPolicy/report-blocked-file-uri.php","line-number":9,"column-number":26}}
>+{"csp-report":{"document-uri":"http://127.0.0.1:8000/security/contentSecurityPolicy/report-blocked-file-uri.php","referrer":"","violated-directive":"img-src 'none'","effective-directive":"img-src","original-policy":"img-src 'none'; report-uri resources/save-report.php","blocked-uri":"file","status-code":200}}
>diff --git a/LayoutTests/http/tests/security/local-image-from-remote-expected.txt b/LayoutTests/http/tests/security/local-image-from-remote-expected.txt
>index 17ea23be0a82228ae28362d81cff8f700273a9ff..3fcc3ec452b5db817883b16e48fad99daaec69a3 100644
>--- a/LayoutTests/http/tests/security/local-image-from-remote-expected.txt
>+++ b/LayoutTests/http/tests/security/local-image-from-remote-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 14: Not allowed to load local resource: compass.jpg
>+CONSOLE MESSAGE: Not allowed to load local resource: compass.jpg
> This test is to see if a remote file can include a local image. 
> Currently this test cannot be run manually on Windows because we do not have a function like pathToLocalResource() outside of DRT. 
> 
>diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>index 0e15e5001d74cbc663c7026baf92f45daec07ee3..ee2fac0cde960ccdecf3cb58567b648e8cdce45d 100644
>--- a/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 33: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
> 
> http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
> Tests that we do not ask for credentials when loading an insecure image that requires basic authentication.
>diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image.https-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image.https-expected.txt
>index a607113f4cac01d8ef03dc51fc35401cd400d494..86aaae2c0e95fcef65a19b7c5afbcfc0e551a5da 100644
>--- a/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image.https-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedContent/insecure-basic-auth-image.https-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 33: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
> 
> CONSOLE MESSAGE: Blocked http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php from asking for credentials because it is a cross-origin request.
> Tests that we do not ask for credentials when loading an insecure image that requires basic authentication.
>diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>index 5a24ab4718728e32dd8e004987d400df27fff441..cf208ddb154796f8a6e62ac4272eea227bd91da9 100644
>--- a/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 18: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html?allowCrossOriginSubresourcesToAskForCredentials=1 was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html?allowCrossOriginSubresourcesToAskForCredentials=1 was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
> 
> http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
> This test opens a new window to a secure page that loads an insecure image that redirects to a secure image guarded by basic authentication. The image should load.
>diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-expected.txt
>index 3daaf341bacaf3ab3c15243e635879c64adc0868..5f5040d2754acdc31a53f494dc0710432ae2aedc 100644
>--- a/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 18: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
> 
> CONSOLE MESSAGE: Blocked https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php from asking for credentials because it is a cross-origin request.
> This test opens a new window to a secure page that loads an insecure image that redirects to a secure image guarded by basic authentication. The secure image should be blocked because it requires credentials and was loaded via an insecure redirect.
>diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-image-with-securecookie-block-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-image-with-securecookie-block-expected.txt
>index e3984e494401ee23ed490992df03a45c2a1cf61d..764b150e8d6512a89cb5fb3044df135f2c92e710 100644
>--- a/LayoutTests/http/tests/security/mixedContent/insecure-image-with-securecookie-block-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedContent/insecure-image-with-securecookie-block-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 4: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-secure-cookie-block.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+CONSOLE MESSAGE: line 11: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-secure-cookie-block.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
> 
> CONSOLE MESSAGE: line 6: secureCookie=yes
> This test opens a window that tries to read a secure cookie after an insecure image has been loaded. This should allow reading of the secure cookie since only 'inactive' insecure content was loaded on this page.
>diff --git a/LayoutTests/http/tests/security/mixedcontent-geolocation-block-insecure-content-expected.txt b/LayoutTests/http/tests/security/mixedcontent-geolocation-block-insecure-content-expected.txt
>index 7526f4d339cbd5da5a65b883a940b9d914501e99..682dda08612f0b28380cb2954fdf983008a0120a 100644
>--- a/LayoutTests/http/tests/security/mixedcontent-geolocation-block-insecure-content-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedcontent-geolocation-block-insecure-content-expected.txt
>@@ -1,3 +1,3 @@
>-CONSOLE MESSAGE: line 14: [blocked] The page at https://127.0.0.1:8443/security/resources/geolocation-over-mixed-content-block.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/resources/geolocation-over-mixed-content-block.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
> 
> This test loads a secure frame with insecure content that tries to access geolocation before loading insecure content. Access to insecure content is blocked over secure connections when geolocation is accessed.
>diff --git a/LayoutTests/http/tests/security/mixedcontent-geolocation-expected.txt b/LayoutTests/http/tests/security/mixedcontent-geolocation-expected.txt
>index 62ba89cfd189a30243c653a572edc3529e18b73e..c6950e9206cabb61fce91bb2201e6fbc052fd914 100644
>--- a/LayoutTests/http/tests/security/mixedcontent-geolocation-expected.txt
>+++ b/LayoutTests/http/tests/security/mixedcontent-geolocation-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 2: The page at https://127.0.0.1:8443/security/resources/geolocation-over-mixed-content.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+CONSOLE MESSAGE: line 14: The page at https://127.0.0.1:8443/security/resources/geolocation-over-mixed-content.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
> 
> CONSOLE MESSAGE: line 5: [blocked] Access to geolocation was blocked over secure connection with mixed content to https://127.0.0.1:8443.
> 
>diff --git a/LayoutTests/loader/data-uri-images-load-asynchronously-expected.txt b/LayoutTests/loader/data-uri-images-load-asynchronously-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..21927c9f2f9757690a8d3fbe1044051624fa5985
>--- /dev/null
>+++ b/LayoutTests/loader/data-uri-images-load-asynchronously-expected.txt
>@@ -0,0 +1,2 @@
>+Test for crbug.com/224317: data:uri images should load asynchronously.
>+PASS
>diff --git a/LayoutTests/loader/data-uri-images-load-asynchronously.html b/LayoutTests/loader/data-uri-images-load-asynchronously.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..370eff19dcaac001e811e9d70d81557be3fb2b92
>--- /dev/null
>+++ b/LayoutTests/loader/data-uri-images-load-asynchronously.html
>@@ -0,0 +1,18 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+Test for crbug.com/224317: data:uri images should load asynchronously.<br/>
>+<script>
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
>+
>+    var image = new Image();
>+    image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAnklEQVR42u3QMQEAAAgDoGlyo1vBzwciUJlw1ApkyZIlS5YsBbJkyZIlS5YCWbJkyZIlS4EsWbJkyZKlQJYsWbJkyVIgS5YsWbJkKZAlS5YsWbIUyJIlS5YsWQpkyZIlS5YsBbJkyZIlS5YCWbJkyZIlS4EsWbJkyZKlQJYsWbJkyVIgS5YsWbJkKZAlS5YsWbIUyJIlS5YsWQpkyfq2MosBSIeKONMAAAAASUVORK5CYII=";
>+
>+    if (image.width == 100 && image.height == 100)
>+        document.write("FAIL");
>+    else
>+        document.write("PASS");
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>index e719a6b763cf336d4abf37f61ed64991b8c47f11..c2e38b0782207e29559631d41070f46ad509e7ff 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>@@ -23,9 +23,9 @@ blockedURI: http://127.0.0.1:8000
> violatedDirective: block-all-mixed-content
> effectiveDirective: block-all-mixed-content
> originalPolicy: block-all-mixed-content
>-sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php
>-lineNumber: 9
>-columnNumber: 15
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
> statusCode: 0
> 
> 
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>index 8bbd0e5fbae87f5e3802a2c52276c7d0095c1051..dfae49a834fad66ad4d07d0e00f30cd9ee9c4da6 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>@@ -1,7 +1,7 @@
> main frame - didFinishDocumentLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
> frame "" - didCommitLoadForFrame
>-CONSOLE MESSAGE: line 1: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+CONSOLE MESSAGE: line 7: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
> 
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>index cc923831185a24a3d428fafbf6506caae7d5ee07..948121744fdcb2443e9ad59901e670ea93bc03c3 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>@@ -2,7 +2,7 @@ main frame - didFinishDocumentLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
>-CONSOLE MESSAGE: line 2: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-in-xslt-document.xml was not allowed to display insecure content from http://127.0.0.1:8000/security/resources/compass.jpg.
>+CONSOLE MESSAGE: line 6: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-in-xslt-document.xml was not allowed to display insecure content from http://127.0.0.1:8000/security/resources/compass.jpg.
> 
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>index b5028ba59942f7cfa093d86162999180a86c7ea2..be7d123a7d4a4f558f56fd011bd681a4b0dd523a 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 33: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
> 
> localhost:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> Tests that we do not ask for credentials when loading an insecure image that requires basic authentication.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>index 8c6e8bc1743b41cf70e1e5b9fb5561c62e4e49da..8b1442181f632867d5ac59b9efe277814d280e0a 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 18: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html?allowCrossOriginSubresourcesToAskForCredentials=1 was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html?allowCrossOriginSubresourcesToAskForCredentials=1 was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
> 
> localhost:8443 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> This test opens a new window to a secure page that loads an insecure image that redirects to a secure image guarded by basic authentication. The image should load.

Actions: View | Formatted Diff | Diff

Attachments on bug 134488: 234157 | 234160 | 234163 | 234164 | 239023 | 239044 | 239058 | 239061 | 239322 | 239325 | 239327 | 239329 | 239332 | 248223 | 248225 | 248226 | 249397 | 249398 | 249399 | 249400 | 249558 | 249560 | 249561 | 249716 | 249717 | 249718 | 249722 | 249723 | 249724 | 249725 | 249755 | 249902 | 266607 | 266609 | 266610 | 266611 | 266613 | 266616 | 266617 | 266618 | 376850 | 376855 | 376864 | 376875 | 376896 | 376910 | 376993 | 376995 | 377027 | 377036 | 377064 | 377110 | 377117