Changeset 164315 in webkit


Ignore:
Timestamp:
Feb 18, 2014 2:23:13 PM (10 years ago)
Author:
andersca@apple.com
Message:

Add SPI for getting the original URL from a WKNavigationAction
​https://bugs.webkit.org/show_bug.cgi?id=128997

Reviewed by Tim Horton.

  • UIProcess/API/Cocoa/WKNavigationActionInternal.h:
  • UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h.
  • UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r164313 r164315  
     12014-02-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Add SPI for getting the original URL from a WKNavigationAction
     4        https://bugs.webkit.org/show_bug.cgi?id=128997
     5
     6        Reviewed by Tim Horton.
     7
     8        * UIProcess/API/Cocoa/WKNavigationActionInternal.h:
     9        * UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h.
     10        * UIProcess/Cocoa/NavigationState.mm:
     11        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
     12        * WebKit2.xcodeproj/project.pbxproj:
     13
    1142014-02-18  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h

    r163997 r164315  
    2424 */
    2525
    26 #import "WKNavigationAction.h"
     26#import "WKNavigationActionPrivate.h"
    2727
    2828#if WK_API_ENABLED
    … …  
    3636@property (nonatomic, readwrite, copy) NSURLRequest *request;
    3737
     38@property (nonatomic, readwrite, copy, setter=_setOriginalURL:) NSURL *_originalURL;
     39
    3840@end
    3941

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h

    r164313 r164315  
    2424 */
    2525
    26 #import "WKNavigationAction.h"
     26#import <WebKit2/WKNavigationAction.h>
    2727
    2828#if WK_API_ENABLED
    2929
    30 @interface WKNavigationAction ()
     30@interface WKNavigationAction (WKPrivate)
    3131
    32 @property (nonatomic, readwrite, strong) WKFrameInfo *sourceFrame;
    33 @property (nonatomic, readwrite, strong) WKFrameInfo *destinationFrame;
    34 
    35 @property (nonatomic, readwrite) WKNavigationType navigationType;
    36 @property (nonatomic, readwrite, copy) NSURLRequest *request;
     32@property (nonatomic, readonly) NSURL *_originalURL;
    3733
    3834@end

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

    r164258 r164315  
    255255    [navigationAction setNavigationType:toWKNavigationType(navigationActionData.navigationType)];
    256256    [navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
     257    [navigationAction _setOriginalURL:originalRequest.url()];
    257258
    258259    [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction.get() decisionHandler:[listener](WKNavigationPolicyDecision policyDecision) {

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

    r164271 r164315  
    371371                1AF1AC6B1651759E00C17D7F /* RemoteLayerTreeTransaction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF1AC691651759E00C17D7F /* RemoteLayerTreeTransaction.mm */; };
    372372                1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */; };
     373                1AF4129B18B40FCD00546FDC /* WKNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    373374                1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3141891B54000153970 /* APIPolicyClient.h */; };
    374375                1AFDD3171891C94700153970 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3161891C94700153970 /* WKPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    14431444                EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A22F1001289FCD90085E74F /* WKBundlePageOverlay.cpp */; };
    14441445                F036978815F4BF0500C3A80E /* WebColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F036978715F4BF0500C3A80E /* WebColorPicker.cpp */; };
    1445                 F036978B15F4BF1300C3A80E /* WebColorPickerResultListenerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F036978915F4BF1300C3A80E /* WebColorPickerResultListenerProxy.cpp */; };
    14461446                F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */; };
    14471447                F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
    … …  
    20572057                1AF1AC691651759E00C17D7F /* RemoteLayerTreeTransaction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreeTransaction.mm; sourceTree = "<group>"; };
    20582058                1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeTransaction.h; sourceTree = "<group>"; };
     2059                1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationActionPrivate.h; sourceTree = "<group>"; };
    20592060                1AFDD3141891B54000153970 /* APIPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPolicyClient.h; sourceTree = "<group>"; };
    20602061                1AFDD3161891C94700153970 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
    … …  
    43664367                                1A256E3518A1A788006FB922 /* WKNavigationAction.mm */,
    43674368                                1A256E3918A1A7DF006FB922 /* WKNavigationActionInternal.h */,
     4369                                1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */,
    43684370                                1ABC3DFB1899F51C004F0626 /* WKNavigationDelegate.h */,
    43694371                                1AA20D5018AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h */,
    … …  
    65196521                                1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */,
    65206522                                1A4D664E18A3031B00D82E21 /* WKFrameInfoInternal.h in Headers */,
     6523                                1AF4129B18B40FCD00546FDC /* WKNavigationActionPrivate.h in Headers */,
    65216524                                1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */,
    65226525                                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.