[webkit-changes] [101040] branches/chromium/912

Tue, 22 Nov 2011 19:16:07 -0800

Title: [101040] branches/chromium/912

Diff

Modified: branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-dead-frame.html (101039 => 101040)


--- branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-dead-frame.html	2011-11-23 03:08:07 UTC (rev 101039)
+++ branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-dead-frame.html	2011-11-23 03:16:00 UTC (rev 101040)
@@ -74,7 +74,7 @@
 
 <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=""
+<iframe id=targetframe src=""
 <script>runEditingTest();</script>
 </body>
 </html>

Copied: branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-to-data-url-expected.txt (from rev 100203, trunk/LayoutTests/editing/pasteboard/drag-drop-to-data-url-expected.txt) (0 => 101040)


--- branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-to-data-url-expected.txt	                        (rev 0)
+++ branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-to-data-url-expected.txt	2011-11-23 03:16:00 UTC (rev 101040)
@@ -0,0 +1,5 @@
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+Check you can't drag into a data URL
+
+hello
+

Copied: branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-to-data-url.html (from rev 100203, trunk/LayoutTests/editing/pasteboard/drag-drop-to-data-url.html) (0 => 101040)


--- branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-to-data-url.html	                        (rev 0)
+++ branches/chromium/912/LayoutTests/editing/pasteboard/drag-drop-to-data-url.html	2011-11-23 03:16:00 UTC (rev 101040)
@@ -0,0 +1,60 @@
+<html> 
+<head>
+<script src="" type="text/_javascript_"></script>
+<script>
+
+var framex;
+var framey;
+
+function editingTest() {
+  
+    if (!window.layoutTestController) {
+        alert('This test requires layoutTestController to run!');
+        return;
+    }
+
+    layoutTestController.waitUntilDone();
+    layoutTestController.dumpAsText();
+
+    var t = document.getElementById("targetframe");
+    framex = t.offsetLeft + 10;
+    framey = t.offsetTop + t.offsetHeight / 2;
+
+    // Drag 'hello'
+    dragDropIt();
+}
+
+
+function dragDropIt() {
+    var e = document.getElementById("dragme");
+    window.getSelection().setBaseAndExtent(e, 0, e, 4); 
+    x = e.offsetLeft + 10;
+    y = e.offsetTop + e.offsetHeight / 2;
+    eventSender.mouseMoveTo(x, y);
+    eventSender.mouseDown();
+    
+    eventSender.leapForward(500);
+    eventSender.mouseMoveTo(framex, framey);
+    setTimeout(dropIt, 100);
+}
+
+function dropIt() {
+
+    // Drop it off to the frame
+    eventSender.mouseUp();
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+
+
+</script>
+<title>Check you can't drag into a data URL</title> 
+</head>
+<body>
+
+<p>Check you can't drag into a data URL</p>
+<div><span id="dragme">hello</span></div>
+<iframe id=targetframe src=""
+<script>runEditingTest();</script>
+</body>
+</html>

Copied: branches/chromium/912/LayoutTests/editing/pasteboard/resources/editable-iframe.html (from rev 100203, trunk/LayoutTests/editing/pasteboard/resources/editable-iframe.html) (0 => 101040)


--- branches/chromium/912/LayoutTests/editing/pasteboard/resources/editable-iframe.html	                        (rev 0)
+++ branches/chromium/912/LayoutTests/editing/pasteboard/resources/editable-iframe.html	2011-11-23 03:16:00 UTC (rev 101040)
@@ -0,0 +1 @@
+<body contentEditable=true>

Modified: branches/chromium/912/Source/WebCore/page/SecurityOrigin.cpp (101039 => 101040)


--- branches/chromium/912/Source/WebCore/page/SecurityOrigin.cpp	2011-11-23 03:08:07 UTC (rev 101039)
+++ branches/chromium/912/Source/WebCore/page/SecurityOrigin.cpp	2011-11-23 03:16:00 UTC (rev 101040)
@@ -305,13 +305,6 @@
     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;
-
     return canAccess(dragInitiator);  
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to