From d9e9e64d0ae957c453d45a61bb45be3646bc853d Mon Sep 17 00:00:00 2001
From: Andreas Kling <andreas.kling@nokia.com>
Date: Mon, 6 Jun 2011 13:52:33 +0200
Subject: Updated WebKit to cbc99535043a2abc98d6701943595f52fbaf5b19

Reviewed-by: Alexis Menard
---
 src/3rdparty/webkit/.tag                                       |  2 +-
 src/3rdparty/webkit/Source/WebKit/qt/ChangeLog                 | 10 ++++++++++
 .../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp       |  4 ++--
 src/3rdparty/webkit/VERSION                                    |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 71b9b1b..83f3aac 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-4e7dfbab30278b0427e699baaadbf3e5aab88203
+cbc99535043a2abc98d6701943595f52fbaf5b19
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
index 18a555b..f923b8a 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Andreas Kling.
 
+        [Qt] Warning fixes on comparisons between a signed and an unsigned.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo):
+        (DumpRenderTreeSupportQt::nodesFromRect):
+
+2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
         To support building namespaced Qt, we require that forward-declarations
         of Qt classes be wrapped in QT_BEGIN_NAMESPACE and QT_END_NAMESPACE.
 
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index e55afe8..9d0b4f9 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -568,7 +568,7 @@ QVariantMap DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(const QWe
         return res;
 
     RefPtr<WebCore::CSSComputedStyleDeclaration> style = computedStyle(webElement, true);
-    for (int i = 0; i < style->length(); i++) {
+    for (unsigned i = 0; i < style->length(); i++) {
         QString name = style->item(i);
         QString value = (static_cast<WebCore::CSSStyleDeclaration*>(style.get()))->getPropertyValue(name);
         res[convertToPropertyName(name)] = QVariant(value);
@@ -967,7 +967,7 @@ QVariantList DumpRenderTreeSupportQt::nodesFromRect(const QWebElement& document,
     if (!doc)
         return res;
     RefPtr<NodeList> nodes = doc->nodesFromRect(x, y, top, right, bottom, left, ignoreClipping);
-    for (int i = 0; i < nodes->length(); i++) {
+    for (unsigned i = 0; i < nodes->length(); i++) {
         // QWebElement will be null if the Node is not an HTML Element
         if (nodes->item(i)->isHTMLElement())
             res << QVariant::fromValue(QWebElement(nodes->item(i)));
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 5f803b4..76a0a7f 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
 
-        4e7dfbab30278b0427e699baaadbf3e5aab88203
+        cbc99535043a2abc98d6701943595f52fbaf5b19
-- 
cgit v0.12