WebKit2 needs a way to box numbers (for Array, Dictionary, etc.)
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Sep 2010 01:43:42 +0000 (01:43 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Sep 2010 01:43:42 +0000 (01:43 +0000)
<rdar://problem/8408844>
https://bugs.webkit.org/show_bug.cgi?id=45429

Reviewed by Dan Bernstein.

This adds a generic WebNumber class that can be used for any scalar
numeric type. Right now, we are only exposing a double version, but it
is designed to allow more.

* Shared/APIObject.h:
* Shared/WebNumber.h: Added.
(WebKit::WebNumber::create):
(WebKit::WebNumber::value):
(WebKit::WebNumber::setValue):
(WebKit::WebNumber::WebNumber):
(WebKit::WebNumber::type):
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKBase.h:
* UIProcess/API/C/WKNumber.cpp: Added.
(WKDoubleGetTypeID):
(WKDoubleCreate):
(WKDoubleGetValue):
(WKDoubleSetValue):
* UIProcess/API/C/WKNumber.h: Added.
* UIProcess/API/C/WebKit2.h:
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* win/WebKit2Generated.make:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
WebKit2/ChangeLog
WebKit2/Shared/APIObject.h
WebKit2/Shared/WebNumber.h [new file with mode: 0644]
WebKit2/UIProcess/API/C/WKAPICast.h
WebKit2/UIProcess/API/C/WKBase.h
WebKit2/UIProcess/API/C/WKNumber.cpp [new file with mode: 0644]
WebKit2/UIProcess/API/C/WKNumber.h [new file with mode: 0644]
WebKit2/UIProcess/API/C/WebKit2.h
WebKit2/WebKit2.pro
WebKit2/WebKit2.xcodeproj/project.pbxproj
WebKit2/win/WebKit2.vcproj
WebKit2/win/WebKit2Generated.make

index 73a6f7d..859481a 100644 (file)
@@ -1,3 +1,36 @@
+2010-09-08  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        WebKit2 needs a way to box numbers (for Array, Dictionary, etc.)
+        <rdar://problem/8408844>
+        https://bugs.webkit.org/show_bug.cgi?id=45429
+
+        This adds a generic WebNumber class that can be used for any scalar
+        numeric type. Right now, we are only exposing a double version, but it
+        is designed to allow more.
+
+        * Shared/APIObject.h:
+        * Shared/WebNumber.h: Added.
+        (WebKit::WebNumber::create):
+        (WebKit::WebNumber::value):
+        (WebKit::WebNumber::setValue):
+        (WebKit::WebNumber::WebNumber):
+        (WebKit::WebNumber::type):
+        * UIProcess/API/C/WKAPICast.h:
+        * UIProcess/API/C/WKBase.h:
+        * UIProcess/API/C/WKNumber.cpp: Added.
+        (WKDoubleGetTypeID):
+        (WKDoubleCreate):
+        (WKDoubleGetValue):
+        (WKDoubleSetValue):
+        * UIProcess/API/C/WKNumber.h: Added.
+        * UIProcess/API/C/WebKit2.h:
+        * WebKit2.pro:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * win/WebKit2.vcproj:
+        * win/WebKit2Generated.make:
+
 2010-09-08  Anders Carlsson  <andersca@apple.com>
 
         Don't include the std namespace in a header. This hopefully fixes the Windows build.
index 050b63f..87f0742 100644 (file)
@@ -44,6 +44,9 @@ public:
         TypeURL,
         TypeURLRequest,
         TypeURLResponse,
+
+        // Base numberic types
+        TypeDouble,
         
         // UIProcess types
         TypeBackForwardList,
diff --git a/WebKit2/Shared/WebNumber.h b/WebKit2/Shared/WebNumber.h
new file mode 100644 (file)
index 0000000..535e94f
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebNumber_h
+#define WebNumber_h
+
+#include "APIObject.h"
+#include <wtf/PassRefPtr.h>
+
+namespace WebKit {
+
+template<typename NumberType, APIObject::Type APIObjectType>
+class WebNumber : public APIObject {
+public:
+    static const Type APIType = APIObjectType;
+
+    static PassRefPtr<WebNumber> create(NumberType value)
+    {
+        return adoptRef(new WebNumber(value));
+    }
+
+    NumberType value() const { return m_value; }
+    void setValue(NumberType value) { m_value = value; }
+
+private:
+    WebNumber(NumberType value)
+        : m_value(value)
+    {
+    }
+
+    virtual Type type() const { return APIType; }
+
+    NumberType m_value;
+};
+
+typedef WebNumber<double, APIObject::TypeDouble> WebDouble;
+
+} // namespace WebKit
+
+#endif // WebNumber_h
index 6347478..15e7590 100644 (file)
@@ -29,6 +29,7 @@
 #include "WKBase.h"
 #include "WKPage.h"
 #include "WebEvent.h"
+#include "WebNumber.h"
 #include "WebString.h"
 #include "WebURL.h"
 #include <WebCore/FrameLoaderTypes.h>
@@ -67,6 +68,7 @@ template<> struct APITypeInfo<WKBackForwardListRef>             { typedef WebBac
 template<> struct APITypeInfo<WKContextRef>                     { typedef WebContext* ImplType; };
 template<> struct APITypeInfo<WKDataRef>                        { typedef WebData* ImplType; };
 template<> struct APITypeInfo<WKDictionaryRef>                  { typedef ImmutableDictionary* ImplType; };
+template<> struct APITypeInfo<WKDoubleRef>                      { typedef WebDouble* ImplType; };
 template<> struct APITypeInfo<WKFormSubmissionListenerRef>      { typedef WebFormSubmissionListenerProxy* ImplType; };
 template<> struct APITypeInfo<WKFramePolicyListenerRef>         { typedef WebFramePolicyListenerProxy* ImplType; };
 template<> struct APITypeInfo<WKFrameRef>                       { typedef WebFrameProxy* ImplType; };
@@ -94,6 +96,7 @@ template<> struct ImplTypeInfo<WebBackForwardList*>             { typedef WKBack
 template<> struct ImplTypeInfo<WebBackForwardListItem*>         { typedef WKBackForwardListItemRef APIType; };
 template<> struct ImplTypeInfo<WebContext*>                     { typedef WKContextRef APIType; };
 template<> struct ImplTypeInfo<WebData*>                        { typedef WKDataRef APIType; };
+template<> struct ImplTypeInfo<WebDouble*>                      { typedef WKDoubleRef APIType; };
 template<> struct ImplTypeInfo<WebError*>                       { typedef WKErrorRef APIType; };
 template<> struct ImplTypeInfo<WebFormSubmissionListenerProxy*> { typedef WKFormSubmissionListenerRef APIType; };
 template<> struct ImplTypeInfo<WebFramePolicyListenerProxy*>    { typedef WKFramePolicyListenerRef APIType; };
index 7489b56..be80b35 100644 (file)
@@ -45,6 +45,7 @@ typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
 typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
 typedef const struct OpaqueWKContext* WKContextRef;
 typedef const struct OpaqueWKData* WKDataRef;
+typedef const struct OpaqueWKDouble* WKDoubleRef;
 typedef const struct OpaqueWKError* WKErrorRef;
 typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
 typedef const struct OpaqueWKFrame* WKFrameRef;
diff --git a/WebKit2/UIProcess/API/C/WKNumber.cpp b/WebKit2/UIProcess/API/C/WKNumber.cpp
new file mode 100644 (file)
index 0000000..5756a4d
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WKNumber.h"
+
+#include "WKAPICast.h"
+#include "WebNumber.h"
+
+using namespace WebKit;
+
+WKTypeID WKDoubleGetTypeID()
+{
+    return toRef(WebDouble::APIType);
+}
+
+WKDoubleRef WKDoubleCreate(double value)
+{
+    RefPtr<WebDouble> doubleObject = WebDouble::create(value);
+    return toRef(doubleObject.release().releaseRef());
+}
+
+double WKDoubleGetValue(WKDoubleRef doubleRef)
+{
+    return toWK(doubleRef)->value();
+}
+
+void WKDoubleSetValue(WKDoubleRef doubleRef, double value)
+{
+    toWK(doubleRef)->setValue(value);
+}
diff --git a/WebKit2/UIProcess/API/C/WKNumber.h b/WebKit2/UIProcess/API/C/WKNumber.h
new file mode 100644 (file)
index 0000000..39d1375
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKNumber_h
+#define WKNumber_h
+
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* WKDouble */
+WK_EXPORT WKTypeID WKDoubleGetTypeID();
+WK_EXPORT WKDoubleRef WKDoubleCreate(double value);
+WK_EXPORT double WKDoubleGetValue(WKDoubleRef doubleRef);
+WK_EXPORT void WKDoubleSetValue(WKDoubleRef doubleRef, double value);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKNumber_h */
index 946c2a1..74e1f8c 100644 (file)
@@ -41,6 +41,7 @@
 #include <WebKit2/WKMutableArray.h>
 #include <WebKit2/WKMutableDictionary.h>
 #include <WebKit2/WKNavigationData.h>
+#include <WebKit2/WKNumber.h>
 #include <WebKit2/WKPage.h>
 #include <WebKit2/WKPageNamespace.h>
 #include <WebKit2/WKPreferences.h>
index 8ca6e6c..398a169 100644 (file)
@@ -167,6 +167,7 @@ HEADERS += \
     Shared/VisitedLinkTable.h \
     Shared/WebEventConversion.h \
     Shared/WebEvent.h \
+    Shared/WebNumber.h \
     Shared/WebNavigationDataStore.h \
     Shared/WebPreferencesStore.h \
     Shared/WebURLRequest.h \
@@ -182,6 +183,7 @@ HEADERS += \
     UIProcess/API/C/WKFrame.h \
     UIProcess/API/C/WKFramePolicyListener.h \
     UIProcess/API/C/WKNavigationData.h \
+    UIProcess/API/C/WKNumber.h \
     UIProcess/API/C/WKPage.h \
     UIProcess/API/C/WKPageNamespace.h \
     UIProcess/API/C/WKPagePrivate.h \
@@ -293,6 +295,7 @@ SOURCES += \
     UIProcess/API/C/WKFrame.cpp \
     UIProcess/API/C/WKFramePolicyListener.cpp \
     UIProcess/API/C/WKNavigationData.cpp \
+    UIProcess/API/C/WKNumber.cpp \
     UIProcess/API/C/WKPage.cpp \
     UIProcess/API/C/WKPageNamespace.cpp \
     UIProcess/API/C/WKPreferences.cpp \
index 25ea138..676bf8d 100644 (file)
                9391F2CA121B679A00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */; };
                9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
                A72D610B1237144F00A88B15 /* WKSerializedScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */; };
-               A72D610C1237145000A88B15 /* WKSerializedScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */; };
                BC0092F7115837A300E0AE2A /* RunLoopMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0092F5115837A300E0AE2A /* RunLoopMac.mm */; };
                BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0092F6115837A300E0AE2A /* WorkQueueMac.cpp */; };
                BC032D7510F4378D0058C15A /* WebChromeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032D6010F4378D0058C15A /* WebChromeClient.h */; };
                BC2E6E8C1141971500A63B1E /* WorkItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E7C1141970C00A63B1E /* WorkItem.h */; };
                BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2E6E7D1141970C00A63B1E /* WorkQueue.cpp */; };
                BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E6E7E1141970C00A63B1E /* WorkQueue.h */; };
