Changeset 206902 in webkit

Timestamp:

Oct 6, 2016 11:18:37 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

CachedXSLStylesheet does not need to be updated according Origin/Fetch mode
​https://bugs.webkit.org/show_bug.cgi?id=162389

Patch by Youenn Fablet <​youenn@apple.com> on 2016-10-06
Reviewed by Darin Adler.

No change of behavior.

Making clear that there is no reason to update cached XSLT resources according the origin, given that CORS is never checked and loading is always same-origin.

Renaming CachedResource::isClean to CachedResource::isCORSSameOrigin to better match spec terminology.
Updating HTMLLinkElement accordingly.

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::initializeStyleSheet):

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::isCORSSameOrigin): Ensuring that this method is not called for resource types for which CORS is not to be used.
(WebCore::CachedResource::isClean): Deleted.

• loader/cache/CachedResource.h:
• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLLinkElement.cpp (modified) (1 diff)
• loader/cache/CachedResource.cpp (modified) (1 diff)
• loader/cache/CachedResource.h (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-06  Youenn Fablet  <youenn@apple.com>
+
+        CachedXSLStylesheet does not need to be updated according Origin/Fetch mode
+        https://bugs.webkit.org/show_bug.cgi?id=162389
+
+        Reviewed by Darin Adler.
+
+        No change of behavior.
+
+        Making clear that there is no reason to update cached XSLT resources according the origin, given that CORS is never checked and loading is always same-origin.
+
+        Renaming CachedResource::isClean to CachedResource::isCORSSameOrigin to better match spec terminology.
+        Updating HTMLLinkElement accordingly.
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::initializeStyleSheet):
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::isCORSSameOrigin): Ensuring that this method is not called for resource types for which CORS is not to be used.
+        (WebCore::CachedResource::isClean): Deleted.
+        * loader/cache/CachedResource.h:
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
+
 2016-10-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -342 +342 @@
     Optional<bool> originClean;
     if (cachedStyleSheet.options().mode == FetchOptions::Mode::Cors)
-        originClean = cachedStyleSheet.isClean();
+        originClean = cachedStyleSheet.isCORSSameOrigin();
 
     m_sheet = CSSStyleSheet::create(WTFMove(styleSheet), *this, originClean);

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -443 +443 @@
 }
 
-bool CachedResource::isClean() const
-{
+bool CachedResource::isCORSSameOrigin() const
+{
+    // Following resource types do not use CORS
+    ASSERT(type() != CachedResource::Type::FontResource);
+    ASSERT(type() != CachedResource::Type::SVGFontResource);
+    ASSERT(type() != CachedResource::XSLStyleSheet);
+
     // https://html.spec.whatwg.org/multipage/infrastructure.html#cors-same-origin
     return !loadFailedOrCanceled() && m_responseTainting != ResourceResponse::Tainting::Opaque;

trunk/Source/WebCore/loader/cache/CachedResource.h

@@ -209 +209 @@
     void setCrossOrigin();
     bool isCrossOrigin() const;
-    bool isClean() const;
+    bool isCORSSameOrigin() const;
     ResourceResponse::Tainting responseTainting() const { return m_responseTainting; }
 

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

@@ -550 +550 @@
     }
 
+#if ENABLE(XSLT)
+    // Load is same-origin, we do not check for CORS.
+    if (resource.type() == CachedResource::XSLStyleSheet)
+        return false;
+#endif
+
     // FIXME: We should enable resource reuse for these resource types
     switch (resource.type()) {
@@ -560 +566 @@
     case CachedResource::MainResource:
         return false;
-#if ENABLE(XSLT)
-    case CachedResource::XSLStyleSheet:
-        return false;
-#endif
 #if ENABLE(LINK_PREFETCH)
     case CachedResource::LinkPrefetch: