Changeset 208102 in webkit

Timestamp:

Oct 29, 2016 6:46:52 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r207754): LayoutTest http/tests/security/svg-image-with-css-cross-domain.html is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=163922

Patch by Youenn Fablet <​youenn@apple.com> on 2016-10-29
Reviewed by Alex Christensen.

Source/WebCore:

Test: http/tests/security/cached-svg-image-with-css-cross-domain.html

Raw data was not copied in cloned CachedCSSStyleSheet while it is used by some of its clients.
Updated CachedCSSStyleSheet and CachedImage cloning to copy its raw data.

• loader/cache/CachedCSSStyleSheet.cpp:

(WebCore::CachedCSSStyleSheet::setBodyDataFrom):

• loader/cache/CachedImage.cpp:

(WebCore::CachedImage::setBodyDataFrom):

• loader/cache/CachedResource.h:

(WebCore::CachedResource::mayTryReplaceEncodedData):

LayoutTests:

• http/tests/security/cached-svg-image-with-css-cross-domain-expected.html: Added.
• http/tests/security/cached-svg-image-with-css-cross-domain.html: Added.
• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/cached-svg-image-with-css-cross-domain-expected.html (added)
• LayoutTests/http/tests/security/cached-svg-image-with-css-cross-domain.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedImage.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResource.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-29  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r207754): LayoutTest http/tests/security/svg-image-with-css-cross-domain.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=163922
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/security/cached-svg-image-with-css-cross-domain-expected.html: Added.
+        * http/tests/security/cached-svg-image-with-css-cross-domain.html: Added.
+        * platform/mac/TestExpectations:
+
 2016-10-29  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1457 +1457 @@
 webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
 
-webkit.org/b/163922 http/tests/security/svg-image-with-css-cross-domain.html [ Pass ImageOnlyFailure ]
-
 webkit.org/b/164088 [ Yosemite ] media/modern-media-controls/scrubber-support/scrubber-support-click.html [ Skip ]
 webkit.org/b/164088 [ Yosemite ] media/modern-media-controls/scrubber-support/scrubber-support-drag.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-29  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r207754): LayoutTest http/tests/security/svg-image-with-css-cross-domain.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=163922
+
+        Reviewed by Alex Christensen.
+
+        Test: http/tests/security/cached-svg-image-with-css-cross-domain.html
+
+        Raw data was not copied in cloned CachedCSSStyleSheet while it is used by some of its clients.
+        Updated CachedCSSStyleSheet and CachedImage cloning to copy its raw data.
+
+        * loader/cache/CachedCSSStyleSheet.cpp:
+        (WebCore::CachedCSSStyleSheet::setBodyDataFrom):
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::setBodyDataFrom):
+        * loader/cache/CachedResource.h:
+        (WebCore::CachedResource::mayTryReplaceEncodedData):
+
 2016-10-29  Youenn Fablet  <youenn@apple.com>
 

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

@@ -92 +92 @@
     ASSERT(resource.type() == type());
     const CachedCSSStyleSheet& sheet = static_cast<const CachedCSSStyleSheet&>(resource);
+
+    CachedResource::setBodyDataFrom(resource);
 
     m_decoder = sheet.m_decoder;

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

@@ -97 +97 @@
     const CachedImage& image = static_cast<const CachedImage&>(resource);
 
+    CachedResource::setBodyDataFrom(resource);
+
     m_image = image.m_image;
 

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

@@ -283 +283 @@
     virtual void didReplaceSharedBufferContents() { }
 
+    virtual void setBodyDataFrom(const CachedResource&);
+
     // FIXME: Make the rest of these data members private and use functions in derived classes instead.
     HashCountedSet<CachedResourceClient*> m_clients;
@@ -302 +304 @@
     virtual void checkNotify();
     virtual bool mayTryReplaceEncodedData() const { return false; }
-    virtual void setBodyDataFrom(const CachedResource&);
 
     std::chrono::microseconds freshnessLifetime(const ResourceResponse&) const;