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

weinig at apple.com weinig at apple.com
Wed Dec 22 13:27:10 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5e52b93a343492ce400f89c960fcc9854ee3fad0
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 23:56:06 2010 +0000

    Add WKUInt64Ref wrapper for sending uint64_ts.
    
    Reviewed by Jon Honeycutt.
    
    * Shared/APIObject.h:
    * Shared/WebNumber.h:
    * UIProcess/API/C/WKAPICast.h:
    * UIProcess/API/C/WKBase.h:
    * UIProcess/API/C/WKNumber.cpp:
    (WKUInt64GetTypeID):
    (WKUInt64Create):
    (WKUInt64GetValue):
    (WKUInt64SetValue):
    * UIProcess/API/C/WKNumber.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cf2cc52..86e7885 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-15  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Jon Honeycutt.
+
+        Add WKUInt64Ref wrapper for sending uint64_ts.
+
+        * Shared/APIObject.h:
+        * Shared/WebNumber.h:
+        * UIProcess/API/C/WKAPICast.h:
+        * UIProcess/API/C/WKBase.h:
+        * UIProcess/API/C/WKNumber.cpp:
+        (WKUInt64GetTypeID):
+        (WKUInt64Create):
+        (WKUInt64GetValue):
+        (WKUInt64SetValue):
+        * UIProcess/API/C/WKNumber.h:
+
 2010-09-15  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index 87f0742..1cba836 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -45,8 +45,9 @@ public:
         TypeURLRequest,
         TypeURLResponse,
 
-        // Base numberic types
+        // Base numeric types
         TypeDouble,
+        TypeUInt64,
         
         // UIProcess types
         TypeBackForwardList,
diff --git a/WebKit2/Shared/WebNumber.h b/WebKit2/Shared/WebNumber.h
index 535e94f..38e879b 100644
--- a/WebKit2/Shared/WebNumber.h
+++ b/WebKit2/Shared/WebNumber.h
@@ -56,6 +56,7 @@ private:
 };
 
 typedef WebNumber<double, APIObject::TypeDouble> WebDouble;
+typedef WebNumber<uint64_t, APIObject::TypeUInt64> WebUInt64;
 
 } // namespace WebKit
 
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 15e7590..f865d95 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -81,6 +81,7 @@ template<> struct APITypeInfo<WKPreferencesRef>                 { typedef WebPre
 template<> struct APITypeInfo<WKSerializedScriptValueRef>       { typedef WebSerializedScriptValue* ImplType; };
 template<> struct APITypeInfo<WKStringRef>                      { typedef WebString* ImplType; };
 template<> struct APITypeInfo<WKTypeRef>                        { typedef APIObject* ImplType; };
+template<> struct APITypeInfo<WKUInt64Ref>                      { typedef WebUInt64* ImplType; };
 template<> struct APITypeInfo<WKURLRef>                         { typedef WebURL* ImplType; };
 template<> struct APITypeInfo<WKURLRequestRef>                  { typedef WebURLRequest* ImplType; };
 template<> struct APITypeInfo<WKURLResponseRef>                 { typedef WebURLResponse* ImplType; };
@@ -107,6 +108,7 @@ template<> struct ImplTypeInfo<WebPageProxy*>                   { typedef WKPage
 template<> struct ImplTypeInfo<WebPreferences*>                 { typedef WKPreferencesRef APIType; };
 template<> struct ImplTypeInfo<WebSerializedScriptValue*>       { typedef WKSerializedScriptValueRef APIType; };
 template<> struct ImplTypeInfo<WebString*>                      { typedef WKStringRef APIType; };
+template<> struct ImplTypeInfo<WebUInt64*>                      { typedef WKUInt64Ref APIType; };
 template<> struct ImplTypeInfo<WebURL*>                         { typedef WKURLRef APIType; };
 template<> struct ImplTypeInfo<WebURLRequest*>                  { typedef WKURLRequestRef APIType; };
 template<> struct ImplTypeInfo<WebURLResponse*>                 { typedef WKURLResponseRef APIType; };
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index be80b35..bb39999 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -56,6 +56,7 @@ typedef const struct OpaqueWKPageNamespace* WKPageNamespaceRef;
 typedef const struct OpaqueWKPreferences* WKPreferencesRef;
 typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
 typedef const struct OpaqueWKString* WKStringRef;
+typedef const struct OpaqueWKUInt64* WKUInt64Ref;
 typedef const struct OpaqueWKURL* WKURLRef;
 typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
 typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
diff --git a/WebKit2/UIProcess/API/C/WKNumber.cpp b/WebKit2/UIProcess/API/C/WKNumber.cpp
index 5756a4d..8a07fb7 100644
--- a/WebKit2/UIProcess/API/C/WKNumber.cpp
+++ b/WebKit2/UIProcess/API/C/WKNumber.cpp
@@ -50,3 +50,24 @@ void WKDoubleSetValue(WKDoubleRef doubleRef, double value)
 {
     toWK(doubleRef)->setValue(value);
 }
+
+WKTypeID WKUInt64GetTypeID()
+{
+    return toRef(WebUInt64::APIType);
+}
+
+WKUInt64Ref WKUInt64Create(uint64_t value)
+{
+    RefPtr<WebUInt64> uint64Object = WebUInt64::create(value);
+    return toRef(uint64Object.release().releaseRef());
+}
+
+uint64_t WKUInt64GetValue(WKUInt64Ref uint64Ref)
+{
+    return toWK(uint64Ref)->value();
+}
+
+void WKUInt64SetValue(WKUInt64Ref uint64Ref, uint64_t value)
+{
+    toWK(uint64Ref)->setValue(value);
+}
diff --git a/WebKit2/UIProcess/API/C/WKNumber.h b/WebKit2/UIProcess/API/C/WKNumber.h
index 39d1375..952f569 100644
--- a/WebKit2/UIProcess/API/C/WKNumber.h
+++ b/WebKit2/UIProcess/API/C/WKNumber.h
@@ -38,6 +38,12 @@ WK_EXPORT WKDoubleRef WKDoubleCreate(double value);
 WK_EXPORT double WKDoubleGetValue(WKDoubleRef doubleRef);
 WK_EXPORT void WKDoubleSetValue(WKDoubleRef doubleRef, double value);
 
+/* WKUInt64 */
+WK_EXPORT WKTypeID WKUInt64GetTypeID();
+WK_EXPORT WKUInt64Ref WKUInt64Create(uint64_t value);
+WK_EXPORT uint64_t WKUInt64GetValue(WKUInt64Ref doubleRef);
+WK_EXPORT void WKUInt64SetValue(WKUInt64Ref uint64Ref, uint64_t value);
+
 #ifdef __cplusplus
 }
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list