Changeset 76079 in webkit

Timestamp:

Jan 18, 2011 3:49:42 PM (13 years ago)

Author:

robert@webkit.org

Message:

2011-01-18 Robert Hogan <​robert@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@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@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):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (2 diffs)
• Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-18  Robert Hogan  <robert@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@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -147 +147 @@
 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

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-01-18  Robert Hogan  <robert@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@apple.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -32 +32 @@
 #include "DeviceOrientation.h"
 #include "DeviceOrientationClientMockQt.h"
+#include "DocumentLoader.h"
 #include "Editor.h"
 #include "EditorClientQt.h"
@@ -886 +887 @@
 }
 
+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
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

@@ -185 +185 @@
 
     static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
+    static QString responseMimeType(QWebFrame*);
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-18  Robert Hogan  <robert@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@chromium.org>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -916 +916 @@
     }
 
+    QString mimeType = DumpRenderTreeSupportQt::responseMimeType(mainFrame);
+    if (mimeType == "text/plain")
+        m_controller->dumpAsText();
+
     // Dump render text...
     QString resultString;