Changeset 51037 in webkit

Timestamp:

Nov 16, 2009 7:37:09 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

[Qt] Implement load error pages support for Qt's DRT.
​https://bugs.webkit.org/show_bug.cgi?id=31509

Reviewed by Kenneth Christiansen.

For now, it will not be a default feature, and layout tests
that want to make use of this have to explicitily call
'handleErrorPages();' for the test source.

Any of the other DumpRenderTree's (mac, win and gtk)
support handling error pages. Qt's will be the first.

• DumpRenderTree/qt/DumpRenderTree.cpp:

(WebCore::WebPage::supportsExtension):
(WebCore::WebPage::extension):

• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::reset):

• DumpRenderTree/qt/LayoutTestControllerQt.h:

(LayoutTestController::shouldHandleErrorPages):
(LayoutTestController::handleErrorPages):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTree.cpp (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTree.h (modified) (1 diff)
• DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)
• DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-14  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] Implement load error pages support for Qt's DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=31509
+
+        For now, it will not be a default feature, and layout tests
+        that want to make use of this have to explicitily call
+        'handleErrorPages();' for the test source.
+
+        Any of the other DumpRenderTree's (mac, win and gtk)
+        support handling error pages. Qt's will be the first.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::WebPage::supportsExtension):
+        (WebCore::WebPage::extension):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::reset):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        (LayoutTestController::shouldHandleErrorPages):
+        (LayoutTestController::handleErrorPages):
+
 2009-11-16  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp

@@ -215 +215 @@
 }
 
+bool WebPage::supportsExtension(QWebPage::Extension extension) const
+{
+    if (extension == QWebPage::ErrorPageExtension)
+        return m_drt->layoutTestController()->shouldHandleErrorPages();
+
+    return false;
+}
+
+bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output)
+{
+    const QWebPage::ErrorPageExtensionOption* info = static_cast<const QWebPage::ErrorPageExtensionOption*>(option);
+
+    // Lets handle error pages for the main frame for now.
+    if (info->frame != mainFrame())
+        return false;
+
+    QWebPage::ErrorPageExtensionReturn* errorPage = static_cast<QWebPage::ErrorPageExtensionReturn*>(output);
+
+    errorPage->content = QString("data:text/html,<body/>").toUtf8();
+
+    return true;
+}
+
 DumpRenderTree::DumpRenderTree()
     : m_dumpPixels(false)

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h

@@ -68 +68 @@
     void resetSettings();
     void enableTextOutput(bool enable) { m_enableTextOutput = enable; }
+
+    virtual bool supportsExtension(QWebPage::Extension extension) const;
+    virtual bool extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output);
 
 public slots:

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -65 +65 @@
     m_topLoadingFrame = 0;
     m_waitForPolicy = false;
+    m_handleErrorPages = false;
     qt_dump_editing_callbacks(false);
     qt_dump_resource_load_callbacks(false);

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -64 +64 @@
     bool shouldDumpStatusCallbacks() const { return m_dumpStatusCallbacks; }
     bool shouldWaitUntilDone() const { return m_waitForDone; }
+    bool shouldHandleErrorPages() const { return m_handleErrorPages; }
     bool canOpenWindows() const { return m_canOpenWindows; }
     bool shouldDumpTitleChanges() const { return m_dumpTitleChanges; }
@@ -88 +89 @@
     void notifyDone();
     void dumpBackForwardList() { m_dumpBackForwardList = true; }
+    void handleErrorPages() { m_handleErrorPages = true; }
     void dumpEditingCallbacks();
     void dumpResourceLoadCallbacks();
@@ -141 +143 @@
     bool m_dumpStatusCallbacks;
     bool m_waitForPolicy;
+    bool m_handleErrorPages;
 
     QBasicTimer m_timeoutTimer;