Updated WebKit to dbda3e9596b836ab6eb88c500766dba6745759be

13 files changed, 143 insertions, 12 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index efffe85f90..baa5bf23d0 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-7e7119292e94f55a66d391cd183a4dd6ec1a8d65
+dbda3e9596b836ab6eb88c500766dba6745759be
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 9efa08f5ab..1453e64f0a 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,32 @@
+2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=61957
+
+        When building inside the Qt source tree, qmake always append the mkspecs
+        defines after ours. We have to workaround and make sure that we append
+        our flags after the qmake variable used inside Qt. This workaround was provided
+        by our qmake folks. We need to append in both case because qmake behave differently
+        when called with -spec or via SUBDIR+=.
+
+        * Source/WebKit.pri:
+
+2011-06-02  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=61957
+
+        When building inside the Qt source tree, qmake always append the mkspecs
+        defines after ours. We have to workaround and make sure that we append 
+        our flags after the qmake variable used inside Qt. This workaround was provided 
+        by our qmake folks.
+
+        * Source/WebKit.pri:
+
 2011-05-05  Prasanth Ullattil  <prasanth.ullattil@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
index fc937e8bdb..7ec90f2b25 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,32 @@
+2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=61957
+
+        When building inside the Qt source tree, qmake always append the mkspecs
+        defines after ours. We have to workaround and make sure that we append 
+        our flags after the qmake variable used inside Qt. This workaround was provided 
+        by our qmake folks. We need to append in both case because qmake behave differently
+        when called with -spec or via SUBDIR+=. This patch unbreak r87950 on Mac for Qt port.
+
+        * JavaScriptCore.pro:
+
+2011-06-02  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=61957
+
+        When building inside the Qt source tree, qmake always append the mkspecs
+        defines after ours. We have to workaround and make sure that we append  
+        our flags after the qmake variable used inside Qt. This workaround was provided
+        by our qmake folks.
+
+        * JavaScriptCore.pro:
+
 2011-05-31  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro
index 3e0caf8df9..a109179577 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro
@@ -217,8 +217,21 @@ symbian: {
     QMAKE_CXXFLAGS.ARMCC += -OTime -O3
 }
 
-lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) {
-    # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
-    *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
-}
+lessThan(QT_GCC_MAJOR_VERSION, 5) {
+    # GCC 4.5 and before
+    lessThan(QT_GCC_MINOR_VERSION, 6) {
+        # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
+        *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
+    }
 
+    # GCC 4.6 and after.
+    greaterThan(QT_GCC_MINOR_VERSION, 5) {
+        if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+            # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
+            QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
+            QMAKE_CFLAGS += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS += -Wno-c++0x-compat
+        }
+    }
+}
diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog
index e3fd8b063e..af420e0781 100644
--- a/src/3rdparty/webkit/Source/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog
@@ -1,3 +1,41 @@
+2011-06-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION: inline style is lost when deleting line break between paragraphs with same style
+        https://bugs.webkit.org/show_bug.cgi?id=61899
+
+        The bug was caused by ReplaceSelectionCommand::doApply's calling handleStyleSpansBeforeInsertion
+        before insertionPos is adjusted by positionAvoidingPrecedingNodes and positionOutsideTabSpan.
+
+        Fixed the bug by calling handleStyleSpansBeforeInsertion after the calls to these two functions.
+
+        Test: editing/deleting/delete-line-break-between-paragraphs-with-same-style.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::doApply):
+
+2011-06-01  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION: Text selection broken for text with line-height applied
+        https://bugs.webkit.org/show_bug.cgi?id=54929
+
+        The bug was caused by RenderText::positionForPoint's not considering the case where a point is
+        above selectionTop and below lineTop of the first root inline box. Fixed the bug by considering
+        any point between selectionTop and lineTop to be inside a root inline box. This condition is
+        consistent with the condition we use to determine the bottom of a line.
+
+        Test: editing/selection/hit-test-on-text-with-line-height.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::positionForPointWithInlineChildren): Fixed a condition to determine whether
+        or not a point is above the first root line box. We need to check both selectionTop and logicalTop
+        for the same reason explained above.
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::positionForPoint): See above.
+
 2011-06-02  Andreas Kling  <kling@webkit.org>
 
         Rubber-stamped by Simon Hausmann.
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp
index 17777e186d..279bb35bce 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp
@@ -891,8 +891,6 @@ void ReplaceSelectionCommand::doApply()
     if (Frame* frame = document()->frame())
         frame->selection()->clearTypingStyle();
     
