[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bd6634358e95036cf9a05a32c650143774f362ef
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 19:49:27 2010 +0000

    2010-10-20  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix layoutTestController.getJsObjectCount
    
            Qt Bridge doesn't know size_t so pass result as unsigned int.
    
            Unskip fast/dom/gc-10.html
    
            https://bugs.webkit.org/show_bug.cgi?id=47931
    
            * platform/qt/Skipped:
    2010-10-20  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix layoutTestController.getJsObjectCount
    
            Qt Bridge doesn't know size_t so pass result as unsigned int.
    
            Unskip fast/dom/gc-10.html
    
            https://bugs.webkit.org/show_bug.cgi?id=47931
    
            * DumpRenderTree/qt/GCControllerQt.cpp:
            (GCController::getJSObjectCount):
            * DumpRenderTree/qt/GCControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 241272c..1d2ba8c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-20  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix layoutTestController.getJsObjectCount
+
+        Qt Bridge doesn't know size_t so pass result as unsigned int.
+
+        Unskip fast/dom/gc-10.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=47931
+
+        * platform/qt/Skipped:
+
 2010-10-20  Dan Bernstein  <mitz at apple.com>
 
         Rubber-stamped by Anders Carlsson.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index ffb1e39..fe180bd 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2443,7 +2443,6 @@ fast/box-sizing/percentage-height.html
 fast/css/acid2-pixel.html
 fast/css/acid2.html
 fast/dom/focus-contenteditable.html
-fast/dom/gc-10.html
 fast/dom/isindex-002.html
 # seems to trigger some bugs/missing features in QTextCodec
 fast/encoding/char-encoding.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cc3aaf9..b4e4257 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-20  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix layoutTestController.getJsObjectCount
+
+        Qt Bridge doesn't know size_t so pass result as unsigned int.
+
+        Unskip fast/dom/gc-10.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=47931
+
+        * DumpRenderTree/qt/GCControllerQt.cpp:
+        (GCController::getJSObjectCount):
+        * DumpRenderTree/qt/GCControllerQt.h:
+
 2010-10-20  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r70149.
diff --git a/WebKitTools/DumpRenderTree/qt/GCControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/GCControllerQt.cpp
index ba7e2c3..3aa507f 100644
--- a/WebKitTools/DumpRenderTree/qt/GCControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/GCControllerQt.cpp
@@ -48,7 +48,7 @@ void GCController::collectOnAlternateThread(bool waitUntilDone) const
     DumpRenderTreeSupportQt::garbageCollectorCollectOnAlternateThread(waitUntilDone);
 }
 
-size_t GCController::getJSObjectCount() const
+unsigned int GCController::getJSObjectCount() const
 {
     return DumpRenderTreeSupportQt::javaScriptObjectsCount();
 }
diff --git a/WebKitTools/DumpRenderTree/qt/GCControllerQt.h b/WebKitTools/DumpRenderTree/qt/GCControllerQt.h
index ed2a858..d3c83b9 100644
--- a/WebKitTools/DumpRenderTree/qt/GCControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/GCControllerQt.h
@@ -43,7 +43,7 @@ public:
 public slots:
     void collect() const;
     void collectOnAlternateThread(bool waitUntilDone) const;
-    size_t getJSObjectCount() const;
+    unsigned int getJSObjectCount() const;
 
 };
 

-- 
WebKit Debian packaging