Changeset 57680 in webkit


Ignore:
Timestamp:
Apr 15, 2010 3:19:48 PM (14 years ago)
Author:
Adam Roben
Message:

Expose UserContentURLPattern as WebKit SPI

Fixes <​http://webkit.org/b/37354>.

Reviewed by Tim Hatcher.

WebCore:

  • WebCore.base.exp: Export UserContentURLPattern::parse, and sorted

the file.

  • WebCore.xcodeproj/project.pbxproj: Marked UserContentURLPattern.h as

"Private".

  • page/UserContentURLPattern.h:

(WebCore::UserContentURLPattern::UserContentURLPattern): Added a
default constructor.
(WebCore::UserContentURLPattern::isValid): Added this getter.

WebKit:

  • WebKit.xcodeproj/project.pbxproj: Add WebUserContentURLPattern.

WebKit/mac:

  • Misc/WebUserContentURLPattern.h: Added.
  • Misc/WebUserContentURLPattern.mm: Added.

(-[WebUserContentURLPattern initWithPatternString:]): Initialize
_private and then parse the passed-in string into a
UserContentURLPattern.
(-[WebUserContentURLPattern dealloc]): Release _private.

(-[WebUserContentURLPattern isValid]):
(-[WebUserContentURLPattern scheme]):
(-[WebUserContentURLPattern host]):
(-[WebUserContentURLPattern matchesSubdomains]):
Call through to UserContentURLPattern.

WebKit/win:

  • Interfaces/IWebUserContentURLPattern.idl: Added.
  • Interfaces/WebKit.idl: Added WebUserContentURLPattern.
  • WebKit.vcproj/Interfaces.vcproj: Added IWebUserContentURLPattern.
  • WebKit.vcproj/WebKit.vcproj: Added WebUserContentURLPattern.
  • WebUserContentURLPattern.cpp: Added.

(WebUserContentURLPattern::WebUserContentURLPattern):
(WebUserContentURLPattern::~WebUserContentURLPattern):
(WebUserContentURLPattern::createInstance):
(WebUserContentURLPattern::AddRef):
(WebUserContentURLPattern::Release):
(WebUserContentURLPattern::QueryInterface):
Standard COM implementations.

(WebUserContentURLPattern::parse): Parse the string into a
UserContentURLPattern and store it.

(WebUserContentURLPattern::isValid):
(WebUserContentURLPattern::scheme):
(WebUserContentURLPattern::host):
(WebUserContentURLPattern::matchesSubdomains):
Call through to UserContentURLPattern.

  • WebUserContentURLPattern.h: Added.
