Title: [122020] releases/WebKitGTK/webkit-1.8
Revision
122020
Author
[email protected]
Date
2012-07-06 13:19:29 -0700 (Fri, 06 Jul 2012)

Log Message

Merge 110326 - Hold cached images with a CachedResourceHandle rather than a raw pointer for CSSCrossfadeValue
https://bugs.webkit.org/show_bug.cgi?id=80186

Patch by Tom Sepez <[email protected]> on 2012-03-09
Reviewed by Simon Fraser.

Source/WebCore:

Test: http/tests/css/cross-fade-reload.html

* css/CSSCrossfadeValue.h:
(CSSCrossfadeValue):

LayoutTests:

* http/tests/css/cross-fade-reload-expected.txt: Added.
* http/tests/css/cross-fade-reload.html: Added.
* http/tests/css/resources/abe.png: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (122019 => 122020)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog	2012-07-06 20:19:14 UTC (rev 122019)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog	2012-07-06 20:19:29 UTC (rev 122020)
@@ -1,3 +1,14 @@
+2012-03-09  Tom Sepez  <[email protected]>
+
+        Hold cached images with a CachedResourceHandle rather than a raw pointer for CSSCrossfadeValue
+        https://bugs.webkit.org/show_bug.cgi?id=80186
+
+        Reviewed by Simon Fraser.
+
+        * http/tests/css/cross-fade-reload-expected.txt: Added.
+        * http/tests/css/cross-fade-reload.html: Added.
+        * http/tests/css/resources/abe.png: Added.
+
 2012-05-31  Hajime Morrita  <[email protected]>
 
         REGRESSION(r117572): editing/spelling/spellcheck-async-remove-frame.html crashes on Mac

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload-expected.txt (0 => 122020)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload-expected.txt	                        (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload-expected.txt	2012-07-06 20:19:29 UTC (rev 122020)
@@ -0,0 +1 @@
+Test passes if it does not crash.  
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload-expected.txt
___________________________________________________________________

Added: svn:eol-style

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload.html (0 => 122020)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload.html	2012-07-06 20:19:29 UTC (rev 122020)
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<body>
+Test passes if it does not crash.
+<script>
+if (window.layoutTestController) {
+    layoutTestController.waitUntilDone();
+    layoutTestController.dumpAsText();
+}
+</script>
+<img style="background-image:-webkit-cross-fade(url(resources/abe.png), url(resources/abe.png), 1%)"/>
+<script>
+function triggerReload()
+{
+    location.hash += "x"; 
+    location.reload();
+}
+if (location.hash == '#xxxx') {
+    if (window.layoutTestController) 
+        layoutTestController.notifyDone();
+} else
+    setTimeout("triggerReload()", 10);
+</script>
+</body>
+</html>
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/cross-fade-reload.html
___________________________________________________________________

Added: svn:eol-style

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/resources/abe.png


(Binary files differ)
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/http/tests/css/resources/abe.png ___________________________________________________________________

Added: svn:mime-type

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (122019 => 122020)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-07-06 20:19:14 UTC (rev 122019)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-07-06 20:19:29 UTC (rev 122020)
@@ -1,3 +1,15 @@
+2012-03-09  Tom Sepez  <[email protected]>
+
+        Hold cached images with a CachedResourceHandle rather than a raw pointer for CSSCrossfadeValue
+        https://bugs.webkit.org/show_bug.cgi?id=80186
+
+        Reviewed by Simon Fraser.
+
+        Test: http/tests/css/cross-fade-reload.html
+
+        * css/CSSCrossfadeValue.h:
+        (CSSCrossfadeValue):
+
 2012-05-31  Hajime Morrita  <[email protected]>
 
         REGRESSION(r117572): editing/spelling/spellcheck-async-remove-frame.html crashes on Mac

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/css/CSSCrossfadeValue.h (122019 => 122020)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/css/CSSCrossfadeValue.h	2012-07-06 20:19:14 UTC (rev 122019)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/css/CSSCrossfadeValue.h	2012-07-06 20:19:29 UTC (rev 122020)
@@ -27,6 +27,7 @@
 #define CSSCrossfadeValue_h
 
 #include "CachedImage.h"
+#include "CachedResourceHandle.h"
 #include "CSSImageGeneratorValue.h"
 #include "CSSPrimitiveValue.h"
 #include "Image.h"
@@ -89,8 +90,8 @@
     RefPtr<CSSValue> m_toValue;
     RefPtr<CSSPrimitiveValue> m_percentageValue;
 
-    CachedImage* m_cachedFromImage;
-    CachedImage* m_cachedToImage;
+    CachedResourceHandle<CachedImage> m_cachedFromImage;
+    CachedResourceHandle<CachedImage> m_cachedToImage;
 
     RefPtr<Image> m_generatedImage;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to