+               BC33DD681238464600360F3F /* WebNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33DD671238464600360F3F /* WebNumber.h */; };
+               BC33DE8E12385C3300360F3F /* WKNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33DE8C12385C3300360F3F /* WKNumber.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               BC33DE8F12385C3300360F3F /* WKNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC33DE8D12385C3300360F3F /* WKNumber.cpp */; };
+               BC33DF061238677F00360F3F /* WKSerializedScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A72D5F2E1236F9E800A88B15 /* WKSerializedScriptValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC4BEEAB120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4BEEA9120A0A5E00FBA0C7 /* InjectedBundleNodeHandle.h */; };
                BC4BEEAC120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4BEEAA120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp */; };
                BC4BEFE1120A1A4C00FBA0C7 /* WKBundleNodeHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4BEFDF120A1A4C00FBA0C7 /* WKBundleNodeHandle.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC2E6E7C1141970C00A63B1E /* WorkItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkItem.h; sourceTree = "<group>"; };
                BC2E6E7D1141970C00A63B1E /* WorkQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueue.cpp; sourceTree = "<group>"; };
                BC2E6E7E1141970C00A63B1E /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
+               BC33DD671238464600360F3F /* WebNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNumber.h; sourceTree = "<group>"; };
+               BC33DE8C12385C3300360F3F /* WKNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNumber.h; sourceTree = "<group>"; };
+               BC33DE8D12385C3300360F3F /* WKNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNumber.cpp; sourceTree = "<group>"; };
                BC4BEEA9120A0A5E00FBA0C7 /* InjectedBundleNodeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleNodeHandle.h; sourceTree = "<group>"; };
                BC4BEEAA120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleNodeHandle.cpp; sourceTree = "<group>"; };
                BC4BEFDF120A1A4C00FBA0C7 /* WKBundleNodeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleNodeHandle.h; sourceTree = "<group>"; };
                                BC032DB010F4380F0058C15A /* WebEventConversion.cpp */,
                                BC032DB110F4380F0058C15A /* WebEventConversion.h */,
                                BCF69F981176CED600471A52 /* WebNavigationDataStore.h */,
