Changeset 167741 in webkit

Timestamp:

Apr 23, 2014 8:43:47 PM (10 years ago)

Author:

akling@apple.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext.cpp (modified) (2 diffs)
• html/canvas/CanvasRenderingContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-23  Andreas Kling  <akling@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  <bpoulain@apple.com>
 

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

@@ -93 +93 @@
 bool CanvasRenderingContext::wouldTaintOrigin(const URL& url)
 {
-    if (!canvas()->originClean() || m_cleanURLs.contains(url.string()))
+    if (!canvas()->originClean())
         return false;
 
@@ -102 +102 @@
         return false;
 
-    m_cleanURLs.add(url.string());
     return false;
 }

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

@@ -76 +76 @@
 private:
     HTMLCanvasElement* m_canvas;
-    HashSet<String> m_cleanURLs;
 };