Location:
trunk
Files:
5 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r57674 r57680  
     12010-04-15  Adam Roben  <aroben@apple.com>
     2
     3        Expose UserContentURLPattern as WebKit SPI
     4
     5        Fixes <http://webkit.org/b/37354>.
     6
     7        Reviewed by Tim Hatcher.
     8
     9        * WebCore.base.exp: Export UserContentURLPattern::parse, and sorted
     10        the file.
     11
     12        * WebCore.xcodeproj/project.pbxproj: Marked UserContentURLPattern.h as
     13        "Private".
     14
     15        * page/UserContentURLPattern.h:
     16        (WebCore::UserContentURLPattern::UserContentURLPattern): Added a
     17        default constructor.
     18        (WebCore::UserContentURLPattern::isValid): Added this getter.
     19
    1202010-04-15  Chris Fleizach  <cfleizach@apple.com>
    221

  • trunk/WebCore/WebCore.base.exp

    r57555 r57680  
    313313__ZN7WebCore14SecurityOrigin24registerURLSchemeAsLocalERKNS_6StringE
    314314__ZN7WebCore14SecurityOrigin25registerURLSchemeAsSecureERKNS_6StringE
     315__ZN7WebCore14SecurityOrigin27resetOriginAccessWhitelistsEv
    315316__ZN7WebCore14SecurityOrigin29addOriginAccessWhitelistEntryERKS0_RKNS_6StringES5_b
    316317__ZN7WebCore14SecurityOrigin32removeOriginAccessWhitelistEntryERKS0_RKNS_6StringES5_b
    317 __ZN7WebCore14SecurityOrigin27resetOriginAccessWhitelistsEv
    318318__ZN7WebCore14SecurityOrigin40setDomainRelaxationForbiddenForURLSchemeEbRKNS_6StringE
    319319__ZN7WebCore14SecurityOrigin6createERKNS_4KURLEi
    … …  
    445445__ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
    446446__ZN7WebCore21SerializedScriptValueD1Ev
     447__ZN7WebCore21UserContentURLPattern5parseERKNS_6StringE
    447448__ZN7WebCore21WindowsLatin1EncodingEv
    448449__ZN7WebCore21findEventWithKeyStateEPNS_5EventE

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r57505 r57680  
    45034503                BCAA90C30A7EBA60008B1229 /* Scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAA90C20A7EBA60008B1229 /* Scrollbar.cpp */; };
    45044504                BCACF3BC1072921A00C0C8A3 /* UserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */; };
    4505                 BCACF3BD1072921A00C0C8A3 /* UserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */; };
     4505                BCACF3BD1072921A00C0C8A3 /* UserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
    45064506                BCAEFCAE1016CE4A0040D34E /* DOMRGBColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAEFCAD1016CE4A0040D34E /* DOMRGBColor.mm */; };
    45074507                BCB16C170979C3BD00467741 /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16BFE0979C3BD00467741 /* Cache.cpp */; };

  • trunk/WebCore/page/UserContentURLPattern.h

    r49033 r57680  
    3636class UserContentURLPattern {
    3737public:
     38    UserContentURLPattern() : m_invalid(true), m_matchSubdomains(false) { }
     39
    3840    UserContentURLPattern(const String& pattern)
    3941    : m_matchSubdomains(false)
    … …  
    4143        m_invalid = !parse(pattern);
    4244    }
     45
     46    bool isValid() const { return !m_invalid; }
    4347
    4448    bool matches(const KURL&) const;

  • trunk/WebKit/ChangeLog

    r57665 r57680  
     12010-04-15  Adam Roben  <aroben@apple.com>
     2
     3        Expose UserContentURLPattern as WebKit SPI
     4
     5        Fixes <http://webkit.org/b/37354>.
     6
     7        Reviewed by Tim Hatcher.
     8
     9        * WebKit.xcodeproj/project.pbxproj: Add WebUserContentURLPattern.
     10
    1112010-04-15  Leandro Pereira  <leandro@profusion.mobi>
    212

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r57441 r57680  
    341341                C0B1F7EA10AC8E3100C925D9 /* WebScriptWorldInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B1F7E710AC8E3100C925D9 /* WebScriptWorldInternal.h */; };
    342342                C0B88E8B10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B88E8A10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     343                C0C5B3EE1177A4A0002B0AEF /* WebUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = C0C5B3EC1177A4A0002B0AEF /* WebUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
     344                C0C5B3EF1177A4A0002B0AEF /* WebUserContentURLPattern.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C5B3ED1177A4A0002B0AEF /* WebUserContentURLPattern.mm */; };
    343345                DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */; };
    344346                DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = DD89681E09AA87240097E7F0 /* WebElementDictionary.h */; };
    … …  
    639641                C0B1F7E710AC8E3100C925D9 /* WebScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptWorldInternal.h; sourceTree = "<group>"; };
    640642                C0B88E8A10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameLoadDelegatePrivate.h; sourceTree = "<group>"; };
     643                C0C5B3EC1177A4A0002B0AEF /* WebUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentURLPattern.h; sourceTree = "<group>"; };
     644                C0C5B3ED1177A4A0002B0AEF /* WebUserContentURLPattern.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebUserContentURLPattern.mm; sourceTree = "<group>"; };
    641645                DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTypesInternal.h; sourceTree = "<group>"; };
    642646                DD89681E09AA87240097E7F0 /* WebElementDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebElementDictionary.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    953957                                F59668C902AD2923018635CA /* WebStringTruncator.mm */,
    954958                                DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */,
     959                                C0C5B3ED1177A4A0002B0AEF /* WebUserContentURLPattern.mm */,
     960                                C0C5B3EC1177A4A0002B0AEF /* WebUserContentURLPattern.h */,
    955961                        );
    956962                        name = Misc;
    … …  
    15401546                                0FD3B0F81076C3F700039B96 /* WebWindowAnimation.h in Headers */,
    15411547                                41F4484F10338E8C0030E55E /* WebWorkersPrivate.h in Headers */,
     1548                                C0C5B3EE1177A4A0002B0AEF /* WebUserContentURLPattern.h in Headers */,
    15421549                        );
    15431550                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    18971904                                0FD3B0F91076C3F700039B96 /* WebWindowAnimation.m in Sources */,
    18981905                                41F4485010338E8C0030E55E /* WebWorkersPrivate.mm in Sources */,
     1906                                C0C5B3EF1177A4A0002B0AEF /* WebUserContentURLPattern.mm in Sources */,
    18991907                        );
    19001908                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKit/mac/ChangeLog

    r57555 r57680  
     12010-04-15  Adam Roben  <aroben@apple.com>
     2
     3        Expose UserContentURLPattern as WebKit SPI
     4
     5        Fixes <http://webkit.org/b/37354>.
     6
     7        Reviewed by Tim Hatcher.
     8
     9        * Misc/WebUserContentURLPattern.h: Added.
     10
     11        * Misc/WebUserContentURLPattern.mm: Added.
     12        (-[WebUserContentURLPattern initWithPatternString:]): Initialize
     13        _private and then parse the passed-in string into a
     14        UserContentURLPattern.
     15        (-[WebUserContentURLPattern dealloc]): Release _private.
     16
     17        (-[WebUserContentURLPattern isValid]):
     18        (-[WebUserContentURLPattern scheme]):
     19        (-[WebUserContentURLPattern host]):
     20        (-[WebUserContentURLPattern matchesSubdomains]):
     21        Call through to UserContentURLPattern.
     22
    1232010-04-13  Geoffrey Garen  <ggaren@apple.com>
    224

  • trunk/WebKit/win/ChangeLog

    r57615 r57680  
     12010-04-15  Adam Roben  <aroben@apple.com>
     2
     3        Expose UserContentURLPattern as WebKit SPI
     4
     5        Fixes <http://webkit.org/b/37354>.
     6
     7        Reviewed by Tim Hatcher.
     8
     9        * Interfaces/IWebUserContentURLPattern.idl: Added.
     10
     11        * Interfaces/WebKit.idl: Added WebUserContentURLPattern.
     12
     13        * WebKit.vcproj/Interfaces.vcproj: Added IWebUserContentURLPattern.
     14
     15        * WebKit.vcproj/WebKit.vcproj: Added WebUserContentURLPattern.
     16
     17        * WebUserContentURLPattern.cpp: Added.
     18        (WebUserContentURLPattern::WebUserContentURLPattern):
     19        (WebUserContentURLPattern::~WebUserContentURLPattern):
     20        (WebUserContentURLPattern::createInstance):
     21        (WebUserContentURLPattern::AddRef):
     22        (WebUserContentURLPattern::Release):
     23        (WebUserContentURLPattern::QueryInterface):
     24        Standard COM implementations.
     25
     26        (WebUserContentURLPattern::parse): Parse the string into a
     27        UserContentURLPattern and store it.
     28
     29        (WebUserContentURLPattern::isValid):
     30        (WebUserContentURLPattern::scheme):
     31        (WebUserContentURLPattern::host):
     32        (WebUserContentURLPattern::matchesSubdomains):
     33        Call through to UserContentURLPattern.
     34
     35        * WebUserContentURLPattern.h: Added.
     36
    1372010-04-14  Adam Roben  <aroben@apple.com>
    238

  • trunk/WebKit/win/Interfaces/WebKit.idl

    r57615 r57680  
    135135#include "IWebUndoManager.idl"
    136136#include "IWebUndoTarget.idl"
     137#include "IWebUserContentURLPattern.idl"
    137138#include "IWebView.idl"
    138139#include "IWebViewPrivate.idl"
    … …  
    294295        [default] interface IWebGeolocationPosition;
    295296    }
     297
     298    [uuid(2D62AE25-DEAA-4945-A76E-CCE05E899664)]
     299    coclass WebUserContentURLPattern {
     300        [default] interface IWebUserContentURLPattern;
     301    }
    296302}

  • trunk/WebKit/win/WebKit.vcproj/Interfaces.vcproj

    r54078 r57680  
    16651665                </File>
    16661666                <File
     1667                        RelativePath="..\Interfaces\IWebUserContentURLPattern.idl"
     1668                        >
     1669                        <FileConfiguration
     1670                                Name="Debug|Win32"
     1671                                ExcludedFromBuild="true"
     1672                                >
     1673                                <Tool
     1674                                        Name="VCMIDLTool"
     1675                                />
     1676                        </FileConfiguration>
     1677                        <FileConfiguration
     1678                                Name="Release|Win32"
     1679                                ExcludedFromBuild="true"
     1680                                >
     1681                                <Tool
     1682                                        Name="VCMIDLTool"
     1683                                />
     1684                        </FileConfiguration>
     1685                </File>
     1686                <File
    16671687                        RelativePath="..\Interfaces\IWebView.idl"
    16681688                        >

  • trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj

    r57336 r57680  
    847847                        </File>
    848848                        <File
     849                                RelativePath="..\WebUserContentURLPattern.h"
     850                                >
     851                        </File>
     852                        <File
    849853                                RelativePath="..\WebView.h"
    850854                                >
    … …  
    12561260                        <File
    12571261                                RelativePath="..\WebURLResponse.cpp"
     1262                                >
     1263                        </File>
     1264                        <File
     1265                                RelativePath="..\WebUserContentURLPattern.cpp"
    12581266                                >
    12591267                        </File>
Note: See TracChangeset for help on using the changeset viewer.