Changeset 160388 in webkit
- Timestamp:
- Dec 10, 2013 2:11:28 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r160385 r160388 1 2013-12-10 Anders Carlsson <andersca@apple.com> 2 3 UserData should handle geometry types 4 https://bugs.webkit.org/show_bug.cgi?id=125542 5 6 Reviewed by Andreas Kling. 7 8 Rename WebGeometry.h to APIGeometry.h in preparation for moving the classes into the API namespace. 9 Add encode/decode functions to geometry classes. Use them in UserData::encode and UserData::decode. 10 11 * Shared/API/c/WKGeometry.cpp: 12 * Shared/APIGeometry.cpp: Added. 13 * Shared/APIGeometry.h: Renamed from Source/WebKit2/Shared/WebGeometry.h. 14 (WebKit::UserData::encode): 15 (WebKit::UserData::decode): 16 * Shared/UserMessageCoders.h: 17 * WebKit2.xcodeproj/project.pbxproj: 18 * WebProcess/WebPage/WebPage.cpp: 19 1 20 2013-12-10 Beth Dakin <bdakin@apple.com> 2 21 -
trunk/Source/WebKit2/Shared/API/c/WKGeometry.cpp
r99239 r160388 27 27 #include "WKGeometry.h" 28 28 29 #include "APIGeometry.h" 29 30 #include "WKAPICast.h" 30 #include "WebGeometry.h"31 31 32 32 using namespace WebKit; -
trunk/Source/WebKit2/Shared/UserData.cpp
r160381 r160388 29 29 #include "APIArray.h" 30 30 #include "APIFrameHandle.h" 31 #include "APIGeometry.h" 31 32 #include "ArgumentCoders.h" 32 33 #include "ArgumentEncoder.h" … … 138 139 } 139 140 141 case API::Object::Type::Point: { 142 auto& point = static_cast<const WebPoint&>(object); 143 point.encode(encoder); 144 break; 145 } 146 147 case API::Object::Type::Rect: { 148 auto& rect = static_cast<const WebRect&>(object); 149 rect.encode(encoder); 150 break; 151 } 152 140 153 case API::Object::Type::SerializedScriptValue: { 141 154 auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object); 142 155 encoder << serializedScriptValue.dataReference(); 156 break; 157 } 158 159 case API::Object::Type::Size: { 160 auto& size = static_cast<const WebSize&>(object); 161 size.encode(encoder); 143 162 break; 144 163 } … … 236 255 result = nullptr; 237 256 break; 257 258 case API::Object::Type::Point: 259 if (!WebPoint::decode(decoder, result)) 260 return false; 261 break; 262 263 case API::Object::Type::Rect: 264 if (!WebRect::decode(decoder, result)) 265 return false; 266 break; 238 267 239 268 case API::Object::Type::SerializedScriptValue: { … … 247 276 } 248 277 278 case API::Object::Type::Size: 279 if (!WebSize::decode(decoder, result)) 280 return false; 281 break; 282 249 283 case API::Object::Type::String: { 250 284 String string; -
trunk/Source/WebKit2/Shared/UserMessageCoders.h
r159908 r160388 28 28 29 29 #include "APIArray.h" 30 #include "APIGeometry.h" 30 31 #include "ArgumentDecoder.h" 31 32 #include "ArgumentEncoder.h" … … 37 38 #include "WebData.h" 38 39 #include "WebError.h" 39 #include "WebGeometry.h"40 40 #include "WebImage.h" 41 41 #include "WebNumber.h" -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r160341 r160388 48 48 49 49 /* Begin PBXBuildFile section */ 50 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F174AA2142A4CB60039250F /* WebGeometry.h */; };50 0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F174AA2142A4CB60039250F /* APIGeometry.h */; }; 51 51 0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F174AA6142AAC610039250F /* WKGeometry.cpp */; }; 52 52 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; }; … … 270 270 1AC1337118566C7C00F3EC05 /* APIFrameHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */; }; 271 271 1AC1337218566C7C00F3EC05 /* APIFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */; }; 272 1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */; }; 272 273 1AC25FC212A48F6000BD2671 /* PluginProcessShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */; }; 273 274 1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC4C82816B876A90069DCCD /* MessageFlags.h */; }; … … 1551 1552 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 1552 1553 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 1553 0F174AA2142A4CB60039250F /* WebGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeometry.h; sourceTree = "<group>"; };1554 0F174AA2142A4CB60039250F /* APIGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIGeometry.h; sourceTree = "<group>"; }; 1554 1555 0F174AA6142AAC610039250F /* WKGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGeometry.cpp; sourceTree = "<group>"; }; 1555 1556 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; }; … … 1801 1802 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIFrameHandle.cpp; sourceTree = "<group>"; }; 1802 1803 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFrameHandle.h; sourceTree = "<group>"; }; 1804 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIGeometry.cpp; sourceTree = "<group>"; }; 1803 1805 1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessShim.h; sourceTree = "<group>"; }; 1804 1806 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessShim.mm; sourceTree = "<group>"; }; … … 3428 3430 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */, 3429 3431 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */, 3432 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */, 3433 0F174AA2142A4CB60039250F /* APIGeometry.h */, 3430 3434 B63403F814910D57001070B5 /* APIObject.cpp */, 3431 3435 BCF04C8C11FF9B7D00F86A58 /* APIObject.h */, … … 3525 3529 BC0E607212D6BC200012A72A /* WebGeolocationPosition.cpp */, 3526 3530 BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */, 3527 0F174AA2142A4CB60039250F /* WebGeometry.h */,3528 3531 7801C095142290C400FAF9AF /* WebHitTestResult.cpp */, 3529 3532 7801C096142290C400FAF9AF /* WebHitTestResult.h */, … … 5946 5949 BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */, 5947 5950 BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */, 5948 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */,5951 0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */, 5949 5952 BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */, 5950 5953 7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */, … … 7219 7222 BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */, 7220 7223 51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */, 7224 1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */, 7221 7225 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */, 7222 7226 BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */, -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r160385 r160388 71 71 #include "WebFullScreenManagerMessages.h" 72 72 #include "WebGeolocationClient.h" 73 #include "WebGeometry.h"74 73 #include "WebImage.h" 75 74 #include "WebInspector.h"
Note: See TracChangeset
for help on using the changeset viewer.