Changeset 166742 in webkit


Ignore:
Timestamp:
Apr 3, 2014 2:03:48 PM (10 years ago)
Author:
andersca@apple.com
Message:

Make download policy decisions SPI for now
​https://bugs.webkit.org/show_bug.cgi?id=131179

Reviewed by Sam Weinig.

  • UIProcess/API/Cocoa/WKNavigationDelegate.h:

(NS_ENUM):

  • UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:

(NS_ENUM):

  • UIProcess/Cocoa/NavigationState.mm:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r166741 r166742  
     12014-04-03  Anders Carlsson  <andersca@apple.com>
     2
     3        Make download policy decisions SPI for now
     4        https://bugs.webkit.org/show_bug.cgi?id=131179
     5
     6        Reviewed by Sam Weinig.
     7
     8        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
     9        (NS_ENUM):
     10        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
     11        (NS_ENUM):
     12        * UIProcess/Cocoa/NavigationState.mm:
     13        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
     14        (WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
     15
    1162014-04-02  Simon Fraser  <simon.fraser@apple.com>
    217

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

    r166560 r166742  
    3737    WKNavigationActionPolicyCancel,
    3838    WKNavigationActionPolicyAllow,
    39     WKNavigationActionPolicyDownload,
    4039
    4140    // FIXME: Remove this.
    4241    WKNavigationPolicyDecisionCancel = WKNavigationActionPolicyCancel,
    4342    WKNavigationPolicyDecisionAllow = WKNavigationActionPolicyAllow,
    44     WKNavigationPolicyDecisionDownload = WKNavigationActionPolicyDownload,
    4543};
    4644
    … …  
    5149    WKNavigationResponsePolicyCancel,
    5250    WKNavigationResponsePolicyAllow,
    53     WKNavigationResponsePolicyBecomeDownload,
    5451
    5552    // FIXME: Remove this.
    5653    WKNavigationResponsePolicyDecisionCancel = WKNavigationResponsePolicyCancel,
    5754    WKNavigationResponsePolicyDecisionAllow = WKNavigationResponsePolicyAllow,
    58     WKNavigationResponsePolicyDecisionBecomeDownload = WKNavigationResponsePolicyBecomeDownload,
    5955};
    6056

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

    r164146 r166742  
    2929#if WK_API_ENABLED
    3030
     31static const WKNavigationActionPolicy _WKNavigationActionPolicyDownload = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 1);
     32
     33static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownload = (WKNavigationResponsePolicy)(WKNavigationResponsePolicyAllow + 1);
     34
    3135@protocol WKNavigationDelegatePrivate <WKNavigationDelegate>
    3236

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

    r166623 r166742  
    270270            break;
    271271
    272         case WKNavigationActionPolicyDownload:
     272// FIXME: Once we have a new enough compiler everywhere we don't need to ignore -Wswitch.
     273#pragma clang diagnostic push
     274#pragma clang diagnostic ignored "-Wswitch"
     275        case _WKNavigationActionPolicyDownload:
     276#pragma clang diagnostic pop
    273277            listener->download();
    274278            break;
    … …  
    311315            break;
    312316
    313         case WKNavigationResponsePolicyBecomeDownload:
     317// FIXME: Once we have a new enough compiler everywhere we don't need to ignore -Wswitch.
     318#pragma clang diagnostic push
     319#pragma clang diagnostic ignored "-Wswitch"
     320        case _WKNavigationResponsePolicyBecomeDownload:
     321#pragma clang diagnostic pop
    314322            listener->download();
    315323            break;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm

    r166470 r166742  
    3434#import <WebKit2/_WKDownload.h>
    3535#import <WebKit2/_WKDownloadDelegate.h>
    36 #import <WebKit2/WKNavigationDelegate.h>
     36#import <WebKit2/WKNavigationDelegatePrivate.h>
    3737#import <WebKit2/WKProcessPoolPrivate.h>
    3838#import <WebKit2/WKWebView.h>
    … …  
    136136- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler
    137137{
    138     decisionHandler(WKNavigationPolicyDecisionDownload);
     138    decisionHandler(_WKNavigationActionPolicyDownload);
    139139}
    140140@end
    … …  
    151151- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler
    152152{
    153     decisionHandler(WKNavigationResponsePolicyDecisionBecomeDownload);
     153    decisionHandler(_WKNavigationResponsePolicyBecomeDownload);
    154154}
    155155@end
Note: See TracChangeset for help on using the changeset viewer.