Title: [167741] trunk/Source/WebCore
Revision
167741
Author
akl...@apple.com
Date
2014-04-23 20:43:47 -0700 (Wed, 23 Apr 2014)

Log Message

Canvas cache of clean URLs can grow without bounds.
<https://webkit.org/b/132091>
<rdar://problem/16695665>

Remove a silly "optimization" that kept a cache of clean URLs
that can be drawn into a canvas without tainting it, all to avoid
the "expensive" checks to determine whether it would taint.

Reviewed by Benjamin Poulain.

* html/canvas/CanvasRenderingContext.cpp:
(WebCore::CanvasRenderingContext::wouldTaintOrigin):
* html/canvas/CanvasRenderingContext.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (167740 => 167741)


--- trunk/Source/WebCore/ChangeLog	2014-04-24 03:31:30 UTC (rev 167740)
+++ trunk/Source/WebCore/ChangeLog	2014-04-24 03:43:47 UTC (rev 167741)
@@ -1,3 +1,19 @@
+2014-04-23  Andreas Kling  <akl...@apple.com>
+
+        Canvas cache of clean URLs can grow without bounds.
+        <https://webkit.org/b/132091>
+        <rdar://problem/16695665>
+
+        Remove a silly "optimization" that kept a cache of clean URLs
+        that can be drawn into a canvas without tainting it, all to avoid
+        the "expensive" checks to determine whether it would taint.
+
+        Reviewed by Benjamin Poulain.
+
+        * html/canvas/CanvasRenderingContext.cpp:
+        (WebCore::CanvasRenderingContext::wouldTaintOrigin):
+        * html/canvas/CanvasRenderingContext.h:
+
 2014-04-23  Benjamin Poulain  <bpoul...@apple.com>
 
         [iOS][WK2] Fix a few mistakes affecting the initial layout and the initial unobscured rect

Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp (167740 => 167741)


--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp	2014-04-24 03:31:30 UTC (rev 167740)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp	2014-04-24 03:43:47 UTC (rev 167741)
@@ -92,7 +92,7 @@
 
 bool CanvasRenderingContext::wouldTaintOrigin(const URL& url)
 {
-    if (!canvas()->originClean() || m_cleanURLs.contains(url.string()))
+    if (!canvas()->originClean())
         return false;
 
     if (canvas()->securityOrigin()->taintsCanvas(url))
@@ -101,7 +101,6 @@
     if (url.protocolIsData())
         return false;
 
-    m_cleanURLs.add(url.string());
     return false;
 }
 

Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h (167740 => 167741)


--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h	2014-04-24 03:31:30 UTC (rev 167740)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h	2014-04-24 03:43:47 UTC (rev 167741)
@@ -75,7 +75,6 @@
 
 private:
     HTMLCanvasElement* m_canvas;
-    HashSet<String> m_cleanURLs;
 };
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to