From 5520f1ee057a9b6f71f26a8b0c56dddc10a47496 Mon Sep 17 00:00:00 2001 From: "simon.fraser@apple.com" Date: Thu, 22 Sep 2011 22:49:55 +0000 Subject: [PATCH] Add APIObjects for Size, Point, Rect https://bugs.webkit.org/show_bug.cgi?id=68644 Reviewed by Sam Weinig. Make APIObjects for size, point and rect so that they can be used in WKArrayRefs. Make some inline helper methods to create WKSize, WKPoint and WKRect types. * GNUmakefile.am: * Shared/API/c/WKBase.h: * Shared/API/c/WKGeometry.cpp: Copied from Source/WebKit2/Shared/API/c/WKGeometry.h. (WKSizeGetTypeID): (WKPointGetTypeID): (WKRectGetTypeID): (WKPointCreate): (WKSizeCreate): (WKRectCreate): (WKSizeGetValue): (WKPointGetValue): (WKRectGetValue): * Shared/API/c/WKGeometry.h: (WKPoint::WKPointMake): (WKPoint::WKSizeMake): (WKPoint::WKRectMake): * Shared/API/c/WKSharedAPICast.h: * Shared/APIObject.h: * Shared/UserMessageCoders.h: (WebKit::UserMessageEncoder::baseEncode): (WebKit::UserMessageDecoder::baseDecode): * Shared/WebGeometry.h: Added. (WebKit::WebSize::create): (WebKit::WebSize::size): (WebKit::WebSize::WebSize): (WebKit::WebSize::type): (WebKit::WebPoint::create): (WebKit::WebPoint::point): (WebKit::WebPoint::WebPoint): (WebKit::WebPoint::type): (WebKit::WebRect::create): (WebKit::WebRect::rect): (WebKit::WebRect::WebRect): (WebKit::WebRect::type): * WebKit2.pro: * WebKit2.xcodeproj/project.pbxproj: * WebKit2API.pri: * win/WebKit2.vcproj: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95759 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 52 +++++++++++ Source/WebKit2/GNUmakefile.am | 2 + Source/WebKit2/Shared/API/c/WKBase.h | 15 ++++ Source/WebKit2/Shared/API/c/WKGeometry.cpp | 81 +++++++++++++++++ Source/WebKit2/Shared/API/c/WKGeometry.h | 39 +++++++++ Source/WebKit2/Shared/API/c/WKSharedAPICast.h | 6 ++ Source/WebKit2/Shared/APIObject.h | 5 ++ Source/WebKit2/Shared/UserMessageCoders.h | 63 +++++++++++++- Source/WebKit2/Shared/WebGeometry.h | 106 +++++++++++++++++++++++ Source/WebKit2/WebKit2.pro | 1 + Source/WebKit2/WebKit2.xcodeproj/project.pbxproj | 8 ++ Source/WebKit2/WebKit2API.pri | 1 + Source/WebKit2/win/WebKit2.vcproj | 8 ++ 13 files changed, 384 insertions(+), 3 deletions(-) create mode 100644 Source/WebKit2/Shared/API/c/WKGeometry.cpp create mode 100644 Source/WebKit2/Shared/WebGeometry.h diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 0daf20b..db43354 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,55 @@ +2011-09-22 Simon Fraser + + Add APIObjects for Size, Point, Rect + https://bugs.webkit.org/show_bug.cgi?id=68644 + + Reviewed by Sam Weinig. + + Make APIObjects for size, point and rect so that they can be + used in WKArrayRefs. + + Make some inline helper methods to create WKSize, WKPoint and WKRect + types. + + * GNUmakefile.am: + * Shared/API/c/WKBase.h: + * Shared/API/c/WKGeometry.cpp: Copied from Source/WebKit2/Shared/API/c/WKGeometry.h. + (WKSizeGetTypeID): + (WKPointGetTypeID): + (WKRectGetTypeID): + (WKPointCreate): + (WKSizeCreate): + (WKRectCreate): + (WKSizeGetValue): + (WKPointGetValue): + (WKRectGetValue): + * Shared/API/c/WKGeometry.h: + (WKPoint::WKPointMake): + (WKPoint::WKSizeMake): + (WKPoint::WKRectMake): + * Shared/API/c/WKSharedAPICast.h: + * Shared/APIObject.h: + * Shared/UserMessageCoders.h: + (WebKit::UserMessageEncoder::baseEncode): + (WebKit::UserMessageDecoder::baseDecode): + * Shared/WebGeometry.h: Added. + (WebKit::WebSize::create): + (WebKit::WebSize::size): + (WebKit::WebSize::WebSize): + (WebKit::WebSize::type): + (WebKit::WebPoint::create): + (WebKit::WebPoint::point): + (WebKit::WebPoint::WebPoint): + (WebKit::WebPoint::type): + (WebKit::WebRect::create): + (WebKit::WebRect::rect): + (WebKit::WebRect::WebRect): + (WebKit::WebRect::type): + * WebKit2.pro: + * WebKit2.xcodeproj/project.pbxproj: + * WebKit2API.pri: + * win/WebKit2.vcproj: + 2011-09-22 Alexey Proskuryakov [WK2] UIProcess should check that WebProcess isn't sending unexpected file: URLs to it diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am index e9f7e2e..02591b0 100644 --- a/Source/WebKit2/GNUmakefile.am +++ b/Source/WebKit2/GNUmakefile.am @@ -220,6 +220,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOU Source/WebKit2/Shared/API/c/WKEvent.h \ Source/WebKit2/Shared/API/c/WKFindOptions.h \ Source/WebKit2/Shared/API/c/WKGeometry.h \ + Source/WebKit2/Shared/API/c/WKGeometry.cpp \ Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp \ Source/WebKit2/Shared/API/c/WKGraphicsContext.h \ Source/WebKit2/Shared/API/c/WKImage.cpp \ @@ -344,6 +345,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOU Source/WebKit2/Shared/WebFindOptions.h \ Source/WebKit2/Shared/WebGeolocationPosition.cpp \ Source/WebKit2/Shared/WebGeolocationPosition.h \ + Source/WebKit2/Shared/WebGeometry.h \ Source/WebKit2/Shared/WebGraphicsContext.cpp \ Source/WebKit2/Shared/WebGraphicsContext.h \ Source/WebKit2/Shared/WebHitTestResult.cpp \ diff --git a/Source/WebKit2/Shared/API/c/WKBase.h b/Source/WebKit2/Shared/API/c/WKBase.h index e89504e..e8084de 100644 --- a/Source/WebKit2/Shared/API/c/WKBase.h +++ b/Source/WebKit2/Shared/API/c/WKBase.h @@ -60,6 +60,9 @@ typedef const struct OpaqueWKSecurityOrigin* WKSecurityOriginRef; typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef; typedef const struct OpaqueWKString* WKStringRef; typedef const struct OpaqueWKUInt64* WKUInt64Ref; +typedef const struct OpaqueWKSizeRef* WKSizeRef; +typedef const struct OpaqueWKPointRef* WKPointRef; +typedef const struct OpaqueWKRectRef* WKRectRef; typedef const struct OpaqueWKURL* WKURLRef; typedef const struct OpaqueWKURLRequest* WKURLRequestRef; typedef const struct OpaqueWKURLResponse* WKURLResponseRef; @@ -130,4 +133,16 @@ typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef; #define WK_EXPORT #endif /* defined(WK_NO_EXPORT) */ +#if !defined(WK_INLINE) +#if defined(__cplusplus) +#define WK_INLINE static inline +#elif defined(__GNUC__) +#define WK_INLINE static __inline__ +#elif defined(__WIN32__) +#define WK_INLINE static __inline +#else +#define WK_INLINE static +#endif +#endif /* !defined(WK_INLINE) */ + #endif /* WKBase_h */ diff --git a/Source/WebKit2/Shared/API/c/WKGeometry.cpp b/Source/WebKit2/Shared/API/c/WKGeometry.cpp new file mode 100644 index 0000000..d7d56d5 --- /dev/null +++ b/Source/WebKit2/Shared/API/c/WKGeometry.cpp @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2011 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 "config.h" +#include "WKGeometry.h" + +#include "WKAPICast.h" +#include "WebGeometry.h" + +using namespace WebKit; + +WKTypeID WKSizeGetTypeID() +{ + return toAPI(WebSize::APIType); +} + +WKTypeID WKPointGetTypeID() +{ + return toAPI(WebPoint::APIType); +} + +WKTypeID WKRectGetTypeID() +{ + return toAPI(WebRect::APIType); +} + +WKPointRef WKPointCreate(WKPoint point) +{ + RefPtr webPoint = WebPoint::create(point); + return toAPI(webPoint.release().releaseRef()); +} + +WKSizeRef WKSizeCreate(WKSize size) +{ + RefPtr webSize = WebSize::create(size); + return toAPI(webSize.release().releaseRef()); +} + +WKRectRef WKRectCreate(WKRect rect) +{ + RefPtr webRect = WebRect::create(rect); + return toAPI(webRect.release().releaseRef()); +} + +WKSize WKSizeGetValue(WKSizeRef size) +{ + return toImpl(size)->size(); +} + +WKPoint WKPointGetValue(WKPointRef point) +{ + return toImpl(point)->point(); +} + +WKRect WKRectGetValue(WKRectRef rect) +{ + return toImpl(rect)->rect(); +} + diff --git a/Source/WebKit2/Shared/API/c/WKGeometry.h b/Source/WebKit2/Shared/API/c/WKGeometry.h index 70ef969..684a17b 100644 --- a/Source/WebKit2/Shared/API/c/WKGeometry.h +++ b/Source/WebKit2/Shared/API/c/WKGeometry.h @@ -38,18 +38,57 @@ struct WKPoint { }; typedef struct WKPoint WKPoint; +WK_INLINE WKPoint WKPointMake(double x, double y) +{ + WKPoint point; + point.x = x; + point.y = y; + return point; +} + struct WKSize { double width; double height; }; typedef struct WKSize WKSize; +WK_INLINE WKSize WKSizeMake(double width, double height) +{ + WKSize size; + size.width = width; + size.height = height; + return size; +} + struct WKRect { WKPoint origin; WKSize size; }; typedef struct WKRect WKRect; +WK_INLINE WKRect WKRectMake(double x, double y, double width, double height) +{ + WKRect rect; + rect.origin.x = x; + rect.origin.y = y; + rect.size.width = width; + rect.size.height = height; + return rect; +} + +WK_EXPORT WKTypeID WKSizeGetTypeID(); +WK_EXPORT WKTypeID WKPointGetTypeID(); +WK_EXPORT WKTypeID WKRectGetTypeID(); + +WK_EXPORT WKPointRef WKPointCreate(WKPoint point); +WK_EXPORT WKSizeRef WKSizeCreate(WKSize size); +WK_EXPORT WKRectRef WKRectCreate(WKRect rect); + +WK_EXPORT WKSize WKSizeGetValue(WKSizeRef size); +WK_EXPORT WKPoint WKPointGetValue(WKPointRef point); +WK_EXPORT WKRect WKRectGetValue(WKRectRef rect); + + #ifdef __cplusplus } #endif diff --git a/Source/WebKit2/Shared/API/c/WKSharedAPICast.h b/Source/WebKit2/Shared/API/c/WKSharedAPICast.h index ac3b420..fe79805 100644 --- a/Source/WebKit2/Shared/API/c/WKSharedAPICast.h +++ b/Source/WebKit2/Shared/API/c/WKSharedAPICast.h @@ -60,6 +60,9 @@ class WebContextMenuItem; class WebData; class WebGraphicsContext; class WebImage; +class WebPoint; +class WebRect; +class WebSize; class WebSecurityOrigin; class WebSerializedScriptValue; class WebURLRequest; @@ -85,8 +88,11 @@ WK_ADD_API_MAPPING(WKGraphicsContextRef, WebGraphicsContext) WK_ADD_API_MAPPING(WKImageRef, WebImage) WK_ADD_API_MAPPING(WKMutableArrayRef, MutableArray) WK_ADD_API_MAPPING(WKMutableDictionaryRef, MutableDictionary) +WK_ADD_API_MAPPING(WKPointRef, WebPoint) +WK_ADD_API_MAPPING(WKRectRef, WebRect) WK_ADD_API_MAPPING(WKSecurityOriginRef, WebSecurityOrigin) WK_ADD_API_MAPPING(WKSerializedScriptValueRef, WebSerializedScriptValue) +WK_ADD_API_MAPPING(WKSizeRef, WebSize) WK_ADD_API_MAPPING(WKStringRef, WebString) WK_ADD_API_MAPPING(WKTypeRef, APIObject) WK_ADD_API_MAPPING(WKUInt64Ref, WebUInt64) diff --git a/Source/WebKit2/Shared/APIObject.h b/Source/WebKit2/Shared/APIObject.h index 7916bf4..f043074 100644 --- a/Source/WebKit2/Shared/APIObject.h +++ b/Source/WebKit2/Shared/APIObject.h @@ -60,6 +60,11 @@ public: TypeDouble, TypeUInt64, + // Geometry types + TypePoint, + TypeSize, + TypeRect, + // UIProcess types TypeApplicationCacheManager, TypeBackForwardList, diff --git a/Source/WebKit2/Shared/UserMessageCoders.h b/Source/WebKit2/Shared/UserMessageCoders.h index 70bc32a..e745c39 100644 --- a/Source/WebKit2/Shared/UserMessageCoders.h +++ b/Source/WebKit2/Shared/UserMessageCoders.h @@ -35,6 +35,7 @@ #include "WebCertificateInfo.h" #include "WebCoreArgumentCoders.h" #include "WebData.h" +#include "WebGeometry.h" #include "WebImage.h" #include "WebNumber.h" #include "WebSerializedScriptValue.h" @@ -101,6 +102,11 @@ public: encoder->encodeVariableLengthByteArray(scriptValue->dataReference()); return true; } + case APIObject::TypeBoolean: { + WebBoolean* booleanObject = static_cast(m_root); + encoder->encode(booleanObject->value()); + return true; + } case APIObject::TypeDouble: { WebDouble* doubleObject = static_cast(m_root); encoder->encode(doubleObject->value()); @@ -111,9 +117,24 @@ public: encoder->encode(uint64Object->value()); return true; } - case APIObject::TypeBoolean: { - WebBoolean* booleanObject = static_cast(m_root); - encoder->encode(booleanObject->value()); + case APIObject::TypePoint: { + WebPoint* pointObject = static_cast(m_root); + encoder->encode(pointObject->point().x); + encoder->encode(pointObject->point().y); + return true; + } + case APIObject::TypeSize: { + WebSize* sizeObject = static_cast(m_root); + encoder->encode(sizeObject->size().width); + encoder->encode(sizeObject->size().height); + return true; + } + case APIObject::TypeRect: { + WebRect* rectObject = static_cast(m_root); + encoder->encode(rectObject->rect().origin.x); + encoder->encode(rectObject->rect().origin.y); + encoder->encode(rectObject->rect().size.width); + encoder->encode(rectObject->rect().size.height); return true; } case APIObject::TypeURL: { @@ -273,6 +294,42 @@ public: coder.m_root = WebBoolean::create(value); break; } + case APIObject::TypeSize: { + double width; + double height; + if (!decoder->decode(width)) + return false; + if (!decoder->decode(height)) + return false; + coder.m_root = WebSize::create(WKSizeMake(width, height)); + break; + } + case APIObject::TypePoint: { + double x; + double y; + if (!decoder->decode(x)) + return false; + if (!decoder->decode(y)) + return false; + coder.m_root = WebPoint::create(WKPointMake(x, y)); + break; + } + case APIObject::TypeRect: { + double x; + double y; + double width; + double height; + if (!decoder->decode(x)) + return false; + if (!decoder->decode(y)) + return false; + if (!decoder->decode(width)) + return false; + if (!decoder->decode(height)) + return false; + coder.m_root = WebRect::create(WKRectMake(x, y, width, height)); + break; + } case APIObject::TypeURL: { String string; if (!decoder->decode(string)) diff --git a/Source/WebKit2/Shared/WebGeometry.h b/Source/WebKit2/Shared/WebGeometry.h new file mode 100644 index 0000000..bdea9c7 --- /dev/null +++ b/Source/WebKit2/Shared/WebGeometry.h @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2011 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 WebGeometry_h +#define WebGeometry_h + +#include "APIObject.h" +#include "WKGeometry.h" +#include +#include + +namespace CoreIPC { + class ArgumentDecoder; + class ArgumentEncoder; +} + +namespace WebKit { + +class WebSize : public APIObject { +public: + static const Type APIType = TypeSize; + + static PassRefPtr create(const WKSize& size) + { + return adoptRef(new WebSize(size)); + } + + const WKSize& size() const { return m_size; } + +private: + explicit WebSize(const WKSize& size) + : m_size(size) + { } + + virtual Type type() const { return APIType; } + + WKSize m_size; +}; + +class WebPoint : public APIObject { +public: + static const Type APIType = TypePoint; + + static PassRefPtr create(const WKPoint& point) + { + return adoptRef(new WebPoint(point)); + } + + const WKPoint& point() const { return m_point; } + +private: + explicit WebPoint(const WKPoint& point) + : m_point(point) + { } + + virtual Type type() const { return APIType; } + + WKPoint m_point; +}; + +class WebRect : public APIObject { +public: + static const Type APIType = TypeRect; + + static PassRefPtr create(const WKRect& rect) + { + return adoptRef(new WebRect(rect)); + } + + const WKRect& rect() const { return m_rect; } + +private: + explicit WebRect(const WKRect& rect) + : m_rect(rect) + { } + + virtual Type type() const { return APIType; } + + WKRect m_rect; +}; + +} // namespace WebKit + +#endif // WebGeometry_h diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro index ff2fb6d..2775e8a 100644 --- a/Source/WebKit2/WebKit2.pro +++ b/Source/WebKit2/WebKit2.pro @@ -158,6 +158,7 @@ HEADERS += \ Shared/WebEventConversion.h \ Shared/WebFindOptions.h \ Shared/WebGeolocationPosition.h \ + Shared/WebGeometry.h \ Shared/WebGraphicsContext.h \ Shared/WebHitTestResult.h \ Shared/WebImage.h \ diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj index f4f5852..ec5108c 100644 --- a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj +++ b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj @@ -34,6 +34,8 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F174AA2142A4CB60039250F /* WebGeometry.h */; }; + 0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F174AA6142AAC610039250F /* WKGeometry.cpp */; }; 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; }; 1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043974124D034800FFBFB5 /* PluginProcess.h */; }; 1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043975124D034800FFBFB5 /* PluginProcess.cpp */; }; @@ -943,6 +945,8 @@ /* Begin PBXFileReference section */ 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 0F174AA2142A4CB60039250F /* WebGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeometry.h; sourceTree = ""; }; + 0F174AA6142AAC610039250F /* WKGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGeometry.cpp; sourceTree = ""; }; 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = ""; }; 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 1A043974124D034800FFBFB5 /* PluginProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcess.h; sourceTree = ""; }; @@ -2228,6 +2232,7 @@ BC032DB010F4380F0058C15A /* WebEventConversion.cpp */, BC032DB110F4380F0058C15A /* WebEventConversion.h */, 1A90C1ED1264FD50003E44D4 /* WebFindOptions.h */, + 0F174AA2142A4CB60039250F /* WebGeometry.h */, BC0E607212D6BC200012A72A /* WebGeolocationPosition.cpp */, BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */, BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */, @@ -3234,6 +3239,7 @@ BC4075E0124FF0270068F20A /* WKError.h */, BC40783C1250FADD0068F20A /* WKEvent.h */, 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */, + 0F174AA6142AAC610039250F /* WKGeometry.cpp */, BCC8B373125FB69000DE46A4 /* WKGeometry.h */, BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */, BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */, @@ -3855,6 +3861,7 @@ 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */, 1A2BB6D114117B4D000F35D4 /* PluginProcessConnectionMessages.h in Headers */, 7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */, + 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4541,6 +4548,7 @@ 5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */, 1A2BB6D014117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp in Sources */, 7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */, + 0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Source/WebKit2/WebKit2API.pri b/Source/WebKit2/WebKit2API.pri index 221188c..0dc1d39 100644 --- a/Source/WebKit2/WebKit2API.pri +++ b/Source/WebKit2/WebKit2API.pri @@ -7,6 +7,7 @@ WEBKIT2_API_SOURCES = \ $$SOURCE_DIR/WebKit2/Shared/API/c/WKContextMenuItem.cpp \ $$SOURCE_DIR/WebKit2/Shared/API/c/WKDictionary.cpp \ $$SOURCE_DIR/WebKit2/Shared/API/c/WKError.cpp \ + $$SOURCE_DIR/WebKit2/Shared/API/c/WKGeometry.cpp \ $$SOURCE_DIR/WebKit2/Shared/API/c/WKGraphicsContext.cpp \ $$SOURCE_DIR/WebKit2/Shared/API/c/WKImage.cpp \ $$SOURCE_DIR/WebKit2/Shared/API/c/WKMutableDictionary.cpp \ diff --git a/Source/WebKit2/win/WebKit2.vcproj b/Source/WebKit2/win/WebKit2.vcproj index 331ee9f..1f78ab3 100755 --- a/Source/WebKit2/win/WebKit2.vcproj +++ b/Source/WebKit2/win/WebKit2.vcproj @@ -671,6 +671,10 @@ > + + @@ -890,6 +894,10 @@ > + + -- 2.7.4