Changeset 42238 in webkit

Timestamp:

Apr 6, 2009 4:25:37 AM (11 years ago)

Author:

Simon Hausmann

Message:

WebCore:

2009-04-06 Simon Hausmann <​simon.hausmann@nokia.com>

Reviewed by Tor Arne Vestbø.

Add new files to the Qt build.
Export helper function from the Qt JSC binding, needed in WebKit/qt.

WebKit/qt:

2009-04-06 Simon Hausmann <​simon.hausmann@nokia.com>

Ariya Hidayat <​ariya.hidayat@nokia.com>
Tor Arne Vestbø <​tor.arne.vestbo@nokia.com>
Genevieve Mak <​gen@staikos.net>

Reviewed by Tor Arne Vestbø, Simon Hausmann

First revision of new API in the Qt port to access the DOM.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebCore/bridge/qt/qt_runtime.h (modified) (1 diff)
• WebKit/qt/Api/headers.pri (modified) (1 diff)
• WebKit/qt/Api/qwebelement.cpp (added)
• WebKit/qt/Api/qwebelement.h (added)
• WebKit/qt/Api/qwebframe.cpp (modified) (3 diffs)
• WebKit/qt/Api/qwebframe.h (modified) (4 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/QtLauncher/main.cpp (modified) (4 diffs)
• WebKit/qt/tests/qwebelement (added)
• WebKit/qt/tests/qwebelement/qwebelement.pro (added)
• WebKit/qt/tests/qwebelement/tst_qwebelement.cpp (added)
• WebKit/qt/tests/tests.pro (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-06  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Add new files to the Qt build.
+        Export helper function from the Qt JSC binding, needed in WebKit/qt.
+
+        * WebCore.pro: Add new files.
+        * bridge/qt/qt_runtime.h: Declare convertQVariantToValue.
+
 2009-04-06  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/WebCore.pro

@@ -1193 +1193 @@
     ../WebKit/qt/Api/qwebpage.cpp \
     ../WebKit/qt/Api/qwebview.cpp \
+    ../WebKit/qt/Api/qwebelement.cpp \
     ../WebKit/qt/Api/qwebhistory.cpp \
     ../WebKit/qt/Api/qwebsettings.cpp \

trunk/WebCore/bridge/qt/qt_runtime.h

@@ -225 +225 @@
 
 QVariant convertValueToQVariant(ExecState* exec, JSValuePtr value, QMetaType::Type hint, int *distance);
+JSValuePtr convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, const QVariant& variant);
 
 } // namespace Bindings

trunk/WebKit/qt/Api/headers.pri

@@ -6 +6 @@
                      $$PWD/qwebhistoryinterface.h \
                      $$PWD/qwebdatabase.h \
-                     $$PWD/qwebsecurityorigin.h
+                     $$PWD/qwebsecurityorigin.h \
+                     $$PWD/qwebelement.h

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -26 +26 @@
 #include "qwebsecurityorigin.h"
 #include "qwebsecurityorigin_p.h"
+#include "qwebelement.h"
 
 #include "DocumentLoader.h"
@@ -962 +963 @@
         return QSize();
     return QSize(view->contentsWidth(), view->contentsHeight());
+}
+
+/*!
+    \since 4.6
+
+    Returns the document element of this frame.
+
+    The document element provides access to the entire structured
+    content of the frame.
+*/
+QWebElement QWebFrame::documentElement() const
+{
+    WebCore::Document *doc = d->frame->document();
+    if (!doc)
+        return QWebElement();
+    return QWebElement(doc->documentElement());
+}
+
+/*!
+    \since 4.6
+    Returns a new selection of elements that are children of the frame's
+    document element and that match the given CSS selector \a query.
+*/
+QWebElementSelection QWebFrame::selectElements(const QString &query) const
+{
+    return documentElement().select(query);
+}
+
+/*!
+    \since 4.6
+    Returns the first element in the frame's document that matches the
+    given CSS selector \a query. Returns a null element if there is no
+    match.
+*/
+QWebElement QWebFrame::selectElement(const QString &query) const
+{
+    return documentElement().selectFirst(query);
 }
 
