Changeset 204614 in webkit


Ignore:
Timestamp:
Aug 18, 2016, 4:11:05 PM (9 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] API::Number needs to be wrapped by an NSNumber
​https://bugs.webkit.org/show_bug.cgi?id=160977
<rdar://problem/27877735>

Reviewed by Anders Carlsson.

Source/WebKit2:

We introduce a single WKNSNumber class to wrap three distinct API::Number instantiations
corresponding to the Boolean, UInt64 and Double types.

Test: TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject): Create a WKNSNumber to contain any of the number types, and set

its _type ivar accordingly.

  • Shared/Cocoa/WKNSNumber.h: Added.

(WebKit::wrapper):

  • Shared/Cocoa/WKNSNumber.mm: Added.

(-[WKNSNumber dealloc]): Call the appropriate destructor.
(-[WKNSNumber objCType]): Implement this NSValue primitive method.
(-[WKNSNumber getValue:]): Ditto.
(-[WKNSNumber boolValue]): Implement this NSNumber method corresponding to one of our

possible types.

(-[WKNSNumber doubleValue]): Ditto.
(-[WKNSNumber unsignedLongLongValue]): Ditto.
(-[WKNSNumber copyWithZone:]): Implement this NSCopying method by retaining self.
(-[WKNSNumber _apiObject]): Implement this WKObject method by returning the appropriate

API object.

  • WebKit2.xcodeproj/project.pbxproj: Added references to new files.

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm: Added.

(TestWebKitAPI::TEST):

