Changeset 186180 in webkit

Timestamp:

Jul 1, 2015, 10:22:27 AM (10 years ago)

Author:

Antti Koivisto

Message:

PNG mask images are loaded with Accept:image/svg+xml
​https://bugs.webkit.org/show_bug.cgi?id=146509
Source/WebCore:

rdar://problem/21584740

Reviewed by Simon Fraser.

For some strange reason MaskImageOperation code loads all mask images, including non-SVG ones
using CachedSVGDocument. Resulting bad accept header may cause server to reject the request.

This is far from ideal but as a quick fix we can override the accept header for mask images to
allow any image type.

Test: http/tests/misc/mask-image-accept.html

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):

• loader/cache/CachedResourceRequest.h:

(WebCore::CachedResourceRequest::acceptOverride):
(WebCore::CachedResourceRequest::setAcceptOverride):

• loader/cache/CachedSVGDocumentReference.cpp:

(WebCore::CachedSVGDocumentReference::load):

• loader/cache/CachedSVGDocumentReference.h:

(WebCore::CachedSVGDocumentReference::loadRequested):
(WebCore::CachedSVGDocumentReference::setAcceptsAnyImageType):
(WebCore::CachedSVGDocumentReference::document):

• platform/graphics/MaskImageOperation.cpp:

(WebCore::MaskImageOperation::ensureCachedSVGDocumentReference):

LayoutTests:

Reviewed by Simon Fraser.

• http/tests/misc/mask-image-accept-expected.html: Added.
• http/tests/misc/mask-image-accept.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/mask-image-accept-expected.html (added)
• LayoutTests/http/tests/misc/mask-image-accept.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceRequest.h (modified) (3 diffs)
• Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedSVGDocumentReference.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/MaskImageOperation.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2015-07-01  Antti Koivisto  <antti@apple.com>
+
+        PNG mask images are loaded with Accept:image/svg+xml
+        https://bugs.webkit.org/show_bug.cgi?id=146509
+
+        Reviewed by Simon Fraser.
+
+        * http/tests/misc/mask-image-accept-expected.html: Added.
+        * http/tests/misc/mask-image-accept.html: Added.
+
 2015-07-01  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2015-07-01  Antti Koivisto  <antti@apple.com>
+
+        PNG mask images are loaded with Accept:image/svg+xml
+        https://bugs.webkit.org/show_bug.cgi?id=146509
+        rdar://problem/21584740
+
+        Reviewed by Simon Fraser.
+
+        For some strange reason MaskImageOperation code loads all mask images, including non-SVG ones
+        using CachedSVGDocument. Resulting bad accept header may cause server to reject the request.
+
+        This is far from ideal but as a quick fix we can override the accept header for mask images to
+        allow any image type.
+
+        Test: http/tests/misc/mask-image-accept.html
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+        * loader/cache/CachedResourceRequest.h:
+        (WebCore::CachedResourceRequest::acceptOverride):
+        (WebCore::CachedResourceRequest::setAcceptOverride):
+        * loader/cache/CachedSVGDocumentReference.cpp:
+        (WebCore::CachedSVGDocumentReference::load):
+        * loader/cache/CachedSVGDocumentReference.h:
+        (WebCore::CachedSVGDocumentReference::loadRequested):
+        (WebCore::CachedSVGDocumentReference::setAcceptsAnyImageType):
+        (WebCore::CachedSVGDocumentReference::document):
+        * platform/graphics/MaskImageOperation.cpp:
+        (WebCore::MaskImageOperation::ensureCachedSVGDocumentReference):
+
 2015-07-01  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp ¶

@@ -566 +566 @@
 
     if ((policy != Use || resource->stillNeedsLoad()) && CachedResourceRequest::NoDefer == request.defer()) {
+        if (request.acceptOverride())
+            resource->setAccept(request.acceptOverride().value());
+
         resource->load(*this, request.options());
 

trunk/Source/WebCore/loader/cache/CachedResourceRequest.h ¶

@@ -54 +54 @@
     void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
     const Optional<ResourceLoadPriority>& priority() const { return m_priority; }
+    const Optional<String>& acceptOverride() const { return m_acceptOverride; }
     bool forPreload() const { return m_forPreload; }
     void setForPreload(bool forPreload) { m_forPreload = forPreload; }
@@ -60 +61 @@
     void setInitiator(PassRefPtr<Element>);
     void setInitiator(const AtomicString& name);
+    void setAcceptOverride(const String& accept) { m_acceptOverride = accept; }
     const AtomicString& initiatorName() const;
 
@@ -70 +72 @@
     ResourceLoaderOptions m_options;
     Optional<ResourceLoadPriority> m_priority;
+    Optional<String> m_acceptOverride;
     bool m_forPreload;
     DeferOption m_defer;

trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp ¶

@@ -61 +61 @@
     CachedResourceRequest request(ResourceRequest(loader.document()->completeURL(m_url)));
     request.setInitiator(cachedResourceRequestInitiators().css);
+    if (m_acceptsAnyImageType)
+        request.setAcceptOverride("image/*");
     m_document = loader.requestSVGDocument(request);
     if (m_document) {

trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h ¶

@@ -44 +44 @@
     void load(CachedResourceLoader&);
     bool loadRequested() const { return m_loadRequested; }
+    void setAcceptsAnyImageType() { m_acceptsAnyImageType = true; }
 
     CachedSVGDocument* document() { return m_document.get(); }
@@ -53 +54 @@
     CachedSVGDocumentClient* m_additionalDocumentClient;
     bool m_canReuseResource;
+    bool m_acceptsAnyImageType { false };
 };
 

trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp ¶

@@ -194 +194 @@
         return nullptr;
 
-    if (!m_cachedSVGDocumentReference.get())
+    if (!m_cachedSVGDocumentReference.get()) {
         m_cachedSVGDocumentReference = std::make_unique<CachedSVGDocumentReference>(m_url, this, false);
+        // FIXME: For some strange reason we load all mask resources using CachedSVGDocument.
+        //        This requires overriding SVG mime type in Accept header or server may reject the request.
+        m_cachedSVGDocumentReference->setAcceptsAnyImageType();
+    }
     return m_cachedSVGDocumentReference.get();
 }
@@ -220 +224 @@
         }
     }
-    
+
     // If no valid mask was found, this is not a valid SVG document or it specified an invalid fragment identifier.
     // Fallback to the normal way of loading the document in an Image object.
+    // FIXME: This is silly.
     if (!validMaskFound) {
         // Get the resource loader, acquire the resource buffer and load it into an image.