@@ -1448 +1486 @@
 
 /*!
+    \since 4.6
+    Returns the underlying DOM element as QWebElement.
+*/
+QWebElement QWebHitTestResult::element() const
+{
+    if (!d || !d->innerNonSharedNode || !d->innerNonSharedNode->isElementNode())
+        return QWebElement();
+
+    return QWebElement(static_cast<WebCore::Element*>(d->innerNonSharedNode.get()));
+}
+
+/*!
     Returns the frame the hit test was executed in.
 */

trunk/WebKit/qt/Api/qwebframe.h

@@ -1 +1 @@
 /*
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+    Copyright (C) 2008,2009 Nokia Corporation and/or its subsidiary(-ies)
     Copyright (C) 2007 Staikos Computing Services Inc.
 
@@ -50 +50 @@
 class QWebHistoryItem;
 class QWebSecurityOrigin;
+class QWebElement;
+class QWebElementSelection;
 
 namespace WebCore {
@@ -88 +90 @@
     bool isContentEditable() const;
     bool isContentSelected() const;
+
+    QWebElement element() const;
 
     QWebFrame *frame() const;
@@ -175 +179 @@
     QSize contentsSize() const;
 
+    QWebElement documentElement() const;
+    QWebElementSelection selectElements(const QString &query) const;
+    QWebElement selectElement(const QString &query) const;
+
     QWebHitTestResult hitTestContent(const QPoint &pos) const;
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-04-06  Simon Hausmann  <simon.hausmann@nokia.com>
+            Ariya Hidayat <ariya.hidayat@nokia.com>
+            Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+            Genevieve Mak <gen@staikos.net>
+
+        Reviewed by Tor Arne Vestbø, Simon Hausmann
+
+        First revision of new API in the Qt port to access the DOM.
+
+        * Api/headers.pri: Added qwebelement.h to the API headers.
+        * Api/qwebelement.cpp: Added.
+        * Api/qwebelement.h: Added.
+        * Api/qwebframe.cpp:
+        (QWebFrame::documentElement): Added accessor for the document element.
+        (QWebFrame::selectElements): Added convenienc query method.
+        (QWebFrame::selectElement): Ditto.
+        (QWebHitTestResult::element): Added accessor for underlying DOM element.
+        * Api/qwebframe.h:
+        * QtLauncher/main.cpp: Simple test gui for element selections.
+        * tests/qwebelement/qwebelement.pro: Added.
+        * tests/qwebelement/tst_qwebelement.cpp: Added.
+        * tests/tests.pro: Added QWebElement & QWebElementSelection unit tests.
+
 2009-04-02  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKit/qt/QtLauncher/main.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2006 George Staikos <staikos@kde.org>
  * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
@@ -34 +34 @@
 #include <qwebframe.h>
 #include <qwebsettings.h>
+#include <qwebelement.h>
 
 #include <QtGui>
@@ -182 +183 @@
         qDebug() << "HTML: " << view->page()->mainFrame()->toHtml();
     }
+
+    void selectElements() {
+        bool ok;
+        QString str = QInputDialog::getText(this, "Select elements", "Choose elements",
+                                            QLineEdit::Normal, "a", &ok);
+        if (ok && !str.isEmpty()) {
+            QWebElementSelection result =  view->page()->mainFrame()->selectElements(str);
+            foreach (QWebElement e, result)
+                e.setStyleProperty("background-color", "yellow");
+            statusBar()->showMessage(QString("%1 element(s) selected").arg(result.count()), 5000);
+        }
+    }
+
 private:
 
@@ -273 +287 @@
         view->pageAction(QWebPage::ToggleItalic)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
         view->pageAction(QWebPage::ToggleUnderline)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_U));
+
+        QMenu *toolsMenu = menuBar()->addMenu("&Tools");
+        toolsMenu->addAction("Select elements...", this, SLOT(selectElements()));
+
     }
 

trunk/WebKit/qt/tests/tests.pro

@@ -1 +1 @@
 
 TEMPLATE = subdirs
-SUBDIRS = qwebframe qwebpage
+SUBDIRS = qwebframe qwebpage qwebelement