Changeset 73267 in webkit


Ignore:
Timestamp:
Dec 3, 2010 9:30:57 AM (13 years ago)
Author:
jberlin@webkit.org
Message:

Need a WebKit2 Equivalent of WebSecurityOrigin
https://bugs.webkit.org/show_bug.cgi?id=50170

Reviewed by Sam Weinig.

WebCore:

  • WebCore.exp.in:

Export the symbol for SecurityOrigin::createFromDatabaseIdentifier.

WebKit2:

  • Shared/API/c/WKBase.h:

Add the WKSecurityOriginRef typedef.

  • Shared/APIObject.h:

Add the SecurityOrigin type as a Shared type.

  • Shared/API/c/WKSharedAPICast.h::

Add the mapping between WKSecurityOriginRef and WebSecurityOrigin.

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

(WKSecurityOriginGetTypeID):
(WKSecurityOriginCreate):
(WKSecurityOriginGetProtocol):
(WKSecurityOriginGetHost):
(WKSecurityOriginGetPort):

  • UIProcess/API/C/WKSecurityOrigin.h: Added.
  • UIProcess/WebSecurityOrigin.h: Added.

(WebKit::WebSecurityOrigin::create):
Create based on the database identifier, which contains the protocol, host and port.
(WebKit::WebSecurityOrigin::protocol):
(WebKit::WebSecurityOrigin::host):
(WebKit::WebSecurityOrigin::port):
(WebKit::WebSecurityOrigin::databaseIdentifier):
(WebKit::WebSecurityOrigin::WebSecurityOrigin):
(WebKit::WebSecurityOrigin::type):

  • WebKit2.pro:

Add WKSecurityOrigin.cpp/.h.

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

Add the WebSecurityOrigin.h and WKSecurityOrigin.cpp/.h.

  • win/WebKit2Generated.make:

Make sure WKSecurityOrigin.h file gets copied over to the WebKitBuild directory on Windows.