+                               BC33DD671238464600360F3F /* WebNumber.h */,
                                BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
                                BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
                                BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
                                BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */,
                                BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */,
                                BCF69FA71176D1CB00471A52 /* WKNavigationData.h */,
+                               BC33DE8D12385C3300360F3F /* WKNumber.cpp */,
+                               BC33DE8C12385C3300360F3F /* WKNumber.h */,
                                BCD597D4112B56DC00EC8C23 /* WKPage.cpp */,
                                BCD597D5112B56DC00EC8C23 /* WKPage.h */,
                                BCEE98CA1133174C006BCC24 /* WKPageNamespace.cpp */,
                                BCD597CE112B56AC00EC8C23 /* WKPreferences.h */,
                                762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */,
                                762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */,
+                               A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */,
+                               A72D5F2E1236F9E800A88B15 /* WKSerializedScriptValue.h */,
                                BC20EBAF116EEB0800094A50 /* WKString.cpp */,
                                BC20EBAE116EEB0800094A50 /* WKString.h */,
                                BCDB85811200EC57007254BE /* WKType.cpp */,
                                BCE231C5122C492300D5C35A /* WKURLRequest.h */,
                                BC90A1DB122DD89800CC8C50 /* WKURLResponse.cpp */,
                                BC90A1DA122DD89800CC8C50 /* WKURLResponse.h */,
