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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ff07b5e19096426b83c5e0d74ddfd722493236f0
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 22:49:16 2010 +0000

    Patch for https://bugs.webkit.org/show_bug.cgi?id=43275
    Make WKArrayRef more usable.
    
    Reviewed by Anders Carlsson.
    
    WebKit2:
    
    - Add Create functions.
    - Make WKArrayGetItemAtIndex return a WKTypeRef.
    
    * UIProcess/API/C/WKArray.cpp:
    (WKArrayCreate):
    (WKArrayCreateAdoptingValues):
    (WKArrayGetItemAtIndex):
    * UIProcess/API/C/WKArray.h:
    
    WebKitTools:
    
    Remove now unnecessary const_casts.
    
    * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
    (WTR::dumpDescendantFrameScrollPositions):
    (WTR::dumpDescendantFramesText):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64382 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 537d7df..6a3bb51 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-30  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=43275
+        Make WKArrayRef more usable.
+
+        - Add Create functions.
+        - Make WKArrayGetItemAtIndex return a WKTypeRef.
+
+        * UIProcess/API/C/WKArray.cpp:
+        (WKArrayCreate):
+        (WKArrayCreateAdoptingValues):
+        (WKArrayGetItemAtIndex):
+        * UIProcess/API/C/WKArray.h:
+
 2010-07-30  Ada Chan  <adachan at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit2/UIProcess/API/C/WKArray.cpp b/WebKit2/UIProcess/API/C/WKArray.cpp
index 59be076..68d121f 100644
--- a/WebKit2/UIProcess/API/C/WKArray.cpp
+++ b/WebKit2/UIProcess/API/C/WKArray.cpp
@@ -35,7 +35,19 @@ WKTypeID WKArrayGetTypeID()
     return toRef(APIObject::TypeArray);
 }
 
-const void* WKArrayGetItemAtIndex(WKArrayRef arrayRef, size_t index)
+WKArrayRef WKArrayCreate(WKTypeRef* values, size_t numberOfValues)
+{
+    RefPtr<ImmutableArray> array = ImmutableArray::create(reinterpret_cast<APIObject**>(values), numberOfValues);
+    return toRef(array.release().releaseRef());
+}
+
+WKArrayRef WKArrayCreateAdoptingValues(WKTypeRef* values, size_t numberOfValues)
+{
+    RefPtr<ImmutableArray> array = ImmutableArray::adopt(reinterpret_cast<APIObject**>(values), numberOfValues);
+    return toRef(array.release().releaseRef());
+}
+
+WKTypeRef WKArrayGetItemAtIndex(WKArrayRef arrayRef, size_t index)
 {
     return toWK(arrayRef)->at(index);
 }
diff --git a/WebKit2/UIProcess/API/C/WKArray.h b/WebKit2/UIProcess/API/C/WKArray.h
index 3bb0002..534efc6 100644
--- a/WebKit2/UIProcess/API/C/WKArray.h
+++ b/WebKit2/UIProcess/API/C/WKArray.h
@@ -34,7 +34,10 @@ extern "C" {
 
 WK_EXPORT WKTypeID WKArrayGetTypeID();
 
-WK_EXPORT const void* WKArrayGetItemAtIndex(WKArrayRef array, size_t index);
+WK_EXPORT WKArrayRef WKArrayCreate(WKTypeRef* values, size_t numberOfValues);
+WK_EXPORT WKArrayRef WKArrayCreateAdoptingValues(WKTypeRef* values, size_t numberOfValues);
+
+WK_EXPORT WKTypeRef WKArrayGetItemAtIndex(WKArrayRef array, size_t index);
 WK_EXPORT size_t WKArrayGetSize(WKArrayRef array);
 
 WK_EXPORT WKArrayRef WKArrayRetain(WKArrayRef array);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fad40e2..79fadae 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Anders Carlsson.
 
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=43275
+        Make WKArrayRef more usable.
+
+        Remove now unnecessary const_casts.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::dumpDescendantFrameScrollPositions):
+        (WTR::dumpDescendantFramesText):
+
+2010-07-30  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
         Patch for https://bugs.webkit.org/show_bug.cgi?id=43274
         Add first pass of structured message passing.
 
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index 3632fb9..ca01c14 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -285,8 +285,7 @@ static void dumpDescendantFrameScrollPositions(WKBundleFrameRef frame)
     WKRetainPtr<WKArrayRef> childFrames(AdoptWK, WKBundleFrameCopyChildFrames(frame));
     size_t size = WKArrayGetSize(childFrames.get());
     for (size_t i = 0; i < size; ++i) {
-        // FIXME: I don't like that we have to const_cast here. Can we change WKArray?
-        WKBundleFrameRef subframe = static_cast<WKBundleFrameRef>(const_cast<void*>(WKArrayGetItemAtIndex(childFrames.get(), i)));
+        WKBundleFrameRef subframe = static_cast<WKBundleFrameRef>(WKArrayGetItemAtIndex(childFrames.get(), i));
         dumpFrameScrollPosition(subframe, ShouldIncludeFrameName);
         dumpDescendantFrameScrollPositions(subframe);
     }
@@ -312,8 +311,7 @@ static void dumpDescendantFramesText(WKBundleFrameRef frame)
     WKRetainPtr<WKArrayRef> childFrames(AdoptWK, WKBundleFrameCopyChildFrames(frame));
     size_t size = WKArrayGetSize(childFrames.get());
     for (size_t i = 0; i < size; ++i) {
-        // FIXME: I don't like that we have to const_cast here. Can we change WKArray?
-        WKBundleFrameRef subframe = static_cast<WKBundleFrameRef>(const_cast<void*>(WKArrayGetItemAtIndex(childFrames.get(), i)));
+        WKBundleFrameRef subframe = static_cast<WKBundleFrameRef>(WKArrayGetItemAtIndex(childFrames.get(), i));
         WKRetainPtr<WKStringRef> subframeName(AdoptWK, WKBundleFrameCopyName(subframe));
         InjectedBundle::shared().os() << "\n--------\nFrame: '" << subframeName << "'\n--------\n";
         dumpFrameText(subframe);

-- 
WebKit Debian packaging