Changeset 99543 in webkit

Timestamp:

Nov 8, 2011 3:46:40 AM (12 years ago)

Author:

Nikolas Zimmermann

Message:

2011-11-08 Nikolas Zimmermann <​nzimmermann@rim.com>

Switch SVGImage cache to store ImageBuffers instead of whole SVGImages, including a DOM/Render tree
​https://bugs.webkit.org/show_bug.cgi?id=71368

Reviewed by Zoltan Herczeg.

When determining whether the canvas would be tainted, we need access to the SVGImage, not its cached BitmapImage.
Otherwhise wrong assumptions are mode, leading to regressions.

Fixes http/tests/security/canvas-remote-read-svg-image.html and related tests on the bots.

• html/canvas/CanvasRenderingContext.cpp: (WebCore::CanvasRenderingContext::wouldTaintOrigin): Forgot to switch them back to use cachedImage->image().
• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::isOriginClean): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext.cpp (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-08  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Switch SVGImage cache to store ImageBuffers instead of whole SVGImages, including a DOM/Render tree
+        https://bugs.webkit.org/show_bug.cgi?id=71368
+
+        Reviewed by Zoltan Herczeg.
+
+        When determining whether the canvas would be tainted, we need access to the SVGImage, not its cached BitmapImage.
+        Otherwhise wrong assumptions are mode, leading to regressions.
+
+        Fixes http/tests/security/canvas-remote-read-svg-image.html and related tests on the bots.
+
+        * html/canvas/CanvasRenderingContext.cpp:
+        (WebCore::CanvasRenderingContext::wouldTaintOrigin): Forgot to switch them back to use cachedImage->image().
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::isOriginClean): Ditto.
+
 2011-11-08  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp

@@ -62 +62 @@
 
     CachedImage* cachedImage = image->cachedImage();
-    if (!cachedImage->imageForRenderer(image->renderer())->hasSingleSecurityOrigin())
+    if (!cachedImage->image()->hasSingleSecurityOrigin())
         return true;
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -88 +88 @@
 static bool isOriginClean(CachedImage* cachedImage, HTMLImageElement* image, SecurityOrigin* securityOrigin)
 {
-    if (!cachedImage->imageForRenderer(image->renderer())->hasSingleSecurityOrigin())
+    if (!cachedImage->image()->hasSingleSecurityOrigin())
         return false;
     if (cachedImage->passesAccessControlCheck(securityOrigin))