Changeset 158489 in webkit


Ignore:
Timestamp:
Nov 2, 2013, 9:42:47 AM (12 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Add WKNSDictionary
​https://bugs.webkit.org/show_bug.cgi?id=123660

Reviewed by Anders Carlsson.

  • Shared/Cocoa/APIObject.mm:

(WebKit::APIObject::newObject): Allocate a WKNSDictionary if the APIObject is a dictionary.

  • Shared/Cocoa/WKNSDictionary.h: Added.

(WebKit::wrapper): Added. Returns an ImmutableDictionary’s wrapper as an NSDictionary.

  • Shared/Cocoa/WKNSDictionary.mm: Added.

(-[WKNSDictionary dealloc]): Calls the ImmutableDictionary destructor.
(-[WKNSDictionary count]): Added.
(-[WKNSDictionary objectForKey:]): Added.
(-[WKNSDictionary keyEnumerator]): Added.
(-[WKNSDictionary copyWithZone:]): Retains self.
(-[WKNSDictionary _apiObject]): Returns the wrapped ImmutableDictionary.

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

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/Source/WebKit2/ChangeLog

    r158488 r158489  
     12013-11-02  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Add WKNSDictionary
     4        https://bugs.webkit.org/show_bug.cgi?id=123660
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/Cocoa/APIObject.mm:
     9        (WebKit::APIObject::newObject): Allocate a WKNSDictionary if the APIObject is a dictionary.
     10        * Shared/Cocoa/WKNSDictionary.h: Added.
     11        (WebKit::wrapper):  Added. Returns an ImmutableDictionary’s wrapper as an NSDictionary.
     12        * Shared/Cocoa/WKNSDictionary.mm: Added.
     13        (-[WKNSDictionary dealloc]): Calls the ImmutableDictionary destructor.
     14        (-[WKNSDictionary count]): Added.
     15        (-[WKNSDictionary objectForKey:]): Added.
     16        (-[WKNSDictionary keyEnumerator]): Added.
     17        (-[WKNSDictionary copyWithZone:]): Retains self.
     18        (-[WKNSDictionary _apiObject]): Returns the wrapped ImmutableDictionary.
     19        * WebKit2.xcodeproj/project.pbxproj: Added references to new files.
     20
    1212013-11-02  Tim Horton  <timothy_horton@apple.com>
    222

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

    r158325 r158489  
    3232#import "WKBackForwardListItemInternal.h"
    3333#import "WKNSArray.h"
     34#import "WKNSDictionary.h"
    3435#import "WKNSString.h"
    3536#import "WKNSURL.h"
    … …  
    6869        break;
    6970
     71    case TypeDictionary:
     72        wrapper = [WKNSDictionary alloc];
     73        break;
     74
    7075    case TypeString:
    7176        wrapper = NSAllocateObject([WKNSString class], size, nullptr);

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

    r158463 r158489  
    399399                33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 33D3A3C71339617900709BE4 /* WebMediaCacheManagerProxyMessages.h */; };
    400400                33F9D5B91312F1EE000D683F /* WebResourceCacheManagerCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33F9D5B81312F1EE000D683F /* WebResourceCacheManagerCFNet.cpp */; };
     401                371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371A193F1824D29300F32A5E /* WKNSDictionary.mm */; };
     402                371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 371A19401824D29300F32A5E /* WKNSDictionary.h */; };
    401403                374436881820E7240049579F /* WKObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374436871820E7240049579F /* WKObject.mm */; };
    402404                3760881E150413E900FC82C7 /* WebRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3760881C150413E900FC82C7 /* WebRenderObject.cpp */; };
    … …  
    18921894                33F9D5B81312F1EE000D683F /* WebResourceCacheManagerCFNet.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = WebResourceCacheManagerCFNet.cpp; path = ResourceCache/cf/WebResourceCacheManagerCFNet.cpp; sourceTree = "<group>"; };
    18931895                3574B37F1665932C00859BB7 /* PDFAnnotationTextWidgetDetails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PDFAnnotationTextWidgetDetails.h; path = PDF/PDFAnnotationTextWidgetDetails.h; sourceTree = "<group>"; };
     1896                371A193F1824D29300F32A5E /* WKNSDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSDictionary.mm; sourceTree = "<group>"; };
     1897                371A19401824D29300F32A5E /* WKNSDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSDictionary.h; sourceTree = "<group>"; };
    18941898                374436871820E7240049579F /* WKObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObject.mm; sourceTree = "<group>"; };
    18951899                3760881C150413E900FC82C7 /* WebRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderObject.cpp; sourceTree = "<group>"; };
    … …  
    36883692                                37C4C0921814B3AF003688B9 /* WKNSArray.h */,
    36893693                                37C4C0911814B3AF003688B9 /* WKNSArray.mm */,
     3694                                371A19401824D29300F32A5E /* WKNSDictionary.h */,
     3695                                371A193F1824D29300F32A5E /* WKNSDictionary.mm */,
    36903696                                378E1A4818208CD60031007A /* WKNSString.h */,
    36913697                                378E1A4718208CD60031007A /* WKNSString.mm */,
    … …  
    57595765                                33D3A3C91339617900709BE4 /* WebMediaCacheManagerMessages.h in Headers */,
    57605766                                37C4C08D1814AC5C003688B9 /* WKBackForwardList.h in Headers */,
     5767                                371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */,
    57615768                                33D3A3BB1339606200709BE4 /* WebMediaCacheManagerProxy.h in Headers */,
    57625769                                33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */,
    … …  
    69176924                                755422C418062BF90046F6A8 /* WebOriginDataManagerProxy.cpp in Sources */,
    69186925                                1A8EFA701252B84100F7067F /* PluginProxyMessageReceiver.cpp in Sources */,
     6926                                371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */,
    69196927                                7CD622771739D863005BD7FF /* PluginSandboxProfile.mm in Sources */,
    69206928                                BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.