Changeset 171816 in webkit


Ignore:
Timestamp:
Jul 30, 2014 2:03:31 PM (10 years ago)
Author:
mitz@apple.com
Message:

Get rid of the WKNSURLProtectionSpace wrapper
​https://bugs.webkit.org/show_bug.cgi?id=135425

Reviewed by Sam Weinig.

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject): Don’t allocate WKNSURLProtectionSpace wrappers.

  • Shared/Cocoa/WKNSURLProtectionSpace.h: Removed.
  • Shared/Cocoa/WKNSURLProtectionSpace.mm: Removed.
  • UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(canAuthenticateAgainstProtectionSpaceInFrame): Get the NSURLProtectionSpace from the
WebCore::ProtectionSpace in the WebProtectionSpace.

  • UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame): Ditto.

  • WebKit2.xcodeproj/project.pbxproj: Removed references to removed files.
Location:
trunk/Source/WebKit2
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r171801 r171816  
     12014-07-30  Dan Bernstein  <mitz@apple.com>
     2
     3        Get rid of the WKNSURLProtectionSpace wrapper
     4        https://bugs.webkit.org/show_bug.cgi?id=135425
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Shared/Cocoa/APIObject.mm:
     9        (API::Object::newObject): Don’t allocate WKNSURLProtectionSpace wrappers.
     10
     11        * Shared/Cocoa/WKNSURLProtectionSpace.h: Removed.
     12        * Shared/Cocoa/WKNSURLProtectionSpace.mm: Removed.
     13
     14        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     15        (canAuthenticateAgainstProtectionSpaceInFrame): Get the NSURLProtectionSpace from the
     16        WebCore::ProtectionSpace in the WebProtectionSpace.
     17
     18        * UIProcess/Cocoa/NavigationState.mm:
     19        (WebKit::NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame): Ditto.
     20
     21        * WebKit2.xcodeproj/project.pbxproj: Removed references to removed files.
     22
    1232014-07-30  Dan Bernstein  <mitz@apple.com>
    224

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

    r169807 r171816  
    4141#import "WKNSURL.h"
    4242#import "WKNSURLAuthenticationChallenge.h"
    43 #import "WKNSURLProtectionSpace.h"
    4443#import "WKNSURLRequest.h"
    4544#import "WKNavigationDataInternal.h"
    … …  
    137136        break;
    138137
    139     case Type::ProtectionSpace:
    140         wrapper = NSAllocateObject([WKNSURLProtectionSpace class], size, nullptr);
    141         break;
    142 
    143138    case Type::Session:
    144139        wrapper = [_WKWebsiteDataStore alloc];

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r170870 r171816  
    4646#import "WKNSURLAuthenticationChallenge.h"
    4747#import "WKNSURLExtras.h"
    48 #import "WKNSURLProtectionSpace.h"
    4948#import "WKPagePolicyClientInternal.h"
    5049#import "WKProcessGroupPrivate.h"
    … …  
    5756#import "WebContext.h"
    5857#import "WebPageProxy.h"
     58#import "WebProtectionSpace.h"
    5959#import "_WKRemoteObjectRegistryInternal.h"
    6060#import <wtf/NeverDestroyed.h>
    … …  
    498498
    499499    if ([loadDelegate respondsToSelector:@selector(browsingContextController:canAuthenticateAgainstProtectionSpace:)])
    500         return [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextController:browsingContext canAuthenticateAgainstProtectionSpace:wrapper(*toImpl(protectionSpace))];
     500        return [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextController:browsingContext canAuthenticateAgainstProtectionSpace:toImpl(protectionSpace)->protectionSpace().nsSpace()];
    501501
    502502    return false;

  • trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

    r171801 r171816  
    4242#import "WKNSURLAuthenticationChallenge.h"
    4343#import "WKNSURLExtras.h"
    44 #import "WKNSURLProtectionSpace.h"
    4544#import "WKNSURLRequest.h"
    4645#import "WKNavigationActionInternal.h"
    … …  
    5554#import "WebPageProxy.h"
    5655#import "WebProcessProxy.h"
     56#import "WebProtectionSpace.h"
    5757#import "_WKErrorRecoveryAttempting.h"
    5858#import "_WKFrameHandleInternal.h"
    … …  
    701701        return false;
    702702
    703     return [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView canAuthenticateAgainstProtectionSpace:wrapper(*protectionSpace)];
     703    return [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView canAuthenticateAgainstProtectionSpace:protectionSpace->protectionSpace().nsSpace()];
    704704}
    705705

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

    r171626 r171816  
    709709                371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371A193F1824D29300F32A5E /* WKNSDictionary.mm */; };
    710710                371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 371A19401824D29300F32A5E /* WKNSDictionary.h */; };
    711                 371B32DD184D67490013E2B2 /* WKNSURLProtectionSpace.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371B32DB184D67480013E2B2 /* WKNSURLProtectionSpace.mm */; };
    712                 371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 371B32DC184D67490013E2B2 /* WKNSURLProtectionSpace.h */; };
    713711                372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 372CAF091833FD910040AC27 /* WKNSError.h */; };
    714712                372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 372CAF0A1833FD910040AC27 /* WKNSError.mm */; };
    … …  
    27282726                371A193F1824D29300F32A5E /* WKNSDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSDictionary.mm; sourceTree = "<group>"; };
    27292727                371A19401824D29300F32A5E /* WKNSDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSDictionary.h; sourceTree = "<group>"; };
    2730                 371B32DB184D67480013E2B2 /* WKNSURLProtectionSpace.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLProtectionSpace.mm; sourceTree = "<group>"; };
    2731                 371B32DC184D67490013E2B2 /* WKNSURLProtectionSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSURLProtectionSpace.h; sourceTree = "<group>"; };
    27322728                372CAF091833FD910040AC27 /* WKNSError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSError.h; sourceTree = "<group>"; };
    27332729                372CAF0A1833FD910040AC27 /* WKNSError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSError.mm; sourceTree = "<group>"; };
    … …  
    51155111                                37183D55182F4E700080C811 /* WKNSURLExtras.h */,
    51165112                                37183D54182F4E700080C811 /* WKNSURLExtras.mm */,
    5117                                 371B32DC184D67490013E2B2 /* WKNSURLProtectionSpace.h */,
    5118                                 371B32DB184D67480013E2B2 /* WKNSURLProtectionSpace.mm */,
    51195113                                37BF2F041947DEB400723C48 /* WKNSURLRequest.h */,
    51205114                                37BF2F051947DEB400723C48 /* WKNSURLRequest.mm */,
    … …  
    71287122                                528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */,
    71297123                                2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */,
    7130                                 371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */,
    71317124                                2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */,
    71327125                                C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */,
    … …  
    89718964                                2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */,
    89728965                                2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
    8973                                 371B32DD184D67490013E2B2 /* WKNSURLProtectionSpace.mm in Sources */,
    89748966                                BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
    89758967                                1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.