Changeset 69991 in webkit

Timestamp:

Oct 18, 2010 2:24:22 PM (14 years ago)

Author:

jberlin@webkit.org

Message:

Need a WebKit2 equivalent of the WebKit1 WebUserContentURLPattern.
​https://bugs.webkit.org/show_bug.cgi?id=47783

Reviewed by Sam Weinig.

• Shared/API/c/WKBase.h:

• Shared/API/c/WKSharedAPICast.h:

• Shared/API/c/WKUserContentURLPattern.cpp: Added.

(WKUserContentURLPatternGetTypeID):
(WKUserContentURLPatternCreate):
(WKUserContentURLPatternMatchesURL):

• Shared/API/c/WKUserContentURLPattern.h: Added.

• Shared/APIObject.h:

• Shared/UserMessageCoders.h:

Use the original pattern string to encode and decode a UserContentURLPattern.
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):

• Shared/WebUserContentURLPattern.h: Added.

(WebKit::WebUserContentURLPattern::create):
(WebKit::WebUserContentURLPattern::matchesURL):
Use WebCore::UserContentURLPattern::matches.
(WebKit::WebUserContentURLPattern::patternString):
Expose the pattern string used to create the UserContentURLPattern for the purpose of
encoding and decoding.
(WebKit::WebUserContentURLPattern::WebUserContentURLPattern):
(WebKit::WebUserContentURLPattern::type):

• WebKit2.pro:
• WebKit2.xcodeproj/project.pbxproj:
• win/WebKit2.vcproj:

Add WKUserContentURLPattern.h/.cpp and WebUserContentURLPattern.h

• win/WebKit2Generated.make:

Copy over WKUsercontentURLPattern into the output directory.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKBase.h (modified) (1 diff)
• Shared/API/c/WKSharedAPICast.h (modified) (2 diffs)
• Shared/API/c/WKUserContentURLPattern.cpp (added)
• Shared/API/c/WKUserContentURLPattern.h (added)
• Shared/APIObject.h (modified) (1 diff)
• Shared/UserMessageCoders.h (modified) (5 diffs)
• Shared/WebUserContentURLPattern.h (added)
• WebKit2.pro (modified) (3 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-10-18  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Need a WebKit2 equivalent of the WebKit1 WebUserContentURLPattern.
+        https://bugs.webkit.org/show_bug.cgi?id=47783
+
+        * Shared/API/c/WKBase.h:
+
+        * Shared/API/c/WKSharedAPICast.h:
+
+        * Shared/API/c/WKUserContentURLPattern.cpp: Added.
+        (WKUserContentURLPatternGetTypeID):
+        (WKUserContentURLPatternCreate):
+        (WKUserContentURLPatternMatchesURL):
+        * Shared/API/c/WKUserContentURLPattern.h: Added.
+
+        * Shared/APIObject.h:
+
+        * Shared/UserMessageCoders.h:
+        Use the original pattern string to encode and decode a UserContentURLPattern.
+        (WebKit::UserMessageEncoder::baseEncode):
+        (WebKit::UserMessageDecoder::baseDecode):
+
+        * Shared/WebUserContentURLPattern.h: Added.
+        (WebKit::WebUserContentURLPattern::create):
+        (WebKit::WebUserContentURLPattern::matchesURL):
+        Use WebCore::UserContentURLPattern::matches.
+        (WebKit::WebUserContentURLPattern::patternString):
+        Expose the pattern string used to create the UserContentURLPattern for the purpose of
+        encoding and decoding.
+        (WebKit::WebUserContentURLPattern::WebUserContentURLPattern):
+        (WebKit::WebUserContentURLPattern::type):
+
+        * WebKit2.pro:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * win/WebKit2.vcproj:
+        Add WKUserContentURLPattern.h/.cpp and WebUserContentURLPattern.h
+
+        * win/WebKit2Generated.make:
+        Copy over WKUsercontentURLPattern into the output directory.
+
 2010-10-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Shared/API/c/WKBase.h

@@ -55 +55 @@
 typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
 typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
+typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;
 
 /* WebKit2 main API types */

trunk/WebKit2/Shared/API/c/WKSharedAPICast.h

@@ -49 +49 @@
 class WebURLRequest;
 class WebURLResponse;
+class WebUserContentURLPattern;
 
 template<typename APIType> struct APITypeInfo { };
@@ -73 +74 @@
 WK_ADD_API_MAPPING(WKURLRequestRef, WebURLRequest)
 WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse)
+WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
 
 template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>

trunk/WebKit2/Shared/APIObject.h

@@ -46 +46 @@
         TypeURLRequest,
         TypeURLResponse,
+        TypeUserContentURLPattern,
 
         // Base numeric types

trunk/WebKit2/Shared/UserMessageCoders.h

@@ -33 +33 @@
 #include "WebString.h"
 #include "WebURL.h"
+#include "WebUserContentURLPattern.h"
 
 namespace WebKit {
@@ -41 +42 @@
 //   - String -> String
 //   - SerializedScriptValue -> SerializedScriptValue
+//   - UserContentURLPattern -> UserContentURLPattern
 //   - WebDouble -> WebDouble
 //   - WebUInt64 -> WebUInt64
@@ -109 +111 @@
             return true;
         }
+        case APIObject::TypeUserContentURLPattern: {
+            WebUserContentURLPattern* urlPattern = static_cast<WebUserContentURLPattern*>(m_root);
+            encoder->encode(urlPattern->patternString());
+            return true;
+        }
         default:
             break;
@@ -132 +139 @@
 //   - String -> String
 //   - SerializedScriptValue -> SerializedScriptValue
+//   - UserContentURLPattern -> UserContentURLPattern
 //   - WebDouble -> WebDouble
 //   - WebUInt64 -> WebUInt64
@@ -231 +239 @@
             break;
         }
+        case APIObject::TypeUserContentURLPattern: {
+            String string;
+            if (!decoder->decode(string))
+                return false;
+            coder.m_root = WebUserContentURLPattern::create(string);
+            break;
+        }
         default:
             break;

trunk/WebKit2/WebKit2.pro

@@ -191 +191 @@
     Shared/API/c/WKURLRequest.h \
     Shared/API/c/WKURLResponse.h \
+    Shared/API/c/WKUserContentURLPattern.h \
     Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
     Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
@@ -344 +345 @@
     Shared/API/c/WKURLRequest.cpp \
     Shared/API/c/WKURLResponse.cpp \
+    Shared/API/c/WKUserContentURLPattern.cpp \
     Shared/BackingStore.cpp \
     Shared/ImmutableArray.cpp \
@@ -365 +367 @@
     Shared/WebURLRequest.cpp \
     Shared/WebURLResponse.cpp \
+    Shared/WebUserContentURLPattern.cpp \
     UIProcess/API/C/WKContext.cpp \
     UIProcess/API/C/WKFrame.cpp \

trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -455 +455 @@
                 E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; };
                 E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */; };
+                F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */; };
+                F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
+                F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Public, ); }; };
                 F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 /* End PBXBuildFile section */
@@ -950 +953 @@
                 E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
                 E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; };
+                F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentURLPattern.h; sourceTree = "<group>"; };
+                F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
+                F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
                 F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -1216 +1222 @@
                                 BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
                                 BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
+                                F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
                         );
                         path = Shared;
@@ -1781 +1788 @@
                                 BC4075F1124FF0270068F20A /* WKURLResponse.cpp */,
                                 BC4075F2124FF0270068F20A /* WKURLResponse.h */,
+                                F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */,
+                                F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */,
                         );
                         path = c;
@@ -2060 +2069 @@
                                 1A910071126675C4001842F5 /* FindIndicator.h in Headers */,
                                 1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */,
+                                F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
+                                F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2370 +2381 @@
                                 1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */,
                                 1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */,
+                                F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebKit2/win/WebKit2.vcproj

@@ -581 +581 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\Shared\WebUserContentURLPattern.h"
+                                >
+                        </File>
                         <Filter
                                 Name="API"
@@ -726 +730 @@
                                 <File
                                         RelativePath="..\Shared\API\c\WKURLResponse.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\Shared\API\c\WKUserContentURLPattern.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\Shared\API\c\WKUserContentURLPattern.h"
                                         >
                                 </File>

trunk/WebKit2/win/WebKit2Generated.make

@@ -27 +27 @@
     xcopy /y /d "..\Shared\API\c\WKURLRequest.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\Shared\API\c\WKURLResponse.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+    xcopy /y /d "..\Shared\API\c\WKUserContentURLPattern.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WebKit2.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     xcopy /y /d "..\UIProcess\API\C\WKBackForwardList.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"