Changeset 66676 in webkit

Timestamp:

Sep 2, 2010 11:32:14 AM (14 years ago)

Author:

weinig@apple.com

Message:

Add WKMutableDictionary API for WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=45117

Reviewed by Anders Carlsson.

Add WKMutableDictionary API that inherits from WKDictionaryRef
the same way WKMutableArrayRef inherits from WKArrayRef.

• Shared/ImmutableDictionary.h:

(WebKit::ImmutableDictionary::get):
(WebKit::ImmutableDictionary::isMutable):

• Shared/MutableDictionary.cpp: Added.

(WebKit::MutableDictionary::MutableDictionary):
(WebKit::MutableDictionary::~MutableDictionary):
(WebKit::MutableDictionary::add):
(WebKit::MutableDictionary::set):

• Shared/MutableDictionary.h: Added.

(WebKit::MutableDictionary::create):
(WebKit::MutableDictionary::isMutable):

• UIProcess/API/C/WKAPICast.h:

(toWK):

• UIProcess/API/C/WKBase.h:
• UIProcess/API/C/WKMutableDictionary.cpp: Added.

(WKMutableDictionaryCreate):
(WKDictionaryIsMutable):
(WKDictionaryAddItem):
(WKDictionarySetItem):

• UIProcess/API/C/WKMutableDictionary.h: Added.
• UIProcess/API/C/WebKit2.h:
• WebKit2.pro:
• WebKit2.xcodeproj/project.pbxproj:
• win/WebKit2.vcproj:
• win/WebKit2Generated.make:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/ImmutableDictionary.h (modified) (4 diffs)
• Shared/MutableDictionary.cpp (added)
• Shared/MutableDictionary.h (added)
• UIProcess/API/C/WKAPICast.h (modified) (4 diffs)
• UIProcess/API/C/WKBase.h (modified) (1 diff)
• UIProcess/API/C/WKMutableDictionary.cpp (added)
• UIProcess/API/C/WKMutableDictionary.h (added)
• UIProcess/API/C/WebKit2.h (modified) (2 diffs)
• WebKit2.pro (modified) (2 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (6 diffs)
• win/WebKit2.vcproj (modified) (2 diffs)
• win/WebKit2Generated.make (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-09-02  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Add WKMutableDictionary API for WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=45117
+
+        Add WKMutableDictionary API that inherits from WKDictionaryRef
+        the same way WKMutableArrayRef inherits from WKArrayRef.
+
+        * Shared/ImmutableDictionary.h:
+        (WebKit::ImmutableDictionary::get):
+        (WebKit::ImmutableDictionary::isMutable):
+        * Shared/MutableDictionary.cpp: Added.
+        (WebKit::MutableDictionary::MutableDictionary):
+        (WebKit::MutableDictionary::~MutableDictionary):
+        (WebKit::MutableDictionary::add):
+        (WebKit::MutableDictionary::set):
+        * Shared/MutableDictionary.h: Added.
+        (WebKit::MutableDictionary::create):
+        (WebKit::MutableDictionary::isMutable):
+        * UIProcess/API/C/WKAPICast.h:
+        (toWK):
+        * UIProcess/API/C/WKBase.h:
+        * UIProcess/API/C/WKMutableDictionary.cpp: Added.
+        (WKMutableDictionaryCreate):
+        (WKDictionaryIsMutable):
+        (WKDictionaryAddItem):
+        (WKDictionarySetItem):
+        * UIProcess/API/C/WKMutableDictionary.h: Added.
+        * UIProcess/API/C/WebKit2.h:
+        * WebKit2.pro:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * win/WebKit2.vcproj:
+        * win/WebKit2Generated.make:
+
 2010-09-02  Jessie Berlin  <jberlin@apple.com>
 

trunk/WebKit2/Shared/ImmutableDictionary.h

@@ -43 +43 @@
     static const Type APIType = TypeDictionary;
 
-    typedef HashMap<WTF::String, RefPtr<APIObject> > MapType;
+    typedef HashMap<String, RefPtr<APIObject> > MapType;
 
     static PassRefPtr<ImmutableDictionary> create()
@@ -56 +56 @@
 
     template<typename T>
-    T* get(const WTF::String& key)
+    T* get(const String& key)
     {
         RefPtr<APIObject> item = m_map.get(key);
@@ -68 +68 @@
     }
 
-    APIObject* get(const WTF::String& key)
+    APIObject* get(const String& key)
     {
         return m_map.get(key).get();
@@ -77 +77 @@
     size_t size() { return m_map.size(); }
 
-private:
+    virtual bool isMutable() { return false; }
+
+protected:
     ImmutableDictionary();
     enum AdoptTag { Adopt };

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

@@ -44 +44 @@
 class ImmutableDictionary;
 class MutableArray;
+class MutableDictionary;
 class WebBackForwardList;
 class WebBackForwardListItem;
@@ -70 +71 @@
 template<> struct APITypeInfo<WKFrameRef>                       { typedef WebFrameProxy* ImplType; };
 template<> struct APITypeInfo<WKMutableArrayRef>                { typedef MutableArray* ImplType; };
+template<> struct APITypeInfo<WKMutableDictionaryRef>           { typedef MutableDictionary* ImplType; };
 template<> struct APITypeInfo<WKNavigationDataRef>              { typedef WebNavigationData* ImplType; };
 template<> struct APITypeInfo<WKPageNamespaceRef>               { typedef WebPageNamespace* ImplType; };
@@ -86 +88 @@
 template<> struct ImplTypeInfo<ImmutableDictionary*>            { typedef WKDictionaryRef APIType; };
 template<> struct ImplTypeInfo<MutableArray*>                   { typedef WKMutableArrayRef APIType; };
+template<> struct ImplTypeInfo<MutableDictionary*>              { typedef WKMutableDictionaryRef APIType; };
 template<> struct ImplTypeInfo<WebBackForwardList*>             { typedef WKBackForwardListRef APIType; };
 template<> struct ImplTypeInfo<WebBackForwardListItem*>         { typedef WKBackForwardListItemRef APIType; };
@@ -125 +128 @@
 inline typename WebKit::APITypeInfo<T>::ImplType toWK(T t)
 {
+    // An example of the conversions that take place:
     // const struct OpaqueWKArray* -> const struct OpaqueWKArray -> struct OpaqueWKArray -> struct OpaqueWKArray* -> ImmutableArray*
     

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

@@ -39 +39 @@
 typedef struct OpaqueWKArray* WKMutableArrayRef;
 
+typedef const struct OpaqueWKDictionary* WKDictionaryRef;
+typedef struct OpaqueWKDictionary* WKMutableDictionaryRef;
+
 typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
 typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
 typedef const struct OpaqueWKContext* WKContextRef;
 typedef const struct OpaqueWKData* WKDataRef;
-typedef const struct OpaqueWKDictionary* WKDictionaryRef;
 typedef const struct OpaqueWKError* WKErrorRef;
 typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;

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

@@ -35 +35 @@
 #include <WebKit2/WKContext.h>
 #include <WebKit2/WKData.h>
-#include <WebKit2/WKDictionary.h>
 #include <WebKit2/WKError.h>
 #include <WebKit2/WKFormSubmissionListener.h>
 #include <WebKit2/WKFrame.h>
 #include <WebKit2/WKFramePolicyListener.h>
+#include <WebKit2/WKMutableArray.h>
+#include <WebKit2/WKMutableDictionary.h>
 #include <WebKit2/WKNavigationData.h>
 #include <WebKit2/WKPage.h>
@@ -47 +48 @@
 #include <WebKit2/WKURL.h>
 #include <WebKit2/WKURLRequest.h>
+#include <WebKit2/WKURLResponse.h>
 
 #if !__APPLE__ || __OBJC__

trunk/WebKit2/WebKit2.pro

@@ -160 +160 @@
     Shared/ImmutableDictionary.h \
     Shared/MutableArray.h \
+    Shared/MutableDictionary.h \
     Shared/NotImplemented.h \
     Shared/qt/WebEventFactoryQt.h \
@@ -270 +271 @@
     Shared/ImmutableDictionary.cpp \
     Shared/MutableArray.cpp \
+    Shared/MutableDictionary.cpp \
     Shared/VisitedLinkTable.cpp \
     Shared/WebEventConversion.cpp \

trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -252 +252 @@
                 BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC8049D122F0D6B00103529 /* MutableArray.cpp */; };
                 BCB0AD34122F285800B1341E /* MutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC8049E122F0D6B00103529 /* MutableArray.h */; };
+                BCB0AEE9122F53E300B1341E /* MutableDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0AEE7122F53E300B1341E /* MutableDictionary.h */; };
+                BCB0AEEA122F53E300B1341E /* MutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */; };
+                BCB0AF3512301DFB00B1341E /* WKMutableDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                BCB0AF3612301DFB00B1341E /* WKMutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB0AF3412301DFB00B1341E /* WKMutableDictionary.cpp */; };
                 BCB28CC0120233D9007D99BC /* InjectedBundleMessageKinds.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB28CBF120233D9007D99BC /* InjectedBundleMessageKinds.h */; };
                 BCB63478116BF10600603215 /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB63477116BF10600603215 /* WebKit2.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -611 +615 @@
                 BCA8C9DA11E4086500812FB7 /* WebBackForwardControllerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardControllerClient.h; sourceTree = "<group>"; };
                 BCA8C9DB11E4086500812FB7 /* WebBackForwardControllerClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardControllerClient.cpp; sourceTree = "<group>"; };
+                BCB0AEE7122F53E300B1341E /* MutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutableDictionary.h; sourceTree = "<group>"; };
+                BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutableDictionary.cpp; sourceTree = "<group>"; };
+                BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMutableDictionary.h; sourceTree = "<group>"; };
+                BCB0AF3412301DFB00B1341E /* WKMutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMutableDictionary.cpp; sourceTree = "<group>"; };
                 BCB28CBF120233D9007D99BC /* InjectedBundleMessageKinds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleMessageKinds.h; sourceTree = "<group>"; };
                 BCB63477116BF10600603215 /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
@@ -901 +909 @@
                                 BCC8049D122F0D6B00103529 /* MutableArray.cpp */,
                                 BCC8049E122F0D6B00103529 /* MutableArray.h */,
