Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d

Integrated changes:

|| <https://webkit.org/b/40714> || [Qt] Compilation in QWebPagePrivate::timerEvent with clang ||
|| <https://webkit.org/b/40717> || [Qt] Bridge documentation: some snippets have the wrong indentation ||
|| <https://webkit.org/b/40662> || [Qt] Avoid truncation of zoom factor in QWebFrame's print function. ||

7 files changed, 98 insertions, 39 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 98460a0..3ebd2c1 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-19de3d2848b715f937eb375a078672cc8e9b8185
+4ad38c43081bedb69c7e26a9ca0fb2c50456066d
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index c2daf34..86d1838 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        19de3d2848b715f937eb375a078672cc8e9b8185
+        4ad38c43081bedb69c7e26a9ca0fb2c50456066d
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
index 721aaa6..cc7b11c 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -1431,8 +1431,8 @@ void QWebFrame::print(QPrinter *printer) const
     if (!painter.begin(printer))
         return;
 
-    const qreal zoomFactorX = printer->logicalDpiX() / qt_defaultDpi();
-    const qreal zoomFactorY = printer->logicalDpiY() / qt_defaultDpi();
+    const qreal zoomFactorX = (qreal)printer->logicalDpiX() / qt_defaultDpi();
+    const qreal zoomFactorY = (qreal)printer->logicalDpiY() / qt_defaultDpi();
 
     PrintContext printContext(d->frame);
     float pageHeight = 0;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 4460ad3..3141f66 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -766,7 +766,7 @@ void QWebPagePrivate::timerEvent(QTimerEvent *ev)
     if (timerId == tripleClickTimer.timerId())
         tripleClickTimer.stop();
     else
-        q->QObject::timerEvent(ev);
+        q->timerEvent(ev);
 }
 
 void QWebPagePrivate::mouseMoveEvent(QGraphicsSceneMouseEvent* ev)
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 3df2970..2785421 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,63 @@
+2010-06-21  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Unreviewed build fix.
+
+        [Qt] Fix package builds
+
+        Don't use rpath unless we're building inside the trunk.
+
+        * declarative/declarative.pro:
+
+2010-06-19  Mirko Damiani  <mirko@develer.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Avoid truncation of zoom factor in QWebFrame's print function.
+        https://bugs.webkit.org/show_bug.cgi?id=40662
+
+        The zoom factor is a qreal number but its value is truncated to an
+        integer. So a cast to qreal is needed to avoid this issue.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::print):
+
+2010-06-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Bridge documentation: some snippets have the wrong indentation
+        https://bugs.webkit.org/show_bug.cgi?id=40717
+
+        Fixed code snippets
+
+        * docs/webkitsnippets/qtwebkit_bridge_snippets.cpp:
+        (wrapInFunction):
+
+2010-06-19  Olivier Goffart  <olivier.goffart@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Compilation in QWebPagePrivate::timerEvent with clang
+        https://bugs.webkit.org/show_bug.cgi?id=40714
+
+        QObject::timerEvent is protected and cannot be accessed by QWebPagePrivate
+        with clang
+
+        QWebPagePrivate is a friend of QWebPage and then should have access to
+        all protected members of parents of QWebPage, including QObject.
+        But the clang team do not want to conform to this aspect of the specification
+        because "It is either a drafting error or a horrible mistake."
+        See http://llvm.org/bugs/show_bug.cgi?id=6840
+
+        This change is better because QWebPage does not reimplement the timerEvent
+        (QWebPagePrivate::timerEvent is called from QWebPage::event)
+        So customers that would reimplement their own timerEvent
+        for their own timer now get a chance to catch them.
+
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::timerEvent):
+
 2010-06-18  Alexis Menard  <alexis.menard@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro
index 924329a..122d90a 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro
@@ -34,17 +34,19 @@ include(../../../WebKit.pri)
 
 QT += declarative
 
-linux-* {
-    # From Creator's src/rpath.pri:
-    # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-    # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
-    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-    MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
-    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
-    QMAKE_RPATHDIR =
-} else {
-    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+!CONFIG(standalone_package) {
+    linux-* {
+        # From Creator's src/rpath.pri:
+        # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+        # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
+        QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+        MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
+
+        QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
+        QMAKE_RPATHDIR =
+    } else {
+        QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+    }
 }
 
 SOURCES += qdeclarativewebview.cpp plugin.cpp
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
index 62eeeca..6a517c2 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
@@ -12,10 +12,10 @@ void wrapInFunction()
     //! [1]
     {
         width: ...,
-            height: ...,
-                toDataURL: function() { ... },
-                    assignToHTMLImageElement: function(element) { ... }
-        }
+        height: ...,
+        toDataURL: function() { ... },
+        assignToHTMLImageElement: function(element) { ... }
+    }
     //! [1]
 #endif
     //! [2]
@@ -24,7 +24,7 @@ void wrapInFunction()
         Q_PROPERTY(QPixmap myPixmap READ getPixmap)
 
     public:
-                QPixmap getPixmap() const;
+        QPixmap getPixmap() const;
     };
 
     /* ... */
@@ -36,21 +36,22 @@ void wrapInFunction()
 #if 0
     //! [3]
     <html>
-            <head>
+        <head>
             <script>
-            function loadImage() {
-        myObject.myPixmap.assignToHTMLImageElement(document.getElementById("imageElement"));
-    }
-    </script>
-            </head>
-            <body onload="loadImage()">
-                         <img id="imageElement" width="300" height="200" />
-                                                                   </body>
-                                                                   </html>
-                                                                   //! [3]
+                function loadImage()
+                {
+                    myObject.myPixmap.assignToHTMLImageElement(document.getElementById("imageElement"));
+                }
+            </script>
+        </head>
+        <body onload="loadImage()">
+            <img id="imageElement" width="300" height="200" />
+        </body>
+    </html>
+//! [3]
 #endif
-                                                                   //! [4]
-                                                                   class MyObject : QObject {
+//! [4]
+class MyObject : QObject {
         Q_OBJECT
 
     public slots:
@@ -161,11 +162,7 @@ void wrapInFunction()
     myQObject.enabled = !myQObject.enabled;
     //! [24]
     //! [25]
-    myQObject.enabled = true;
-
-    ...
-
-    myQObject.enabled = !myQObject.enabled;
+    myDialog.okButton
     //! [25]
     //! [26]
     myDialog.okButton