Location:
trunk
Files:
3 added
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r73266 r73267  
     12010-12-03  Jessie Berlin  <jberlin@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Need a WebKit2 Equivalent of WebSecurityOrigin
     6        https://bugs.webkit.org/show_bug.cgi?id=50170
     7
     8        * WebCore.exp.in:
     9        Export the symbol for SecurityOrigin::createFromDatabaseIdentifier.
     10
    1112010-12-03  Andras Becsi  <abecsi@inf.u-szeged.hu>
    212
  • trunk/WebCore/WebCore.exp.in

    r73088 r73267  
    323323__ZN7WebCore14SchemeRegistry32registerURLSchemeAsEmptyDocumentERKN3WTF6StringE
    324324__ZN7WebCore14SecurityOrigin14threadsafeCopyEv
     325__ZN7WebCore14SecurityOrigin28createFromDatabaseIdentifierERKN3WTF6StringE
    325326__ZN7WebCore14SecurityOrigin16createFromStringERKN3WTF6StringE
    326327__ZN7WebCore14SecurityOrigin18setLocalLoadPolicyENS0_15LocalLoadPolicyE
  • trunk/WebKit2/ChangeLog

    r73221 r73267  
     12010-12-03  Jessie Berlin  <jberlin@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Need a WebKit2 Equivalent of WebSecurityOrigin
     6        https://bugs.webkit.org/show_bug.cgi?id=50170
     7
     8        * Shared/API/c/WKBase.h:
     9        Add the WKSecurityOriginRef typedef.
     10
     11        * Shared/APIObject.h:
     12        Add the SecurityOrigin type as a Shared type.
     13
     14        * Shared/API/c/WKSharedAPICast.h::
     15        Add the mapping between WKSecurityOriginRef and WebSecurityOrigin.
     16
     17        * UIProcess/API/C/WKSecurityOrigin.cpp: Added.
     18        (WKSecurityOriginGetTypeID):
     19        (WKSecurityOriginCreate):
     20        (WKSecurityOriginGetProtocol):
     21        (WKSecurityOriginGetHost):
     22        (WKSecurityOriginGetPort):
     23        * UIProcess/API/C/WKSecurityOrigin.h: Added.
     24
     25        * UIProcess/WebSecurityOrigin.h: Added.
     26        (WebKit::WebSecurityOrigin::create):
     27        Create based on the database identifier, which contains the protocol, host and port.
     28        (WebKit::WebSecurityOrigin::protocol):
     29        (WebKit::WebSecurityOrigin::host):
     30        (WebKit::WebSecurityOrigin::port):
     31        (WebKit::WebSecurityOrigin::databaseIdentifier):
     32        (WebKit::WebSecurityOrigin::WebSecurityOrigin):
     33        (WebKit::WebSecurityOrigin::type):
     34
     35        * WebKit2.pro:
     36        Add WKSecurityOrigin.cpp/.h.
     37
     38        * WebKit2.xcodeproj/project.pbxproj:
     39        * win/WebKit2.vcproj:
     40        Add the WebSecurityOrigin.h and WKSecurityOrigin.cpp/.h.
     41
     42        * win/WebKit2Generated.make:
     43        Make sure WKSecurityOrigin.h file gets copied over to the WebKitBuild directory on Windows.
     44
    1452010-12-02  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    246
  • trunk/WebKit2/Shared/API/c/WKBase.h

    r73066 r73267  
    5050typedef const struct OpaqueWKError* WKErrorRef;
    5151typedef const struct OpaqueWKCertificateInfo* WKCertificateInfoRef;
     52typedef const struct OpaqueWKSecurityOrigin* WKSecurityOriginRef;
    5253typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
    5354typedef const struct OpaqueWKString* WKStringRef;
  • trunk/WebKit2/Shared/API/c/WKSharedAPICast.h

    r72937 r73267  
    5353class WebContextMenuItem;
    5454class WebData;
     55class WebSecurityOrigin;
    5556class WebSerializedScriptValue;
    5657class WebURLRequest;
     
    7576WK_ADD_API_MAPPING(WKMutableArrayRef, MutableArray)
    7677WK_ADD_API_MAPPING(WKMutableDictionaryRef, MutableDictionary)
     78WK_ADD_API_MAPPING(WKSecurityOriginRef, WebSecurityOrigin)
    7779WK_ADD_API_MAPPING(WKSerializedScriptValueRef, WebSerializedScriptValue)
    7880WK_ADD_API_MAPPING(WKStringRef, WebString)
  • trunk/WebKit2/Shared/APIObject.h

    r73066 r73267  
    4242        TypeDictionary,
    4343        TypeError,
     44        TypeSecurityOrigin,
    4445        TypeSerializedScriptValue,
    4546        TypeString,
  • trunk/WebKit2/WebKit2.pro

    r73154 r73267  
    215215    Shared/API/c/WKGeometry.h \
    216216    Shared/API/c/WKNumber.h \
     217    Shared/API/c/WKSecurityOrigin.h \
    217218    Shared/API/c/WKSerializedScriptValue.h \
    218219    Shared/API/c/WKSharedAPICast.h \
     
    407408    Shared/API/c/WKContextMenuItem.cpp \
    408409    Shared/API/c/WKNumber.cpp \
     410    Shared/API/c/WKSecurityOrigin.cpp \
    409411    Shared/API/c/WKSerializedScriptValue.cpp \
    410412    Shared/API/c/WKString.cpp \
  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r73154 r73267  
    558558                F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
    559559                F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Public, ); }; };
     560                F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* WebSecurityOrigin.h */; };
     561                F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */; };
     562                F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445B12A885E9000612D8 /* WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Public, ); }; };
    560563                F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    561564/* End PBXBuildFile section */
     
    11781181                F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
    11791182                F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
     1183                F634445512A885C8000612D8 /* WebSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSecurityOrigin.h; sourceTree = "<group>"; };
     1184                F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOrigin.cpp; sourceTree = "<group>"; };
     1185                F634445B12A885E9000612D8 /* WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOrigin.h; sourceTree = "<group>"; };
    11801186                F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
    11811187/* End PBXFileReference section */
     
    14991505                                BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
    15001506                                BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
     1507                                F634445512A885C8000612D8 /* WebSecurityOrigin.h */,
    15011508                                A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
    15021509                                BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
     
    21542161                                BC4075E5124FF0270068F20A /* WKNumber.cpp */,
    21552162                                BC4075E6124FF0270068F20A /* WKNumber.h */,
     2163                                F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */,
     2164                                F634445B12A885E9000612D8 /* WKSecurityOrigin.h */,
    21562165                                BC4075E7124FF0270068F20A /* WKSerializedScriptValue.cpp */,
    21572166                                BC4075E8124FF0270068F20A /* WKSerializedScriptValue.h */,
     
    25202529                                BC7B633D12A45D1200D174A4 /* WKBundlePageGroup.h in Headers */,
    25212530                                37F623B812A57B6200E3FDF6 /* WKFindOptions.h in Headers */,
     2531                                F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */,
     2532                                F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */,
    25222533                        );
    25232534                        runOnlyForDeploymentPostprocessing = 0;
     
    29152926                                BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */,
    29162927                                BC2DFBA312A761A500E732A3 /* WebPreferencesCF.cpp in Sources */,
     2928                                F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */,
    29172929                        );
    29182930                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/WebKit2/win/WebKit2.vcproj

    r73154 r73267  
    612612                        </File>
    613613                        <File
     614                                RelativePath="..\Shared\WebSecurityOrigin.h"
     615                                >
     616                        </File>
     617                        <File
    614618                                RelativePath="..\Shared\WebSerializedScriptValue.h"
    615619                                >
     
    752756                                <File
    753757                                        RelativePath="..\Shared\API\c\WKNumber.h"
     758                                        >
     759                                </File>
     760                                <File
     761                                        RelativePath="..\Shared\API\c\WKSecurityOrigin.cpp"
     762                                        >
     763                                </File>
     764                                <File
     765                                        RelativePath="..\Shared\API\c\WKSecurityOrigin.h"
    754766                                        >
    755767                                </File>
  • trunk/WebKit2/win/WebKit2Generated.make

    r73066 r73267  
    2222    xcopy /y /d "..\Shared\API\c\WKMutableDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
    2323    xcopy /y /d "..\Shared\API\c\WKNumber.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
     24    xcopy /y /d "..\Shared\API\C\WKSecurityOrigin.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
    2425    xcopy /y /d "..\Shared\API\c\WKSerializedScriptValue.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
    2526    xcopy /y /d "..\Shared\API\c\WKSerializedScriptValuePrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
Note: See TracChangeset for help on using the changeset viewer.