Diff
Modified: trunk/Source/WebKit2/ChangeLog (160390 => 160391)
--- trunk/Source/WebKit2/ChangeLog 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 23:00:40 UTC (rev 160391)
@@ -1,5 +1,25 @@
2013-12-10 Anders Carlsson <ander...@apple.com>
+ Rename WebNumber.h to APINumber.h
+ https://bugs.webkit.org/show_bug.cgi?id=125545
+
+ Reviewed by Beth Dakin.
+
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ * Shared/API/c/WKNumber.cpp:
+ * Shared/API/c/WKSharedAPICast.h:
+ * Shared/APINumber.h: Renamed from Source/WebKit2/Shared/WebNumber.h.
+ * Shared/Plugins/Netscape/PluginInformation.cpp:
+ * Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
+ * Shared/UserData.cpp:
+ * Shared/UserMessageCoders.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ * UIProcess/Notifications/WebNotificationProvider.cpp:
+ * UIProcess/WebUIClient.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2013-12-10 Anders Carlsson <ander...@apple.com>
+
UserData should handle geometry types
https://bugs.webkit.org/show_bug.cgi?id=125542
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (160390 => 160391)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-12-10 23:00:40 UTC (rev 160391)
@@ -29,10 +29,10 @@
#if WK_API_ENABLED
#import "APIArray.h"
+#import "APINumber.h"
#import "MutableDictionary.h"
#import "WKRemoteObjectInterfaceInternal.h"
#import "WebData.h"
-#import "WebNumber.h"
#import "WebString.h"
#import <objc/runtime.h>
#import <wtf/RetainPtr.h>
Modified: trunk/Source/WebKit2/Shared/API/c/WKNumber.cpp (160390 => 160391)
--- trunk/Source/WebKit2/Shared/API/c/WKNumber.cpp 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/API/c/WKNumber.cpp 2013-12-10 23:00:40 UTC (rev 160391)
@@ -26,8 +26,8 @@
#include "config.h"
#include "WKNumber.h"
+#include "APINumber.h"
#include "WKAPICast.h"
-#include "WebNumber.h"
using namespace WebKit;
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160390 => 160391)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-10 23:00:40 UTC (rev 160391)
@@ -26,6 +26,7 @@
#ifndef WKSharedAPICast_h
#define WKSharedAPICast_h
+#include "APINumber.h"
#include "ImageOptions.h"
#include "SameDocumentNavigationType.h"
#include "WKBase.h"
@@ -42,7 +43,6 @@
#include "WebError.h"
#include "WebEvent.h"
#include "WebFindOptions.h"
-#include "WebNumber.h"
#include "WebSecurityOrigin.h"
#include "WebString.h"
#include "WebURL.h"
Copied: trunk/Source/WebKit2/Shared/APINumber.h (from rev 160390, trunk/Source/WebKit2/Shared/WebNumber.h) (0 => 160391)
--- trunk/Source/WebKit2/Shared/APINumber.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APINumber.h 2013-12-10 23:00:40 UTC (rev 160391)
@@ -0,0 +1,59 @@
+/*
+ * 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 APINumber_h
+#define APINumber_h
+
+#include "APIObject.h"
+#include <wtf/PassRefPtr.h>
+
+namespace WebKit {
+
+template<typename NumberType, API::Object::Type APIObjectType>
+class WebNumber : public API::ObjectImpl<APIObjectType> {
+public:
+ static PassRefPtr<WebNumber> create(NumberType value)
+ {
+ return adoptRef(new WebNumber(value));
+ }
+
+ NumberType value() const { return m_value; }
+
+private:
+ explicit WebNumber(NumberType value)
+ : m_value(value)
+ {
+ }
+
+ const NumberType m_value;
+};
+
+typedef WebNumber<bool, API::Object::Type::Boolean> WebBoolean;
+typedef WebNumber<double, API::Object::Type::Double> WebDouble;
+typedef WebNumber<uint64_t, API::Object::Type::UInt64> WebUInt64;
+
+} // namespace WebKit
+
+#endif // APINumber_h
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (160390 => 160391)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-10 23:00:40 UTC (rev 160391)
@@ -28,10 +28,10 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
+#include "APINumber.h"
#include "PluginInfoStore.h"
#include "PluginModuleInfo.h"
#include "WKAPICast.h"
-#include "WebNumber.h"
#include "WebString.h"
#include "WebURL.h"
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm (160390 => 160391)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/PluginInformationMac.mm 2013-12-10 23:00:40 UTC (rev 160391)
@@ -28,10 +28,10 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
+#import "APINumber.h"
#import "PluginModuleInfo.h"
#import "PluginSandboxProfile.h"
#import "StringUtilities.h"
-#import "WebNumber.h"
#import "WebString.h"
#import <WebKitSystemInterface.h>
Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160390 => 160391)
--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 23:00:40 UTC (rev 160391)
@@ -29,10 +29,10 @@
#include "APIArray.h"
#include "APIFrameHandle.h"
#include "APIGeometry.h"
+#include "APINumber.h"
#include "ArgumentCoders.h"
#include "ArgumentEncoder.h"
#include "MutableDictionary.h"
-#include "WebNumber.h"
#include "WebSerializedScriptValue.h"
#include "WebString.h"
#include "WebURL.h"
Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160390 => 160391)
--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-10 23:00:40 UTC (rev 160391)
@@ -28,6 +28,7 @@
#include "APIArray.h"
#include "APIGeometry.h"
+#include "APINumber.h"
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include "DataReference.h"
@@ -38,7 +39,6 @@
#include "WebData.h"
#include "WebError.h"
#include "WebImage.h"
-#include "WebNumber.h"
#include "WebRenderLayer.h"
#include "WebRenderObject.h"
#include "WebSerializedScriptValue.h"
Deleted: trunk/Source/WebKit2/Shared/WebNumber.h (160390 => 160391)
--- trunk/Source/WebKit2/Shared/WebNumber.h 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/Shared/WebNumber.h 2013-12-10 23:00:40 UTC (rev 160391)
@@ -1,59 +0,0 @@
-/*
- * 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, API::Object::Type APIObjectType>
-class WebNumber : public API::ObjectImpl<APIObjectType> {
-public:
- static PassRefPtr<WebNumber> create(NumberType value)
- {
- return adoptRef(new WebNumber(value));
- }
-
- NumberType value() const { return m_value; }
-
-private:
- explicit WebNumber(NumberType value)
- : m_value(value)
- {
- }
-
- const NumberType m_value;
-};
-
-typedef WebNumber<bool, API::Object::Type::Boolean> WebBoolean;
-typedef WebNumber<double, API::Object::Type::Double> WebDouble;
-typedef WebNumber<uint64_t, API::Object::Type::UInt64> WebUInt64;
-
-} // namespace WebKit
-
-#endif // WebNumber_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (160390 => 160391)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-12-10 23:00:40 UTC (rev 160391)
@@ -27,6 +27,7 @@
#import "WKContextPrivateMac.h"
#import "APIArray.h"
+#import "APINumber.h"
#import "ImmutableDictionary.h"
#import "PluginInfoStore.h"
#import "PluginInformation.h"
@@ -37,7 +38,6 @@
#import "WKSharedAPICast.h"
#import "WKStringCF.h"
#import "WebContext.h"
-#import "WebNumber.h"
#import "WebString.h"
#import <WebKitSystemInterface.h>
#import <wtf/RetainPtr.h>
Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp (160390 => 160391)
--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp 2013-12-10 23:00:40 UTC (rev 160391)
@@ -27,11 +27,11 @@
#include "WebNotificationProvider.h"
#include "APIArray.h"
+#include "APINumber.h"
#include "ImmutableDictionary.h"
#include "WKAPICast.h"
#include "WebNotification.h"
#include "WebNotificationManagerProxy.h"
-#include "WebNumber.h"
#include "WebSecurityOrigin.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (160390 => 160391)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-10 23:00:40 UTC (rev 160391)
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebUIClient.h"
+#include "APINumber.h"
#include "ImmutableDictionary.h"
#include "NativeWebKeyboardEvent.h"
#include "NativeWebWheelEvent.h"
@@ -33,7 +34,6 @@
#include "PluginInformation.h"
#include "WKAPICast.h"
#include "WebColorPickerResultListenerProxy.h"
-#include "WebNumber.h"
#include "WebOpenPanelResultListenerProxy.h"
#include "WebPageProxy.h"
#include <WebCore/FloatRect.h>
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160390 => 160391)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-10 22:43:06 UTC (rev 160390)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-10 23:00:40 UTC (rev 160391)
@@ -888,7 +888,7 @@
BC3066BF125A442100E71278 /* WebProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3066BD125A442100E71278 /* WebProcessMessages.h */; };
BC306824125A6B9400E71278 /* WebProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = BC306822125A6B9400E71278 /* WebProcessCreationParameters.h */; };
BC306825125A6B9400E71278 /* WebProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC306823125A6B9400E71278 /* WebProcessCreationParameters.cpp */; };
- BC33DD681238464600360F3F /* WebNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33DD671238464600360F3F /* WebNumber.h */; };
+ BC33DD681238464600360F3F /* APINumber.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33DD671238464600360F3F /* APINumber.h */; };
BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33E0CF12408E8600360F3F /* InjectedBundleRangeHandle.h */; };
BC33E0D212408E8600360F3F /* InjectedBundleRangeHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC33E0D012408E8600360F3F /* InjectedBundleRangeHandle.cpp */; };
BC39C4351626366F008BC689 /* WKDOMRange.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC39C4331626366F008BC689 /* WKDOMRange.mm */; };
@@ -2487,7 +2487,7 @@
BC329DA616ACE5A900316DE2 /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; };
BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveResource.cpp; sourceTree = "<group>"; };
BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveResource.h; sourceTree = "<group>"; };
- BC33DD671238464600360F3F /* WebNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNumber.h; sourceTree = "<group>"; };
+ BC33DD671238464600360F3F /* APINumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINumber.h; sourceTree = "<group>"; };
BC33E0CF12408E8600360F3F /* InjectedBundleRangeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleRangeHandle.h; sourceTree = "<group>"; };
BC33E0D012408E8600360F3F /* InjectedBundleRangeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleRangeHandle.cpp; sourceTree = "<group>"; };
BC39C4331626366F008BC689 /* WKDOMRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMRange.mm; sourceTree = "<group>"; };
@@ -3431,6 +3431,7 @@
1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */,
1AC133731857C21E00F3EC05 /* APIGeometry.cpp */,
0F174AA2142A4CB60039250F /* APIGeometry.h */,
+ BC33DD671238464600360F3F /* APINumber.h */,
B63403F814910D57001070B5 /* APIObject.cpp */,
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
@@ -3539,7 +3540,6 @@
905620E912BC248B000799B6 /* WebMemorySampler.h */,
C0337DAF127A28D0008FF4F4 /* WebMouseEvent.cpp */,
BCF69F981176CED600471A52 /* WebNavigationDataStore.h */,
- BC33DD671238464600360F3F /* WebNumber.h */,
BC857FB412B830E600EDEB2E /* WebOpenPanelParameters.cpp */,
BC857FB312B830E600EDEB2E /* WebOpenPanelParameters.h */,
C06C6093124C14430001682F /* WebPageCreationParameters.cpp */,
@@ -5986,7 +5986,7 @@
31BA924E148831260062EDB5 /* WebNotificationManagerMessages.h in Headers */,
31A2EC4B148997C200810D71 /* WebNotificationManagerProxy.h in Headers */,
31A2EC4E148997C200810D71 /* WebNotificationProvider.h in Headers */,
- BC33DD681238464600360F3F /* WebNumber.h in Headers */,
+ BC33DD681238464600360F3F /* APINumber.h in Headers */,
BC857FB512B830E600EDEB2E /* WebOpenPanelParameters.h in Headers */,
BC857F8512B82D0B00EDEB2E /* WebOpenPanelResultListener.h in Headers */,
BC1DFEA412B31F87005DF730 /* WebOpenPanelResultListenerProxy.h in Headers */,