-    bool handledStyleSpans = handleStyleSpansBeforeInsertion(fragment, insertionPos);
-
     // We don't want the destination to end up inside nodes that weren't selected.  To avoid that, we move the
     // position forward without changing the visible position so we're still at the same visible location, but
     // outside of preceding tags.
@@ -901,6 +899,8 @@ void ReplaceSelectionCommand::doApply()
     // Paste into run of tabs splits the tab span.
     insertionPos = positionOutsideTabSpan(insertionPos);
 
+    bool handledStyleSpans = handleStyleSpansBeforeInsertion(fragment, insertionPos);
+
     // If we are not trying to match the destination style we prefer a position
     // that is outside inline elements that provide style.
     // This way we can produce a less verbose markup.
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp
index 67982973e3..59c8db7774 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp
@@ -4102,7 +4102,8 @@ VisiblePosition RenderBlock::positionForPointWithInlineChildren(const IntPoint&
     }
 
     if (closestBox) {
-        if (moveCaretToBoundary && pointInLogicalContents.y() < firstRootBoxWithChildren->selectionTop()) {
+        if (moveCaretToBoundary && pointInLogicalContents.y() < firstRootBoxWithChildren->selectionTop()
+            && pointInLogicalContents.y() < firstRootBoxWithChildren->logicalTop()) {
             // y coordinate is above first root line box, so return the start of the first
             return VisiblePosition(positionForBox(firstRootBoxWithChildren->firstLeafChild(), true), DOWNSTREAM);
         }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
index 7f1be55f00..0fe052ffc3 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
@@ -497,7 +497,7 @@ VisiblePosition RenderText::positionForPoint(const IntPoint& point)
     InlineTextBox* lastBoxAbove = 0;
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
         RootInlineBox* rootBox = box->root();
-        if (pointBlockDirection >= rootBox->selectionTop()) {
+        if (pointBlockDirection >= rootBox->selectionTop() || pointBlockDirection >= rootBox->lineTop()) {
             int bottom = rootBox->selectionBottom();
             if (rootBox->nextRootBox())
                 bottom = min(bottom, rootBox->nextRootBox()->lineTop());
diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri
index 007fb446a9..127b6ee852 100644
--- a/src/3rdparty/webkit/Source/WebKit.pri
+++ b/src/3rdparty/webkit/Source/WebKit.pri
@@ -97,6 +97,8 @@ linux-g++* {
     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
             # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
+            QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
             QMAKE_CFLAGS += -Wno-c++0x-compat
             QMAKE_CXXFLAGS += -Wno-c++0x-compat
         }
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
index b459cb2a3b..23e1eb4087 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
@@ -170,7 +170,6 @@ static const char* editorCommandWebActions[] =
     0, // OpenImageInNewWindow,
     0, // DownloadImageToDisk,
     0, // CopyImageToClipboard,
-    0, // CopyImageUrlToClipboard,
 
     0, // Back,
     0, // Forward,
@@ -241,6 +240,10 @@ static const char* editorCommandWebActions[] =
     "AlignLeft", // AlignLeft,
     "AlignRight", // AlignRight,
 
+    0, // StopScheduledPageRefresh,
+
+    0, // CopyImageUrlToClipboard,
+
     0 // WebActionCount
 };
 
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.h b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.h
index e12b46015a..f1f481beef 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.h
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.h
@@ -105,7 +105,6 @@ public:
         OpenImageInNewWindow,
         DownloadImageToDisk,
         CopyImageToClipboard,
-        CopyImageUrlToClipboard,
 
         Back,
         Forward,
@@ -179,6 +178,8 @@ public:
 
         StopScheduledPageRefresh,
 
+        CopyImageUrlToClipboard,
+
         WebActionCount
     };
 
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
index 031deeef77..2c2ca8795f 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2011-06-02  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix enum order in qwebpage.h public API header
+        https://bugs.webkit.org/show_bug.cgi?id=61959
+
+        Since qwebpage.h is a public header, we can't change the values of
+        the enumerations. This patch moves the new enumeration to the end
+        of the list. As a bonus, adds a missing entry in
+        editorCommandWebActions table.
+
+        * Api/qwebpage.cpp:
+        * Api/qwebpage.h:
+
 2011-06-02  Andreas Kling  <kling@webkit.org>
 
         Rubber-stamped by Simon Hausmann.
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 0459590d19..c04db563dd 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
 
-        7e7119292e94f55a66d391cd183a4dd6ec1a8d65
+        dbda3e9596b836ab6eb88c500766dba6745759be