[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4e67f21d95b561a7264e7f8556c82fb72b8ff2a5
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 08:11:48 2009 +0000

    Added QGraphicsWebView::modified property, for consistency
    with QWebView.
    
    Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-04
    Reviewed by Kenneth Christiansen.
    
    * Api/qgraphicswebview.cpp:
    (QGraphicsWebView::isModified):
    * Api/qgraphicswebview.h:
    * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
    (tst_QGraphicsWebView::qgraphicswebview):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index b947127..a70772e 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -596,6 +596,22 @@ void QGraphicsWebView::setInteractive(bool allowed)
 }
 
 /*!
+    \property QGraphicsWebView::modified
+    \brief whether the document was modified by the user
+
+    Parts of HTML documents can be editable for example through the
+    \c{contenteditable} attribute on HTML elements.
+
+    By default, this property is false.
+*/
+bool QGraphicsWebView::isModified() const
+{
+    if (d->page)
+        return d->page->isModified();
+    return false;
+}
+
+/*!
     Returns a pointer to the view/page specific settings object.
 
     It is equivalent to
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index 84a3f94..1b990cf 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -46,6 +46,8 @@ class QWEBKIT_EXPORT QGraphicsWebView : public QGraphicsWidget {
 
     Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactivityChanged)
 
+    Q_PROPERTY(bool modified READ isModified)
+
 public:
     QGraphicsWebView(QGraphicsItem* parent = 0);
     ~QGraphicsWebView();
@@ -65,6 +67,8 @@ public:
     bool isInteractive() const;
     void setInteractive(bool);
 
+    bool isModified() const;
+
     void load(const QUrl &url);
     void load(const QNetworkRequest& request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray& body = QByteArray());
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a9aaf24..f337416 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Kenneth Christiansen.
 
+        Added QGraphicsWebView::modified property, for consistency
+        with QWebView.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::isModified):
+        * Api/qgraphicswebview.h:
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::qgraphicswebview):
+
+2009-11-04  Simon Hausmann  <hausmann at webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
         Removed status and progress properties of QGraphicsWebView.
         Added loadProgress and statusBarMessage signals instead,
         after API review.
diff --git a/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp b/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
index 1de9bfb..9fd147f 100644
--- a/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
+++ b/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
@@ -76,6 +76,7 @@ void tst_QGraphicsWebView::qgraphicswebview()
     item.load(QUrl());
     item.setHtml(QString());
     item.setContent(QByteArray());
+    item.isModified();
 }
 
 class WebPage : public QWebPage

-- 
WebKit Debian packaging