[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6a5584ef5c208196ebdc91a2000f1eccc5fa3028
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 01:15:18 2010 +0000

    2010-11-01  Juha Savolainen  <juha.savolainen at weego.fi>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Initial implementation of QWKHistoryItem.
            https://bugs.webkit.org/show_bug.cgi?id=48620
    
            The QWkHistoryItem represents one item in the history of QWKPage.
    
            * UIProcess/API/qt/qwkhistory.cpp:
            (QWKHistoryItemPrivate::QWKHistoryItemPrivate):
            (QWKHistoryItem::QWKHistoryItem):
            (QWKHistoryItem::~QWKHistoryItem):
            (QWKHistoryItem::title): The page title
            (QWKHistoryItem::url): The URL of the page.
            (QWKHistoryItem::originalUrl): The URL used to access the page.
            * UIProcess/API/qt/qwkhistory.h:
            * UIProcess/API/qt/qwkhistory_p.h:
            * WebKit2.pro: Added WKBackForwardListItem.h and WKBackForwardListItem.cpp
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 11acb6d..2a8994a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-01  Juha Savolainen  <juha.savolainen at weego.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Initial implementation of QWKHistoryItem.
+        https://bugs.webkit.org/show_bug.cgi?id=48620
+
+        The QWkHistoryItem represents one item in the history of QWKPage.
+
+        * UIProcess/API/qt/qwkhistory.cpp:
+        (QWKHistoryItemPrivate::QWKHistoryItemPrivate):
+        (QWKHistoryItem::QWKHistoryItem):
+        (QWKHistoryItem::~QWKHistoryItem):
+        (QWKHistoryItem::title): The page title
+        (QWKHistoryItem::url): The URL of the page.
+        (QWKHistoryItem::originalUrl): The URL used to access the page.
+        * UIProcess/API/qt/qwkhistory.h:
+        * UIProcess/API/qt/qwkhistory_p.h:
+        * WebKit2.pro: Added WKBackForwardListItem.h and WKBackForwardListItem.cpp
+
 2010-11-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit2/UIProcess/API/qt/qwkhistory.cpp b/WebKit2/UIProcess/API/qt/qwkhistory.cpp
index bbefe96..b0318c9 100644
--- a/WebKit2/UIProcess/API/qt/qwkhistory.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkhistory.cpp
@@ -26,11 +26,55 @@
 #include "qwkhistory.h"
 
 #include "WKBackForwardList.h"
+#include "WKBackForwardListItem.h"
+#include "WKStringQt.h"
+#include "WKURL.h"
+#include "WKURLQt.h"
 #include "WebBackForwardList.h"
 #include "qwkhistory_p.h"
+#include <QString>
+#include <QUrl>
+#include <WebKit2/WKRetainPtr.h>
 
 using namespace WebKit;
 
+QWKHistoryItemPrivate::QWKHistoryItemPrivate(WKBackForwardListItemRef listItem)
+    : m_backForwardListItem(listItem)
+{
+}
+
+QWKHistoryItem::QWKHistoryItem()
+{
+}
+
+QWKHistoryItem::~QWKHistoryItem()
+{
+}
+
+QString QWKHistoryItem::title() const
+{
+    if (!d->m_backForwardListItem)
+        return QString();
+    WKRetainPtr<WKStringRef> title = WKBackForwardListItemCopyTitle(d->m_backForwardListItem.get());
+    return WKStringCopyQString(title.get());
+}
+
+QUrl QWKHistoryItem::url() const
+{
+    if (!d->m_backForwardListItem)
+        return QUrl();
+    WKRetainPtr<WKURLRef> url = WKBackForwardListItemCopyURL(d->m_backForwardListItem.get());
+    return WKURLCopyQUrl(url.get());
+}
+
+QUrl QWKHistoryItem::originalUrl() const
+{
+    if (!d->m_backForwardListItem)
+        return QUrl();
+    WKRetainPtr<WKURLRef> url = WKBackForwardListItemCopyOriginalURL(d->m_backForwardListItem.get());
+    return WKURLCopyQUrl(url.get());
+}
+
 QWKHistoryPrivate::QWKHistoryPrivate(WebKit::WebBackForwardList* list)
     : m_backForwardList(list)
 {
diff --git a/WebKit2/UIProcess/API/qt/qwkhistory.h b/WebKit2/UIProcess/API/qt/qwkhistory.h
index 65912dd..8eabcd0 100644
--- a/WebKit2/UIProcess/API/qt/qwkhistory.h
+++ b/WebKit2/UIProcess/API/qt/qwkhistory.h
@@ -29,11 +29,30 @@
 #include <QObject>
 
 class QWKHistoryPrivate;
+class QWKHistoryItemPrivate;
+class QUrl;
+class QString;
 
 namespace WebKit {
 class WebBackForwardList;
 }
 
+class QWEBKIT_EXPORT QWKHistoryItem {
+public:
+    ~QWKHistoryItem();
+    QString title() const;
+    QUrl url() const;
+    QUrl originalUrl() const;
+
+private:
+    QWKHistoryItem();
+
+    QWKHistoryItemPrivate* d;
+
+    friend class QWKHistory;
+    friend class QWKHistoryItemPrivate;
+};
+
 class QWEBKIT_EXPORT QWKHistory : public QObject {
     Q_OBJECT
 public:
diff --git a/WebKit2/UIProcess/API/qt/qwkhistory_p.h b/WebKit2/UIProcess/API/qt/qwkhistory_p.h
index 97e6cf3..10d088a 100644
--- a/WebKit2/UIProcess/API/qt/qwkhistory_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkhistory_p.h
@@ -26,6 +26,9 @@
 #define qwkhistory_p_h
 
 #include "qwebkitglobal.h"
+#include <WebKit2/WKBase.h>
+#include <WebKit2/WKRetainPtr.h>
+#include <wtf/PassRefPtr.h>
 
 namespace WebKit {
 class WebBackForwardList;
@@ -33,6 +36,16 @@ class WebBackForwardList;
 
 class QWKHistory;
 
+class QWEBKIT_EXPORT QWKHistoryItemPrivate {
+private:
+    QWKHistoryItemPrivate(WKBackForwardListItemRef listItem);
+
+    WKRetainPtr<WKBackForwardListItemRef> m_backForwardListItem;
+
+    friend class QWKHistory;
+    friend class QWKHistoryItem;
+};
+
 class QWEBKIT_EXPORT QWKHistoryPrivate {
 public:
     static QWKHistory* createHistory(WebKit::WebBackForwardList* list);
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 0725811..034a48c 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -230,6 +230,7 @@ HEADERS += \
     UIProcess/API/C/WebKit2.h \
     UIProcess/API/C/WKAPICast.h \
     UIProcess/API/C/WKBackForwardList.h \
+    UIProcess/API/C/WKBackForwardListItem.h \
     UIProcess/API/C/WKContext.h \
     UIProcess/API/C/WKContextPrivate.h \
     UIProcess/API/C/WKFrame.h \
@@ -395,6 +396,7 @@ SOURCES += \
     Shared/WebURLResponse.cpp \
     Shared/WebWheelEvent.cpp \
     UIProcess/API/C/WKBackForwardList.cpp \
+    UIProcess/API/C/WKBackForwardListItem.cpp \
     UIProcess/API/C/WKContext.cpp \
     UIProcess/API/C/WKFrame.cpp \
     UIProcess/API/C/WKFramePolicyListener.cpp \

-- 
WebKit Debian packaging