+                                BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */,
+                                BCB0AEE7122F53E300B1341E /* MutableDictionary.h */,
                                 BCC57161115ADB42001CCAF9 /* NotImplemented.h */,
                                 1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
@@ -1139 +1149 @@
                                 BCC804A2122F0E7B00103529 /* WKMutableArray.cpp */,
                                 BCC804A1122F0E7B00103529 /* WKMutableArray.h */,
+                                BCB0AF3412301DFB00B1341E /* WKMutableDictionary.cpp */,
+                                BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */,
                                 BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */,
                                 BCF69FA71176D1CB00471A52 /* WKNavigationData.h */,
@@ -1571 +1583 @@
                                 BCB0AD2D122F284300B1341E /* WKMutableArray.h in Headers */,
                                 BCB0AD34122F285800B1341E /* MutableArray.h in Headers */,
+                                BCB0AEE9122F53E300B1341E /* MutableDictionary.h in Headers */,
+                                BCB0AF3512301DFB00B1341E /* WKMutableDictionary.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1805 +1819 @@
                                 BCB0AD2E122F284700B1341E /* WKMutableArray.cpp in Sources */,
                                 BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */,
+                                BCB0AEEA122F53E300B1341E /* MutableDictionary.cpp in Sources */,
+                                BCB0AF3612301DFB00B1341E /* WKMutableDictionary.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebKit2/win/WebKit2.vcproj

@@ -434 +434 @@
                         </File>
                         <File
+                                RelativePath="..\Shared\MutableDictionary.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\Shared\MutableDictionary.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\Shared\NotImplemented.h"
                                 >
@@ -1337 +1345 @@
                                         <File
                                                 RelativePath="..\UIProcess\API\C\WKMutableArray.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\UIProcess\API\C\WKMutableDictionary.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\UIProcess\API\C\WKMutableDictionary.h"
                                                 >
                                         </File>

trunk/WebKit2/win/WebKit2Generated.make

@@ -17 +17 @@
     xcopy /y /d "..\UIProcess\API\C\WKNavigationData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKMutableArray.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+    xcopy /y /d "..\UIProcess\API\C\WKMutableDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKPage.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKPageNamespace.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"