Location:
trunk
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r204606 r204614  
     12016-08-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] API::Number needs to be wrapped by an NSNumber
     4        https://bugs.webkit.org/show_bug.cgi?id=160977
     5        <rdar://problem/27877735>
     6
     7        Reviewed by Anders Carlsson.
     8
     9        We introduce a single WKNSNumber class to wrap three distinct API::Number instantiations
     10        corresponding to the Boolean, UInt64 and Double types.
     11
     12        Test: TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm
     13
     14        * Shared/Cocoa/APIObject.mm:
     15        (API::Object::newObject): Create a WKNSNumber to contain any of the number types, and set
     16          its _type ivar accordingly.
     17        * Shared/Cocoa/WKNSNumber.h: Added.
     18        (WebKit::wrapper):
     19        * Shared/Cocoa/WKNSNumber.mm: Added.
     20        (-[WKNSNumber dealloc]): Call the appropriate destructor.
     21        (-[WKNSNumber objCType]): Implement this NSValue primitive method.
     22        (-[WKNSNumber getValue:]): Ditto.
     23        (-[WKNSNumber boolValue]): Implement this NSNumber method corresponding to one of our
     24          possible types.
     25        (-[WKNSNumber doubleValue]): Ditto.
     26        (-[WKNSNumber unsignedLongLongValue]): Ditto.
     27        (-[WKNSNumber copyWithZone:]): Implement this NSCopying method by retaining self.
     28        (-[WKNSNumber _apiObject]): Implement this WKObject method by returning the appropriate
     29          API object.
     30
     31        * WebKit2.xcodeproj/project.pbxproj: Added references to new files.
     32
    1332016-08-18  Andy Estes  <aestes@apple.com>
    234

  • trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm

    r203338 r204614  
    3939#import "WKNSDictionary.h"
    4040#import "WKNSError.h"
     41#import "WKNSNumber.h"
    4142#import "WKNSString.h"
    4243#import "WKNSURL.h"
    … …  
    117118        break;
    118119
     120    case Type::Boolean:
     121    case Type::Double:
     122    case Type::UInt64:
     123        wrapper = [WKNSNumber alloc];
     124        ((WKNSNumber *)wrapper)->_type = type;
     125        break;
     126
    119127    case Type::Bundle:
    120128        wrapper = [WKWebProcessPlugInController alloc];

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r204565 r204614  
    793793                374436881820E7240049579F /* WKObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374436871820E7240049579F /* WKObject.mm */; };
    794794                3754D5451B3A29FD003A4C7F /* NSInvocationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */; };
     795                375E0E131D66432700EFEC2C /* WKNSNumber.mm in Sources */ = {isa = PBXBuildFile; fileRef = 375E0E111D66432700EFEC2C /* WKNSNumber.mm */; };
     796                375E0E141D66432700EFEC2C /* WKNSNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 375E0E121D66432700EFEC2C /* WKNSNumber.h */; };
    795797                3760881E150413E900FC82C7 /* WebRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3760881C150413E900FC82C7 /* WebRenderObject.cpp */; };
    796798                3760881F150413E900FC82C7 /* WebRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760881D150413E900FC82C7 /* WebRenderObject.h */; };
    … …  
    28372839                374436871820E7240049579F /* WKObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObject.mm; sourceTree = "<group>"; };
    28382840                3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSInvocationSPI.h; sourceTree = "<group>"; };
     2841                375E0E111D66432700EFEC2C /* WKNSNumber.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSNumber.mm; sourceTree = "<group>"; };
     2842                375E0E121D66432700EFEC2C /* WKNSNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSNumber.h; sourceTree = "<group>"; };
    28392843                375FB4731883415600BE34D4 /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
    28402844                3760881C150413E900FC82C7 /* WebRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderObject.cpp; sourceTree = "<group>"; };
    … …  
    53025306                                372CAF091833FD910040AC27 /* WKNSError.h */,
    53035307                                372CAF0A1833FD910040AC27 /* WKNSError.mm */,
     5308                                375E0E121D66432700EFEC2C /* WKNSNumber.h */,
     5309                                375E0E111D66432700EFEC2C /* WKNSNumber.mm */,
    53045310                                378E1A4818208CD60031007A /* WKNSString.h */,
    53055311                                378E1A4718208CD60031007A /* WKNSString.mm */,
    … …  
    78287834                                37B47E2D1D64DB76005F4EFF /* objcSPI.h in Headers */,
    78297835                                1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */,
     7836                                375E0E141D66432700EFEC2C /* WKNSNumber.h in Headers */,
    78307837                                1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */,
    78317838                                1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
    … …  
    91419148                                832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp in Sources */,
    91429149                                83BDCCB91AC5FDB6003F6441 /* NetworkCacheStatistics.cpp in Sources */,
     9150                                375E0E131D66432700EFEC2C /* WKNSNumber.mm in Sources */,
    91439151                                E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */,
    91449152                                8310428C1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp in Sources */,

  • trunk/Tools/ChangeLog

    r204592 r204614  
     12016-08-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] API::Number needs to be wrapped by an NSNumber
     4        https://bugs.webkit.org/show_bug.cgi?id=160977
     5        <rdar://problem/27877735>
     6
     7        Reviewed by Anders Carlsson.
     8
     9        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     10        * TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm: Added.
     11        (TestWebKitAPI::TEST):
     12
    1132016-08-17  Myles C. Maxfield  <mmaxfield@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r204565 r204614  
    6868                33DC89141419579F00747EF7 /* LoadCanceledNoServerRedirectCallback_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33DC89131419579F00747EF7 /* LoadCanceledNoServerRedirectCallback_Bundle.cpp */; };
    6969                33E79E06137B5FD900E32D99 /* mouse-move-listener.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 33E79E05137B5FCE00E32D99 /* mouse-move-listener.html */; };
     70                375E0E171D66674400EFEC2C /* WKNSNumber.mm in Sources */ = {isa = PBXBuildFile; fileRef = 375E0E151D66674400EFEC2C /* WKNSNumber.mm */; };
    7071                378E64771632655E00B6C676 /* InjectedBundleFrameHitTest_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 378E64751632655D00B6C676 /* InjectedBundleFrameHitTest_Bundle.cpp */; };
    7172                378E64791632707400B6C676 /* link-with-title.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 378E647816326FDF00B6C676 /* link-with-title.html */; };
    … …  
    744745                3722C8681461E03E00C45D00 /* RenderedImageFromDOMRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RenderedImageFromDOMRange.mm; sourceTree = "<group>"; };
    745746                3751AF7A169518F800764319 /* DOMNodeFromJSObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMNodeFromJSObject.mm; sourceTree = "<group>"; };
     747                375E0E151D66674400EFEC2C /* WKNSNumber.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSNumber.mm; sourceTree = "<group>"; };
    746748                3776BC62150946BC0043A66D /* DeviceScaleFactorInDashboardRegions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DeviceScaleFactorInDashboardRegions.mm; sourceTree = "<group>"; };
    747749                378E64711632646D00B6C676 /* InjectedBundleFrameHitTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleFrameHitTest.cpp; sourceTree = "<group>"; };
    … …  
    13001302                                51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */,
    13011303                                1F83571A1D3FFB0E00E3967B /* WKBackForwardList.mm */,
     1304                                375E0E151D66674400EFEC2C /* WKNSNumber.mm */,
    13021305                                37B47E2E1D64E7CA005F4EFF /* WKObject.mm */,
    13031306                                2D00065D1C1F58940088E6A7 /* WKPDFViewResizeCrash.mm */,
    … …  
    22122215                                7C83E04F1D0A641800FEBCF3 /* FileSystem.cpp in Sources */,
    22132216                                7CCE7EF31A411AE600447C4C /* Find.cpp in Sources */,
     2217                                375E0E171D66674400EFEC2C /* WKNSNumber.mm in Sources */,
    22142218                                7C83E0BB1D0A650000FEBCF3 /* FindInPage.mm in Sources */,
    22152219                                7CCE7EF41A411AE600447C4C /* FindMatches.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.