Merge 88489 - 2011-06-09 Kenneth Russell <kbr@google.com>

Source/WebCore/html/canvas/CanvasRenderingContext.h

Index: Source/WebCore/html/canvas/CanvasRenderingContext.h
===================================================================
--- Source/WebCore/html/canvas/CanvasRenderingContext.h	(revision 88897)
+++ Source/WebCore/html/canvas/CanvasRenderingContext.h	(working copy)
@@ -63,15 +63,22 @@
 
 protected:
     CanvasRenderingContext(HTMLCanvasElement*);
-    void checkOrigin(const CanvasPattern*);
-    void checkOrigin(const HTMLCanvasElement*);
-    void checkOrigin(const HTMLImageElement*);
-    void checkOrigin(const HTMLVideoElement*);
+    bool wouldTaintOrigin(const CanvasPattern*);
+    bool wouldTaintOrigin(const HTMLCanvasElement*);
+    bool wouldTaintOrigin(const HTMLImageElement*);
+    bool wouldTaintOrigin(const HTMLVideoElement*);
+    bool wouldTaintOrigin(const KURL&);
+
+    template<class T> void checkOrigin(const T* arg)
+    {
+        if (wouldTaintOrigin(arg))
+            canvas()->setOriginTainted();
+    }
     void checkOrigin(const KURL&);
 
 private:
     HTMLCanvasElement* m_canvas;
-    HashSet<String> m_cleanOrigins;
+    HashSet<String> m_cleanURLs;
 };
 
 } // namespace WebCore