Add API to retrieve the frame name from QWebFrame.

Implement support for DRT::dumpChildrenAsText.

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

diff --git a/WebKitQt/Api/qwebframe.cpp b/WebKitQt/Api/qwebframe.cpp
index 47d067706bbac6ea88e9b58da67ad965a7e9c032..fbccaa8faa5d1aa68d92bb4dd3838056f1a4729b 100644 (file)
--- a/WebKitQt/Api/qwebframe.cpp
+++ b/WebKitQt/Api/qwebframe.cpp
@@ -181,6 +181,11 @@ QString QWebFrame::title() const
     else return QString();
 }
 
+QString QWebFrame::name() const
+{
+    return d->frame->tree()->name();
+}
+
 QWebPage * QWebFrame::page() const
 {
     return d->page;

diff --git a/WebKitQt/Api/qwebframe.h b/WebKitQt/Api/qwebframe.h
index 35f258766ab2b6c27e284d0992ca041a63dab34a..e18bdad40e972a8276047747adf098f85bab6dd8 100644 (file)
--- a/WebKitQt/Api/qwebframe.h
+++ b/WebKitQt/Api/qwebframe.h
@@ -60,6 +60,7 @@ public:
     QString renderTreeDump() const;
     QString selectedText() const;
     QString title() const;
+    QString name() const;
 
     QList<QWebFrame*> childFrames() const;
 

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index c068ae36ef25ad7e17aaa2e74148c7dcd109e273..6da123a08de448e74851fe21cd695282b85a894b 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-02  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by bdash.
+
+        Add API to retrieve the frame name from QWebFrame.
+        Implement support for DRT::dumpChildrenAsText.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::name):
+        * Api/qwebframe.h:
+
 2007-10-02  Lars Knoll  <lars@trolltech.com>
 
         Reviewed by bdash.

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 641df9f1c5552bd0c43836dda1650e179351df1e..8b41b205ba5545d69734048ea370cfe1e92516e2 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2007-10-02  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by bdash.
+
+        Add API to retrieve the frame name from QWebFrame.
+        Implement support for DRT::dumpChildrenAsText.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::dumpFramesAsText):
+        (WebCore::DumpRenderTree::dump):
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h:
+        * DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::reset):
+        * DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h:
+
 2007-10-02  Lars Knoll  <lars@trolltech.com>
 
         Reviewed by bdash.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp
index 67612e7c14027fb6faa9d1ae8336a48829f53f9d..dc75140771054ee0053e5de2d9c84cae8c32fbc3 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp
@@ -177,6 +177,32 @@ void DumpRenderTree::initJSObjects()
     frame->addToJSWindowObject("eventSender", m_eventSender);
 }
 
+
+QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
+{
+    if (!frame)
+        return QString();
+
+    QString result;
+    QWebFrame *parent = qobject_cast<QWebFrame *>(frame->parent());
+    if (parent) {
+        result.append(QLatin1String("\n--------\nFrame: '"));
+        result.append(frame->name());
+        result.append(QLatin1String("'\n--------\n"));
+    }
+
+    result.append(frame->innerText());
+    result.append(QLatin1String("\n"));
+
+    if (m_controller->shouldDumpChildrenAsText()) {
+        QList<QWebFrame *> children = frame->childFrames();
+        for (int i = 0; i < children.size(); ++i)
+            result += dumpFramesAsText(children.at(i));
+    }
+
+    return result;
+}
+
 void DumpRenderTree::dump()
 {
     QWebFrame *frame = m_page->mainFrame();
@@ -191,8 +217,7 @@ void DumpRenderTree::dump()
     // Dump render text...
     QString renderDump;
     if (m_controller->shouldDumpAsText()) {
-        renderDump = frame->innerText();
-        renderDump.append("\n");
+        renderDump = dumpFramesAsText(frame);
     } else {
         renderDump = frame->renderTreeDump();
     }

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h
index 19b4646de4ffb8a0902d3fa9e60cfb5b6b16ecb6..f0cec70d156e7ca89687f9dd2ba830c41f8ed28b 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h
@@ -6,13 +6,13 @@
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
+ *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
+ *     documentation and/or other materials provided with the distribution.
  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
+ *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -71,6 +71,7 @@ Q_SIGNALS:
     void quit();
 
 private:
+    QString dumpFramesAsText(QWebFrame* frame);
     LayoutTestController *m_controller;
 
     QWebPage *m_page;

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp
index ce4f52460b74d2f682fb1c6579650eb7bf6a2a18..ccfd4330d5aaf9d09efcb3761cac5e1c1ccdd942 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp
@@ -54,6 +54,7 @@ LayoutTestController::LayoutTestController() : QObject()
 {
     m_isLoading = true;
     m_textDump = false;
+    m_dumpChildrenAsText = false;
     m_waitForDone = false;
     m_timeoutTimer = 0;
     m_topLoadingFrame = 0;
@@ -63,6 +64,7 @@ void LayoutTestController::reset()
 {
     m_isLoading = true;
     m_textDump = false;
+    m_dumpChildrenAsText = false;
     m_waitForDone = false;
     if (m_timeoutTimer) {
         killTimer(m_timeoutTimer);

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h
index 2c9cc84427c70a8c6357c124f53f3c6114e12d1a..da693973cfc1b979d48be39967f0cd2e1f469eb4 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h
@@ -44,6 +44,7 @@ public:
     void setLoading(bool loading) { m_isLoading = loading; }
 
     bool shouldDumpAsText() const { return m_textDump; }
+    bool shouldDumpChildrenAsText() const { return m_dumpChildrenAsText; }
     bool shouldWaitUntilDone() const { return m_waitForDone; }
 
     void reset();
@@ -57,6 +58,7 @@ signals:
 public slots:
     void maybeDump(bool ok);
     void dumpAsText() { m_textDump = true; }
+    void dumpChildFramesAsText() { m_dumpChildrenAsText = true; }
     void waitUntilDone();
     void notifyDone();
     void dumpEditingCallbacks();
@@ -66,6 +68,7 @@ public slots:
 private:
     bool m_isLoading;
     bool m_textDump;
+    bool m_dumpChildrenAsText;
     bool m_waitForDone;
     int m_timeoutTimer;
     QWebFrame *m_topLoadingFrame;