Changeset 65339 in webkit


Ignore:
Timestamp:
Aug 13, 2010 2:33:40 PM (14 years ago)
Author:
weinig@apple.com
Message:

Add dictionary API type
​https://bugs.webkit.org/show_bug.cgi?id=43990

Reviewed by Brady Eidson.

Add an immutable dictionary type (WKStringRef -> WKTypeRef).

  • Shared/APIObject.h:

(WebKit::APIObject::):
Add new APIType.

  • Shared/ImmutableDictionary.cpp: Added.

(WebKit::ImmutableDictionary::ImmutableDictionary):
(WebKit::ImmutableDictionary::~ImmutableDictionary):

  • Shared/ImmutableDictionary.h: Added.

(WebKit::ImmutableDictionary::create):
(WebKit::ImmutableDictionary::adopt):
(WebKit::ImmutableDictionary::get):
(WebKit::ImmutableDictionary::size):
(WebKit::ImmutableDictionary::):
(WebKit::ImmutableDictionary::type):
Add basic implementation

  • UIProcess/API/C/WKAPICast.h:

(WebKit::):
Add new mappings.

  • UIProcess/API/C/WKBase.h:

Add new opaque type.

  • UIProcess/API/C/WKDictionary.cpp: Added.

(WKDictionaryGetTypeID):
(WKDictionaryGetItemForKey):
(WKDictionaryGetSize):
(WKDictionaryRetain):
(WKDictionaryRelease):

  • UIProcess/API/C/WKDictionary.h: Added.

Add API wrappings.

  • UIProcess/API/C/WebKit2.h:

Add missing public headers.

  • WebKit2.xcodeproj/project.pbxproj:
  • win/WebKit2.vcproj:
  • win/WebKit2Generated.make:

Add new files.