-                               A72D5F2E1236F9E800A88B15 /* WKSerializedScriptValue.h */,
-                               A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */,
                        );
                        path = C;
                        sourceTree = "<group>";
                                BCB0B0E012305AB100B1341E /* UserMessageCoders.h in Headers */,
                                BCA0EF7F12331E78007D3CFB /* WebEditCommand.h in Headers */,
                                BCA0EF9F12332642007D3CFB /* WebEditCommandProxy.h in Headers */,
+                               BC33DD681238464600360F3F /* WebNumber.h in Headers */,
+                               BC33DE8E12385C3300360F3F /* WKNumber.h in Headers */,
+                               BC33DF061238677F00360F3F /* WKSerializedScriptValue.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        buildActionMask = 2147483647;
                        files = (
                                1A6FA31111E3921E00DB1371 /* MainMac.cpp in Sources */,
-                               A72D610C1237145000A88B15 /* WKSerializedScriptValue.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                BCA0EF8012331E78007D3CFB /* WebEditCommand.cpp in Sources */,
                                BCA0EFA012332642007D3CFB /* WebEditCommandProxy.cpp in Sources */,
                                A72D610B1237144F00A88B15 /* WKSerializedScriptValue.cpp in Sources */,
+                               BC33DE8F12385C3300360F3F /* WKNumber.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index ad0230e..a87fc97 100755 (executable)
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Shared\WebNumber.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Shared\WebPreferencesStore.cpp"\r
                                >\r
                        </File>\r
                                                >\r
                                        </File>\r
                                        <File\r
+                                               RelativePath="..\UIProcess\API\C\WKNumber.cpp"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\UIProcess\API\C\WKNumber.h"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
                                                RelativePath="..\UIProcess\API\C\WKPage.cpp"\r
                                                >\r
                                        </File>\r
index 5b1eb65..a2717fe 100644 (file)
@@ -14,9 +14,10 @@ all:
     xcopy /y /d "..\UIProcess\API\C\WKFormSubmissionListener.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKFrame.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKFramePolicyListener.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
-    xcopy /y /d "..\UIProcess\API\C\WKNavigationData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKMutableArray.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKMutableDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+    xcopy /y /d "..\UIProcess\API\C\WKNavigationData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+    xcopy /y /d "..\UIProcess\API\C\WKNumber.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKPage.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKPageNamespace.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKPreferences.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"