[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1c2d78b71f788d8b918871f5c66ac4d902aec45b
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 18:45:11 2009 +0000

    If the frame has no innerText don't append it, and
    do not add a newline which breaks some cross platform
    results.
    
    Reviewed by Simon Hausmann.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::DumpRenderTree::dumpFramesAsText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5a53fce..924c861 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -11,6 +11,17 @@
 
         Reviewed by Simon Hausmann.
 
+        If the frame has no innerText don't append it, and
+        do not add a newline which breaks some cross platform
+        results.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::dumpFramesAsText):
+
+2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
         Implement missing functionality in the Gtk/Qt TestNetscapePlugin.
 
         * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index d1ed0b9..5923493 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -414,8 +414,11 @@ QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
         result.append(QLatin1String("'\n--------\n"));
     }
 
-    result.append(frame->toPlainText());
-    result.append(QLatin1String("\n"));
+    QString innerText = frame->toPlainText();
+    if (!innerText.isEmpty()) {
+        result.append(innerText);
+        result.append(QLatin1String("\n"));
+    }
 
     if (m_controller->shouldDumpChildrenAsText()) {
         QList<QWebFrame *> children = frame->childFrames();

-- 
WebKit Debian packaging