Location:
trunk/WebKit2
Files:
4 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r65337 r65339  
     12010-08-13  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Brady Eidson.
     4
     5        Add dictionary API type
     6        https://bugs.webkit.org/show_bug.cgi?id=43990
     7
     8        Add an immutable dictionary type (WKStringRef -> WKTypeRef).
     9
     10        * Shared/APIObject.h:
     11        (WebKit::APIObject::):
     12        Add new APIType.
     13
     14        * Shared/ImmutableDictionary.cpp: Added.
     15        (WebKit::ImmutableDictionary::ImmutableDictionary):
     16        (WebKit::ImmutableDictionary::~ImmutableDictionary):
     17        * Shared/ImmutableDictionary.h: Added.
     18        (WebKit::ImmutableDictionary::create):
     19        (WebKit::ImmutableDictionary::adopt):
     20        (WebKit::ImmutableDictionary::get):
     21        (WebKit::ImmutableDictionary::size):
     22        (WebKit::ImmutableDictionary::):
     23        (WebKit::ImmutableDictionary::type):
     24        Add basic implementation
     25
     26        * UIProcess/API/C/WKAPICast.h:
     27        (WebKit::):
     28        Add new mappings.
     29
     30        * UIProcess/API/C/WKBase.h:
     31        Add new opaque type.
     32
     33        * UIProcess/API/C/WKDictionary.cpp: Added.
     34        (WKDictionaryGetTypeID):
     35        (WKDictionaryGetItemForKey):
     36        (WKDictionaryGetSize):
     37        (WKDictionaryRetain):
     38        (WKDictionaryRelease):
     39        * UIProcess/API/C/WKDictionary.h: Added.
     40        Add API wrappings.
     41   
     42        * UIProcess/API/C/WebKit2.h:
     43        Add missing public headers.
     44
     45        * WebKit2.xcodeproj/project.pbxproj:
     46        * win/WebKit2.vcproj:
     47        * win/WebKit2Generated.make:
     48        Add new files.
     49
    1502010-08-13  Sam Weinig  <sam@webkit.org>
    251

  • trunk/WebKit2/Shared/APIObject.h

    r65337 r65339  
    3636        // Base types
    3737        TypeArray,
     38        TypeDictionary,
    3839        TypeData,
    3940        TypeError,

  • trunk/WebKit2/UIProcess/API/C/WKAPICast.h

    r65337 r65339  
    4040
    4141class ImmutableArray;
     42class ImmutableDictionary;
    4243class WebBackForwardList;
    4344class WebBackForwardListItem;
    … …  
    6162template<> struct APITypeInfo<WKContextRef>                     { typedef WebContext* ImplType; };
    6263template<> struct APITypeInfo<WKDataRef>                        { typedef WebData* ImplType; };
     64template<> struct APITypeInfo<WKDictionaryRef>                  { typedef ImmutableDictionary* ImplType; };
    6365template<> struct APITypeInfo<WKFormSubmissionListenerRef>      { typedef WebFormSubmissionListenerProxy* ImplType; };
    6466template<> struct APITypeInfo<WKFramePolicyListenerRef>         { typedef WebFramePolicyListenerProxy* ImplType; };
    … …  
    7577template<> struct ImplTypeInfo<APIObject*>                      { typedef WKTypeRef APIType; };
    7678template<> struct ImplTypeInfo<ImmutableArray*>                 { typedef WKArrayRef APIType; };
     79template<> struct ImplTypeInfo<ImmutableDictionary*>            { typedef WKDictionaryRef APIType; };
    7780template<> struct ImplTypeInfo<WebBackForwardList*>             { typedef WKBackForwardListRef APIType; };
    7881template<> struct ImplTypeInfo<WebBackForwardListItem*>         { typedef WKBackForwardListItemRef APIType; };

  • trunk/WebKit2/UIProcess/API/C/WKBase.h

    r65337 r65339  
    4141typedef struct OpaqueWKContext* WKContextRef;
    4242typedef struct OpaqueWKData* WKDataRef;
     43typedef struct OpaqueWKDictionary* WKDictionaryRef;
    4344typedef struct OpaqueWKError* WKErrorRef;
    4445typedef struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;

  • trunk/WebKit2/UIProcess/API/C/WebKit2.h

    r65337 r65339  
    3030#include <WebKit2/WKType.h>
    3131
     32#include <WebKit2/WKArray.h>
    3233#include <WebKit2/WKBackForwardList.h>
    3334#include <WebKit2/WKBackForwardListItem.h>
    3435#include <WebKit2/WKContext.h>
     36#include <WebKit2/WKData.h>
     37#include <WebKit2/WKDictionary.h>
     38#include <WebKit2/WKError.h>
    3539#include <WebKit2/WKFormSubmissionListener.h>
    3640#include <WebKit2/WKFrame.h>

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

    r65337 r65339  
    253253                BCB9F8AF1124E07700A137E0 /* WebPolicyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB9F8AD1124E07700A137E0 /* WebPolicyClient.cpp */; };
    254254                BCB9F8B01124E07700A137E0 /* WebPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9F8AE1124E07700A137E0 /* WebPolicyClient.h */; };
     255                BCBCB0CB1215E32100DE59CA /* ImmutableDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */; };
     256                BCBCB0CD1215E33A00DE59CA /* ImmutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */; };
     257                BCBCB0E31215E54D00DE59CA /* WKDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBCB0E11215E54D00DE59CA /* WKDictionary.h */; };
     258                BCBCB0E41215E54D00DE59CA /* WKDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBCB0E21215E54D00DE59CA /* WKDictionary.cpp */; };
    255259                BCC56F791159957D001CCAF9 /* MachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC56F771159957D001CCAF9 /* MachPort.h */; };
    256260                BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */; };
    … …  
    592596                BCB9F8AD1124E07700A137E0 /* WebPolicyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPolicyClient.cpp; sourceTree = "<group>"; };
    593597                BCB9F8AE1124E07700A137E0 /* WebPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPolicyClient.h; sourceTree = "<group>"; };
     598                BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImmutableDictionary.h; sourceTree = "<group>"; };
     599                BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImmutableDictionary.cpp; sourceTree = "<group>"; };
     600                BCBCB0E11215E54D00DE59CA /* WKDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDictionary.h; sourceTree = "<group>"; };
     601                BCBCB0E21215E54D00DE59CA /* WKDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKDictionary.cpp; sourceTree = "<group>"; };
    594602                BCC56F771159957D001CCAF9 /* MachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachPort.h; sourceTree = "<group>"; };
    595603                BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
    … …  
    847855                                BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,
    848856                                BC64696E11DBE603006455B0 /* ImmutableArray.h */,
     857                                BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */,
     858                                BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
    849859                                BCC57161115ADB42001CCAF9 /* NotImplemented.h */,
    850860                                1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
    … …  
    10681078                                514AF6C61209EE7300A26C97 /* WKData.cpp */,
    10691079                                514AF6C71209EE7300A26C97 /* WKData.h */,
     1080                                BCBCB0E21215E54D00DE59CA /* WKDictionary.cpp */,
     1081                                BCBCB0E11215E54D00DE59CA /* WKDictionary.h */,
    10701082                                516A4A58120A1AB500C05B7F /* WKError.cpp */,
    10711083                                516A4A57120A1AB500C05B7F /* WKError.h */,
    … …  
    14771489                                BCE4695A1214EDF4000B98EB /* WKFormSubmissionListener.h in Headers */,
    14781490                                BCE469771214F27B000B98EB /* WebFrameListenerProxy.h in Headers */,
     1491                                BCBCB0CB1215E32100DE59CA /* ImmutableDictionary.h in Headers */,
     1492                                BCBCB0E31215E54D00DE59CA /* WKDictionary.h in Headers */,
    14791493                        );
    14801494                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    16971711                                BCE469591214EDF4000B98EB /* WKFormSubmissionListener.cpp in Sources */,
    16981712                                BCE469791214F2B4000B98EB /* WebFrameListenerProxy.cpp in Sources */,
     1713                                BCBCB0CD1215E33A00DE59CA /* ImmutableDictionary.cpp in Sources */,
     1714                                BCBCB0E41215E54D00DE59CA /* WKDictionary.cpp in Sources */,
    16991715                        );
    17001716                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKit2/win/WebKit2.vcproj

    r65337 r65339  
    418418                        </File>
    419419                        <File
     420                                RelativePath="..\Shared\ImmutableDictionary.cpp"
     421                                >
     422                        </File>
     423                        <File
     424                                RelativePath="..\Shared\ImmutableDictionary.h"
     425                                >
     426                        </File>
     427                        <File
    420428                                RelativePath="..\Shared\NotImplemented.h"
    421429                                >
    … …  
    12371245                                        <File
    12381246                                                RelativePath="..\UIProcess\API\C\WKData.h"
     1247                                                >
     1248                                        </File>
     1249                                        <File
     1250                                                RelativePath="..\UIProcess\API\C\WKDictionary.cpp"
     1251                                                >
     1252                                        </File>
     1253                                        <File
     1254                                                RelativePath="..\UIProcess\API\C\WKDictionary.h"
    12391255                                                >
    12401256                                        </File>

  • trunk/WebKit2/win/WebKit2Generated.make

    r65337 r65339  
    1010    xcopy /y /d "..\UIProcess\API\C\WKContextPrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
    1111    xcopy /y /d "..\UIProcess\API\C\WKData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     12    xcopy /y /d "..\UIProcess\API\C\WKDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
    1213    xcopy /y /d "..\UIProcess\API\C\WKError.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
    1314    xcopy /y /d "..\UIProcess\API\C\WKFormSubmissionListener.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
Note: See TracChangeset for help on using the changeset viewer.