Changeset 166560 in webkit


Ignore:
Timestamp:
Mar 31, 2014 7:13:27 PM (10 years ago)
Author:
andersca@apple.com
Message:

Rename policy enums to match the delegate methods
​https://bugs.webkit.org/show_bug.cgi?id=131002

Reviewed by Tim Horton.

  • UIProcess/API/Cocoa/WKNavigationDelegate.h:

(NS_ENUM):

  • UIProcess/Cocoa/NavigationState.mm:

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

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r166559 r166560  
     12014-03-31  Anders Carlsson  <andersca@apple.com>
     2
     3        Rename policy enums to match the delegate methods
     4        https://bugs.webkit.org/show_bug.cgi?id=131002
     5
     6        Reviewed by Tim Horton.
     7
     8        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
     9        (NS_ENUM):
     10        * UIProcess/Cocoa/NavigationState.mm:
     11        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
     12        (WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
     13
    1142014-03-31  Anders Carlsson  <andersca@apple.com>
    215

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

    r166338 r166560  
    3434@class WKWebView;
    3535
    36 typedef NS_ENUM(NSInteger, WKNavigationPolicyDecision) {
    37     WKNavigationPolicyDecisionCancel,
    38     WKNavigationPolicyDecisionAllow,
    39     WKNavigationPolicyDecisionDownload
     36typedef NS_ENUM(NSInteger, WKNavigationActionPolicy) {
     37    WKNavigationActionPolicyCancel,
     38    WKNavigationActionPolicyAllow,
     39    WKNavigationActionPolicyDownload,
     40
     41    // FIXME: Remove this.
     42    WKNavigationPolicyDecisionCancel = WKNavigationActionPolicyCancel,
     43    WKNavigationPolicyDecisionAllow = WKNavigationActionPolicyAllow,
     44    WKNavigationPolicyDecisionDownload = WKNavigationActionPolicyDownload,
    4045};
    4146
    42 typedef NS_ENUM(NSInteger, WKNavigationResponsePolicyDecision) {
    43     WKNavigationResponsePolicyDecisionCancel,
    44     WKNavigationResponsePolicyDecisionAllow,
    45     WKNavigationResponsePolicyDecisionBecomeDownload
     47// FIXME: Remove this.
     48typedef WKNavigationActionPolicy WKNavigationPolicyDecision;
     49
     50typedef NS_ENUM(NSInteger, WKNavigationResponsePolicy) {
     51    WKNavigationResponsePolicyCancel,
     52    WKNavigationResponsePolicyAllow,
     53    WKNavigationResponsePolicyBecomeDownload,
     54
     55    // FIXME: Remove this.
     56    WKNavigationResponsePolicyDecisionCancel = WKNavigationResponsePolicyCancel,
     57    WKNavigationResponsePolicyDecisionAllow = WKNavigationResponsePolicyAllow,
     58    WKNavigationResponsePolicyDecisionBecomeDownload = WKNavigationResponsePolicyBecomeDownload,
    4659};
     60
     61// FIXME: Remove this.
     62typedef WKNavigationResponsePolicy WKNavigationResponsePolicyDecision;
    4763
    4864@protocol WKNavigationDelegate <NSObject>
    … …  
    5066@optional
    5167
    52 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
    53 - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler;
     68- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler;
     69- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler;
    5470
    5571- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation;

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

    r166546 r166560  
    262262    [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction.get() decisionHandler:[listener](WKNavigationPolicyDecision policyDecision) {
    263263        switch (policyDecision) {
    264         case WKNavigationPolicyDecisionAllow:
     264        case WKNavigationActionPolicyAllow:
    265265            listener->use();
    266266            break;
    267267
    268         case WKNavigationPolicyDecisionCancel:
     268        case WKNavigationActionPolicyCancel:
    269269            listener->ignore();
    270270            break;
    271271
    272         case WKNavigationPolicyDecisionDownload:
     272        case WKNavigationActionPolicyDownload:
    273273            listener->download();
    274274            break;
    … …  
    303303    [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationResponse:navigationResponse.get() decisionHandler:[listener](WKNavigationResponsePolicyDecision policyDecision) {
    304304        switch (policyDecision) {
    305         case WKNavigationResponsePolicyDecisionAllow:
     305        case WKNavigationResponsePolicyAllow:
    306306            listener->use();
    307307            break;
    308308
    309         case WKNavigationResponsePolicyDecisionCancel:
     309        case WKNavigationResponsePolicyCancel:
    310310            listener->ignore();
    311311            break;
    312312
    313         case WKNavigationResponsePolicyDecisionBecomeDownload:
     313        case WKNavigationResponsePolicyBecomeDownload:
    314314            listener->download();
    315315            break;
Note: See TracChangeset for help on using the changeset viewer.