Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 0b6fc217c2b853827926313c09bb3c32f66ffe43 )

Changes in WebKit since the last update:

++ b/WebCore/ChangeLog
2009-02-06  Dirk Schulze  <krit@webkit.org>

        Reviewed by Simon Hausmann.

        Fix bug in clearRect(). Use fillRect() instead of eraseRect() to get
        the context transparent.

        [QT] clearRect fill's a given rect with white
        https://bugs.webkit.org/show_bug.cgi?id=23728

        * platform/graphics/qt/GraphicsContextQt.cpp:
        (WebCore::GraphicsContext::clearRect):

++ b/WebKit/qt/ChangeLog
2009-03-26  Simon Hausmann  <simon.hausmann@nokia.com>

        Rubber-stamped by Tor Arne Vestbø.

        Fix the documentation of the QLocale usage in userAgentForUrl.

        * Api/qwebpage.cpp:

2009-03-20  Erik L. Bunce  <elbunce@xendom.com>

        Reviewed by Simon Hausmann.

        Fix for InsertParagraphSeparator and InsertLineSeparator so that
        QWebPage::action() creates QActions for them. Also make sure they get
        updated appropriately.

        * Api/qwebpage.cpp:
        (QWebPagePrivate::updateEditorActions):
        (QWebPage::action):
        * tests/qwebpage/tst_qwebpage.cpp:
        (tst_QWebPage::textEditing):

1 files changed, 11 insertions, 1 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 5e3c656..636b6e8 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -533,6 +533,8 @@ void QWebPagePrivate::updateEditorActions()
     updateAction(QWebPage::ToggleBold);
     updateAction(QWebPage::ToggleItalic);
     updateAction(QWebPage::ToggleUnderline);
+    updateAction(QWebPage::InsertParagraphSeparator);
+    updateAction(QWebPage::InsertLineSeparator);
 }
 
 void QWebPagePrivate::timerEvent(QTimerEvent *ev)
@@ -1792,6 +1794,13 @@ QAction *QWebPage::action(WebAction action) const
             text = contextMenuItemTagInspectElement();
             break;
 
+        case InsertParagraphSeparator:
+            text = tr("Insert a new paragraph");
+            break;
+        case InsertLineSeparator:
+            text = tr("Insert a new line");
+            break;
+
         case NoWebAction:
             return 0;
     }
@@ -2319,7 +2328,8 @@ QWebPluginFactory *QWebPage::pluginFactory() const
     \list
     \o %Platform% and %Subplatform% are expanded to the windowing system and the operation system.
     \o %Security% expands to U if SSL is enabled, otherwise N. SSL is enabled if QSslSocket::supportsSsl() returns true.
-    \o %Locale% is replaced with QLocale::name().
+    \o %Locale% is replaced with QLocale::name(). The locale is determined from the view of the QWebPage. If no view is set on the QWebPage,
+    then a default constructed QLocale is used instead.
     \o %WebKitVersion% currently expands to 527+
     \o %AppVersion% expands to QCoreApplication::applicationName()/QCoreApplication::applicationVersion() if they're set; otherwise defaulting to Qt and the current Qt version.
     \endlist