Changeset 160388 in webkit


Ignore:
Timestamp:
Dec 10, 2013 2:11:28 PM (10 years ago)
Author:
andersca@apple.com
Message:

UserData should handle geometry types
https://bugs.webkit.org/show_bug.cgi?id=125542

Reviewed by Andreas Kling.

Rename WebGeometry.h to APIGeometry.h in preparation for moving the classes into the API namespace.
Add encode/decode functions to geometry classes. Use them in UserData::encode and UserData::decode.

  • Shared/API/c/WKGeometry.cpp:
  • Shared/APIGeometry.cpp: Added.
  • Shared/APIGeometry.h: Renamed from Source/WebKit2/Shared/WebGeometry.h.

(WebKit::UserData::encode):
(WebKit::UserData::decode):

  • Shared/UserMessageCoders.h:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/WebPage.cpp:
Location:
trunk/Source/WebKit2
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r160385 r160388  
     12013-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
    1202013-12-10  Beth Dakin  <bdakin@apple.com>
    221
  • trunk/Source/WebKit2/Shared/API/c/WKGeometry.cpp

    r99239 r160388  
    2727#include "WKGeometry.h"
    2828
     29#include "APIGeometry.h"
    2930#include "WKAPICast.h"
    30 #include "WebGeometry.h"
    3131
    3232using namespace WebKit;
  • trunk/Source/WebKit2/Shared/UserData.cpp

    r160381 r160388  
    2929#include "APIArray.h"
    3030#include "APIFrameHandle.h"
     31#include "APIGeometry.h"
    3132#include "ArgumentCoders.h"
    3233#include "ArgumentEncoder.h"
     
    138139    }
    139140
     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
    140153    case API::Object::Type::SerializedScriptValue: {
    141154        auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object);
    142155        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);
    143162        break;
    144163    }
     
    236255        result = nullptr;
    237256        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;
    238267
    239268    case API::Object::Type::SerializedScriptValue: {
     
    247276    }
    248277
     278    case API::Object::Type::Size:
     279        if (!WebSize::decode(decoder, result))
     280            return false;
     281        break;
     282
    249283    case API::Object::Type::String: {
    250284        String string;
  • trunk/Source/WebKit2/Shared/UserMessageCoders.h

    r159908 r160388  
    2828
    2929#include "APIArray.h"
     30#include "APIGeometry.h"
    3031#include "ArgumentDecoder.h"
    3132#include "ArgumentEncoder.h"
     
    3738#include "WebData.h"
    3839#include "WebError.h"
    39 #include "WebGeometry.h"
    4040#include "WebImage.h"
    4141#include "WebNumber.h"
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r160341 r160388  
    4848
    4949/* 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 */; };
    5151                0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F174AA6142AAC610039250F /* WKGeometry.cpp */; };
    5252                0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
     
    270270                1AC1337118566C7C00F3EC05 /* APIFrameHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */; };
    271271                1AC1337218566C7C00F3EC05 /* APIFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */; };
     272                1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */; };
    272273                1AC25FC212A48F6000BD2671 /* PluginProcessShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */; };
    273274                1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC4C82816B876A90069DCCD /* MessageFlags.h */; };
     
    15511552                0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
    15521553                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>"; };
    15541555                0F174AA6142AAC610039250F /* WKGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGeometry.cpp; sourceTree = "<group>"; };
    15551556                0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
     
    18011802                1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIFrameHandle.cpp; sourceTree = "<group>"; };
    18021803                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>"; };
    18031805                1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessShim.h; sourceTree = "<group>"; };
    18041806                1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessShim.mm; sourceTree = "<group>"; };
     
    34283430                                1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */,
    34293431                                1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */,
     3432                                1AC133731857C21E00F3EC05 /* APIGeometry.cpp */,
     3433                                0F174AA2142A4CB60039250F /* APIGeometry.h */,
    34303434                                B63403F814910D57001070B5 /* APIObject.cpp */,
    34313435                                BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
     
    35253529                                BC0E607212D6BC200012A72A /* WebGeolocationPosition.cpp */,
    35263530                                BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */,
    3527                                 0F174AA2142A4CB60039250F /* WebGeometry.h */,
    35283531                                7801C095142290C400FAF9AF /* WebHitTestResult.cpp */,
    35293532                                7801C096142290C400FAF9AF /* WebHitTestResult.h */,
     
    59465949                                BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
    59475950                                BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */,
    5948                                 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */,
     5951                                0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */,
    59495952                                BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */,
    59505953                                7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */,
     
    72197222                                BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
    72207223                                51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */,
     7224                                1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */,
    72217225                                518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
    72227226                                BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r160385 r160388  
    7171#include "WebFullScreenManagerMessages.h"
    7272#include "WebGeolocationClient.h"
    73 #include "WebGeometry.h"
    7473#include "WebImage.h"
    7574#include "WebInspector.h"
Note: See TracChangeset for help on using the changeset viewer.