Changeset 101040 in webkit

Timestamp:

Nov 22, 2011, 7:16:00 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 100203
BUG=105143
Review URL: ​http://codereview.chromium.org/8673010

Location:

branches/chromium/912

Files:

• LayoutTests/editing/pasteboard/drag-drop-dead-frame.html (modified) (1 diff)
• LayoutTests/editing/pasteboard/drag-drop-to-data-url-expected.txt (copied) (copied from trunk/LayoutTests/editing/pasteboard/drag-drop-to-data-url-expected.txt )
• LayoutTests/editing/pasteboard/drag-drop-to-data-url.html (copied) (copied from trunk/LayoutTests/editing/pasteboard/drag-drop-to-data-url.html )
• LayoutTests/editing/pasteboard/resources/editable-iframe.html (copied) (copied from trunk/LayoutTests/editing/pasteboard/resources/editable-iframe.html )
• Source/WebCore/page/SecurityOrigin.cpp (modified) (1 diff)

branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-dead-frame.html

@@ -75 +75 @@
 <p>Check you don't crash when your previous drag target frame is deleted &lt;rdar://problem/5049842&gt;</p>
 <div><span id="dragme">hello</span></div>
-<iframe id=targetframe src="data:text/html;charset=utf-8,%3Cbody%20contentEditable%3Dtrue%3E%0D%0A"></iframe>
+<iframe id=targetframe src="resources/editable-iframe.html"></iframe>
 <script>runEditingTest();</script>
 </body>

branches/chromium/912/Source/WebCore/page/SecurityOrigin.cpp

@@ -304 +304 @@
 {
     if (this == dragInitiator)
-        return true;
-
-    // FIXME: Currently 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 allow
-    // drop across data URLs, so we special case data URLs below. If we change to
-    // match HTML5 w.r.t. data URL security, then we can remove this check.
-    if (m_protocol == "data")
         return true;