Changeset 207537 in webkit

Timestamp:

Oct 19, 2016 8:10:07 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Remove SecurityOrigin::taintsCanvas
​https://bugs.webkit.org/show_bug.cgi?id=163594

Patch by Youenn Fablet <​youenn@apple.com> on 2016-10-19
Reviewed by Darin Adler.

No change of behavior.

• html/canvas/CanvasRenderingContext.cpp:

(WebCore::CanvasRenderingContext::wouldTaintOrigin):

• page/SecurityOrigin.cpp:

(WebCore::SecurityOrigin::canReceiveDragData):
(WebCore::SecurityOrigin::taintsCanvas): Deleted.

• page/SecurityOrigin.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-19  Youenn Fablet  <youenn@apple.com>
+
+        Remove SecurityOrigin::taintsCanvas
+        https://bugs.webkit.org/show_bug.cgi?id=163594
+
+        Reviewed by Darin Adler.
+
+        No change of behavior.
+
+        * html/canvas/CanvasRenderingContext.cpp:
+        (WebCore::CanvasRenderingContext::wouldTaintOrigin):
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::canReceiveDragData):
+        (WebCore::SecurityOrigin::taintsCanvas): Deleted.
+        * page/SecurityOrigin.h:
+
 2016-10-18  Dave Hyatt  <hyatt@apple.com>
 

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

@@ -102 +102 @@
         return false;
 
-    if (canvas()->securityOrigin()->taintsCanvas(url))
-        return true;
-
     if (url.protocolIsData())
         return false;
 
-    return false;
+    return !canvas()->securityOrigin()->canRequest(url);
 }
 

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -299 +299 @@
 }
 
-bool SecurityOrigin::taintsCanvas(const URL& url) const
-{
-    if (canRequest(url))
-        return false;
-
-    // This function exists because we treat data URLs as having a unique origin,
-    // contrary to the current (9/19/2009) draft of the HTML5 specification.
-    // We still want to let folks paint data URLs onto untainted canvases, so
-    // we special case data URLs below. If we change to match HTML5 w.r.t.
-    // data URL security, then we can remove this function in favor of
-    // !canRequest.
-    if (url.protocolIsData())
-        return false;
-
-    return true;
-}
-
 bool SecurityOrigin::canReceiveDragData(const SecurityOrigin* dragInitiator) const
 {
@@ -321 +304 @@
         return true;
 
-    return canAccess(dragInitiator);  
+    return canAccess(dragInitiator);
 }
 

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -107 +107 @@
     bool canRequest(const URL&) const;
 
-    // Returns true if drawing an image from this URL taints a canvas from
-    // this security origin. For example, call this function before
-    // drawing an image onto an HTML canvas element with the drawImage API.
-    bool taintsCanvas(const URL&) const;
-
     // Returns true if this SecurityOrigin can receive drag content from the
     // initiator. For example, call this function before allowing content to be