[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[robert at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 584609ca143228960dc397eee69fc69b50a16248
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 23:49:42 2011 +0000

    2011-01-18  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] http/tests/incremental/slow-utf8-text.pl fails
            https://bugs.webkit.org/show_bug.cgi?id=44282
    
            * platform/qt/Skipped:
    2011-01-18  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] http/tests/incremental/slow-utf8-text.pl fails
            https://bugs.webkit.org/show_bug.cgi?id=44282
    
            * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
            (DumpRenderTreeSupportQt::responseMimeType):
            * WebCoreSupport/DumpRenderTreeSupportQt.h:
    2011-01-18  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] http/tests/incremental/slow-utf8-text.pl fails
            https://bugs.webkit.org/show_bug.cgi?id=44282
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::DumpRenderTree::dump):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76079 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 322aa83..6765db2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-18  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] http/tests/incremental/slow-utf8-text.pl fails
+        https://bugs.webkit.org/show_bug.cgi?id=44282
+
+        * platform/qt/Skipped:
+
 2011-01-18  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a7100fc..84c8c66 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -147,9 +147,6 @@ http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html
 http/tests/media
 http/tests/wml
 
-# https://bugs.webkit.org/show_bug.cgi?id=44282
-http/tests/incremental/slow-utf8-text.pl
-
 # expected results need updating
 http/tests/loading/simple-subframe.html
 
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 06fb368..f760119 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-18  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] http/tests/incremental/slow-utf8-text.pl fails
+        https://bugs.webkit.org/show_bug.cgi?id=44282
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::responseMimeType):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2011-01-17  Alexey Proskuryakov  <ap at apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=52495
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index ecd91eb..a7a495a 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -31,6 +31,7 @@
 #include "ContextMenuController.h"
 #include "DeviceOrientation.h"
 #include "DeviceOrientationClientMockQt.h"
+#include "DocumentLoader.h"
 #include "Editor.h"
 #include "EditorClientQt.h"
 #include "Element.h"
@@ -885,6 +886,13 @@ QVariantList DumpRenderTreeSupportQt::nodesFromRect(const QWebElement& document,
     return res;
 }
 
+QString DumpRenderTreeSupportQt::responseMimeType(QWebFrame* frame)
+{
+    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
+    WebCore::DocumentLoader* docLoader = coreFrame->loader()->documentLoader();
+    return docLoader->responseMIMEType();
+}
+
 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
 
 void QWEBKIT_EXPORT qt_resumeActiveDOMObjects(QWebFrame* frame)
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
index 6917039..dd84e76 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
@@ -184,6 +184,7 @@ public:
     static QString viewportAsText(QWebPage*, const QSize&);
 
     static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
+    static QString responseMimeType(QWebFrame*);
 };
 
 #endif
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3601d3d..a8037d9 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-18  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] http/tests/incremental/slow-utf8-text.pl fails
+        https://bugs.webkit.org/show_bug.cgi?id=44282
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::dump):
+
 2011-01-18  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index fe37958..ce608cc 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -915,6 +915,10 @@ void DumpRenderTree::dump()
         fprintf(stdout, "Source:\n\n%s\n", markup.toUtf8().constData());
     }
 
+    QString mimeType = DumpRenderTreeSupportQt::responseMimeType(mainFrame);
+    if (mimeType == "text/plain")
+        m_controller->dumpAsText();
+
     // Dump render text...
     QString resultString;
     if (m_controller->shouldDumpAsText())

-- 
WebKit Debian packaging