Changeset 160278 in webkit


Ignore:
Timestamp:
Dec 7, 2013 9:23:29 PM (10 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] WebData has a generic wrapper
​https://bugs.webkit.org/show_bug.cgi?id=125402

Reviewed by Sam Weinig.

Added WKNSData, an NSData subclass that confroms to WKObject and wraps a WebData.

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject): Allocate a WKNSData if the API::Object is data.

  • Shared/Cocoa/WKNSData.h: Added.

(WebKit::wrapper): Added. Returns a WebData’s wrapper as an NSData.

  • Shared/Cocoa/WKNSData.mm: Added.

(-[WKNSData dealloc]): Calls the WebData destructor.
(-[WKNSData length]): Added.
(-[WKNSData bytes]): Added.
(-[WKNSData copyWithZone:]): Retains self.
(-[WKNSData _apiObject]): Returns the wrapped WebData.

  • WebKit2.xcodeproj/project.pbxproj: Added references to new files.
Location:
trunk/Source/WebKit2
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160277 r160278  
     12013-12-07  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] WebData has a generic wrapper
     4        https://bugs.webkit.org/show_bug.cgi?id=125402
     5
     6        Reviewed by Sam Weinig.
     7
     8        Added WKNSData, an NSData subclass that confroms to WKObject and wraps a WebData.
     9
     10        * Shared/Cocoa/APIObject.mm:
     11        (API::Object::newObject): Allocate a WKNSData if the API::Object is data.
     12        * Shared/Cocoa/WKNSData.h: Added.
     13        (WebKit::wrapper): Added. Returns a WebData’s wrapper as an NSData.
     14        * Shared/Cocoa/WKNSData.mm: Added.
     15        (-[WKNSData dealloc]): Calls the WebData destructor.
     16        (-[WKNSData length]): Added.
     17        (-[WKNSData bytes]): Added.
     18        (-[WKNSData copyWithZone:]): Retains self.
     19        (-[WKNSData _apiObject]): Returns the wrapped WebData.
     20        * WebKit2.xcodeproj/project.pbxproj: Added references to new files.
     21
    1222013-12-07  Sam Weinig  <sam@webkit.org>
    223

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

    r160277 r160278  
    3535#import "WKConnectionInternal.h"
    3636#import "WKNSArray.h"
     37#import "WKNSData.h"
    3738#import "WKNSDictionary.h"
    3839#import "WKNSError.h"
    … …  
    9495        break;
    9596
     97    case Type::Data:
     98        wrapper = [WKNSData alloc];
     99        break;
     100
    96101    case Type::Dictionary:
    97102        wrapper = [WKNSDictionary alloc];

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

    r160227 r160278  
    442442                372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 372CAF091833FD910040AC27 /* WKNSError.h */; };
    443443                372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 372CAF0A1833FD910040AC27 /* WKNSError.mm */; };
     444                373CEAD5185417AE008C363D /* WKNSData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373CEAD3185417AE008C363D /* WKNSData.mm */; };
     445                373CEAD6185417AE008C363D /* WKNSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD4185417AE008C363D /* WKNSData.h */; };
    444446                374436881820E7240049579F /* WKObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374436871820E7240049579F /* WKObject.mm */; };
    445447                3760881E150413E900FC82C7 /* WebRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3760881C150413E900FC82C7 /* WebRenderObject.cpp */; };
    … …  
    19901992                372CAF091833FD910040AC27 /* WKNSError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSError.h; sourceTree = "<group>"; };
    19911993                372CAF0A1833FD910040AC27 /* WKNSError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSError.mm; sourceTree = "<group>"; };
     1994                373CEAD3185417AE008C363D /* WKNSData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSData.mm; sourceTree = "<group>"; };
     1995                373CEAD4185417AE008C363D /* WKNSData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSData.h; sourceTree = "<group>"; };
    19921996                374436871820E7240049579F /* WKObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObject.mm; sourceTree = "<group>"; };
    19931997                3760881C150413E900FC82C7 /* WebRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderObject.cpp; sourceTree = "<group>"; };
    … …  
    38303834                                37C4C0921814B3AF003688B9 /* WKNSArray.h */,
    38313835                                37C4C0911814B3AF003688B9 /* WKNSArray.mm */,
     3836                                373CEAD4185417AE008C363D /* WKNSData.h */,
     3837                                373CEAD3185417AE008C363D /* WKNSData.mm */,
    38323838                                371A19401824D29300F32A5E /* WKNSDictionary.h */,
    38333839                                371A193F1824D29300F32A5E /* WKNSDictionary.mm */,
    … …  
    61966202                                BC8F2F2E16273ACC005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h in Headers */,
    61976203                                29501724162A4504004A9D71 /* WKWebProcessPlugInBrowserContextControllerPrivate.h in Headers */,
     6204                                373CEAD6185417AE008C363D /* WKNSData.h in Headers */,
    61986205                                1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */,
    61996206                                BC989D85161A9890000D46D3 /* WKWebProcessPlugInInternal.h in Headers */,
    … …  
    74907497                                C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
    74917498                                C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */,
     7499                                373CEAD5185417AE008C363D /* WKNSData.mm in Sources */,
    74927500                                BC989D81161A7E5D000D46D3 /* WKWebProcessPlugIn.mm in Sources */,
    74937501                                BC8F2F2A16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.