Reviewed by Darin

        - fixed <rdar://problem/4613701> REGRESSION: A line break in the source HTML of a link becomes visible after drag & drop

        * page/DragController.cpp:
        (WebCore::DragController::startDrag):
        Call simplifyWhiteSpace() on the proposed link title to match what's displayed on the web page, instead of using the
        raw source HTML text.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@19718 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c85806983367b8da67a1313a8c308c49202eda2..84c0cd528a4437ebcb03397dc726a563d1da87be 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-02-19  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Darin
+        
+        - fixed <rdar://problem/4613701> REGRESSION: A line break in the source HTML of a link becomes visible after drag & drop
+
+        * page/DragController.cpp:
+        (WebCore::DragController::startDrag):
+        Call simplifyWhiteSpace() on the proposed link title to match what's displayed on the web page, instead of using the
+        raw source HTML text.
+
 2007-02-19  David Hyatt  <hyatt@apple.com>
 
         Fix for Radar 4981605, regression where button grows randomly when a select is

diff --git a/WebCore/page/DragController.cpp b/WebCore/page/DragController.cpp
index 515265b7c95bb5684820cf21ac98c296883b54de..212ef40e93b6034e6b4640126d3f18c3c3b5beb3 100644 (file)
--- a/WebCore/page/DragController.cpp
+++ b/WebCore/page/DragController.cpp
@@ -580,8 +580,10 @@ bool DragController::startDrag(Frame* src, Clipboard* clipboard, DragOperation s
             doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
 
     } else if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) {
-        if (!clipboard->hasData()) 
-            clipboard->writeURL(linkURL, dragSource.textContent(), src);
+        if (!clipboard->hasData())
+            // Simplify whitespace so the title put on the clipboard resembles what the user sees
+            // on the web page. This includes replacing newlines with spaces.
+            clipboard->writeURL(linkURL, dragSource.textContent().simplifyWhiteSpace(), src);
         
         m_client->willPerformDragSourceAction(DragSourceActionLink, dragOrigin, clipboard);
         if (!dragImage) {