Changeset 159991 in webkit


Ignore:
Timestamp:
Dec 2, 2013, 8:25:07 PM (11 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] WebProtectionSpace has a generic wrapper
​https://bugs.webkit.org/show_bug.cgi?id=125125

Reviewed by Anders Carlsson.

Added WKNSURLProtectionSpace.

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject): Allocate a WKNSURLProtectionSpace if the object is a
WebProtectionSpace.

  • Shared/Cocoa/WKNSURLProtectionSpace.h: Added.

(WebKit::wrapper): Added. Returns a WebProtecitonSpace’s wrapper as an NSURLProtectionSpace.

  • Shared/Cocoa/WKNSURLProtectionSpace.mm: Added.

(-[WKNSURLProtectionSpace copyWithZone:]): Retains self.

  • UIProcess/Authentication/WebProtectionSpace.h:

(WebKit::WebProtectionSpace::protectionSpace): Added an accessor for the
WebCore::ProtectionSpace.

  • WebKit2.xcodeproj/project.pbxproj: Added references to new files.
Location:
trunk/Source/WebKit2
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r159988 r159991  
     12013-12-02  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] WebProtectionSpace has a generic wrapper
     4        https://bugs.webkit.org/show_bug.cgi?id=125125
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Added WKNSURLProtectionSpace.
     9
     10        * Shared/Cocoa/APIObject.mm:
     11        (API::Object::newObject): Allocate a WKNSURLProtectionSpace if the object is a
     12        WebProtectionSpace.
     13        * Shared/Cocoa/WKNSURLProtectionSpace.h: Added.
     14        (WebKit::wrapper): Added. Returns a WebProtecitonSpace’s wrapper as an NSURLProtectionSpace.
     15        * Shared/Cocoa/WKNSURLProtectionSpace.mm: Added.
     16        (-[WKNSURLProtectionSpace copyWithZone:]): Retains self.
     17        * UIProcess/Authentication/WebProtectionSpace.h:
     18        (WebKit::WebProtectionSpace::protectionSpace): Added an accessor for the
     19        WebCore::ProtectionSpace.
     20        * WebKit2.xcodeproj/project.pbxproj: Added references to new files.
     21
    1222013-12-02  Anders Carlsson  <andersca@apple.com>
    223

  • trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm

    r159877 r159991  
    3838#import "WKNSString.h"
    3939#import "WKNSURL.h"
     40#import "WKNSURLProtectionSpace.h"
    4041#import "WKNavigationDataInternal.h"
    4142#import "WKProcessGroupInternal.h"
    … …  
    9899        break;
    99100
     101    case Type::ProtectionSpace:
     102        wrapper = NSAllocateObject([WKNSURLProtectionSpace class], size, nullptr);
     103        break;
     104
    100105    case Type::String:
    101106        wrapper = NSAllocateObject([WKNSString class], size, nullptr);

  • trunk/Source/WebKit2/UIProcess/Authentication/WebProtectionSpace.h

    r159197 r159991  
    4949    WebCore::ProtectionSpaceAuthenticationScheme authenticationScheme() const;
    5050
     51    const WebCore::ProtectionSpace& protectionSpace() const { return m_coreProtectionSpace; }
     52
    5153private:
    5254    explicit WebProtectionSpace(const WebCore::ProtectionSpace&);

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

    r159983 r159991  
    437437                371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371A193F1824D29300F32A5E /* WKNSDictionary.mm */; };
    438438                371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 371A19401824D29300F32A5E /* WKNSDictionary.h */; };
     439                371B32DD184D67490013E2B2 /* WKNSURLProtectionSpace.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371B32DB184D67480013E2B2 /* WKNSURLProtectionSpace.mm */; };
     440                371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 371B32DC184D67490013E2B2 /* WKNSURLProtectionSpace.h */; };
    439441                372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 372CAF091833FD910040AC27 /* WKNSError.h */; };
    440442                372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 372CAF0A1833FD910040AC27 /* WKNSError.mm */; };
    … …  
    19771979                371A193F1824D29300F32A5E /* WKNSDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSDictionary.mm; sourceTree = "<group>"; };
    19781980                371A19401824D29300F32A5E /* WKNSDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSDictionary.h; sourceTree = "<group>"; };
     1981                371B32DB184D67480013E2B2 /* WKNSURLProtectionSpace.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLProtectionSpace.mm; sourceTree = "<group>"; };
     1982                371B32DC184D67490013E2B2 /* WKNSURLProtectionSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSURLProtectionSpace.h; sourceTree = "<group>"; };
    19791983                372CAF091833FD910040AC27 /* WKNSError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSError.h; sourceTree = "<group>"; };
    19801984                372CAF0A1833FD910040AC27 /* WKNSError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSError.mm; sourceTree = "<group>"; };
    … …  
    38223826                                37183D55182F4E700080C811 /* WKNSURLExtras.h */,
    38233827                                37183D54182F4E700080C811 /* WKNSURLExtras.mm */,
     3828                                371B32DC184D67490013E2B2 /* WKNSURLProtectionSpace.h */,
     3829                                371B32DB184D67480013E2B2 /* WKNSURLProtectionSpace.mm */,
    38243830                                378E1A3F181EDA010031007A /* WKObject.h */,
    38253831                                374436871820E7240049579F /* WKObject.mm */,
    … …  
    56065612                                2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */,
    56075613                                865E0485181A094A001F72F2 /* ViewState.h in Headers */,
     5614                                371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */,
    56085615                                2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */,
    56095616                                29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */,
    … …  
    70727079                                2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */,
    70737080                                2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
     7081                                371B32DD184D67490013E2B2 /* WKNSURLProtectionSpace.mm in Sources */,
    70747082                                BCF505E81243047B005955AE /* CertificateInfo.mm in Sources */,
    70757083                                BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.