Changeset 166742 in webkit
- Timestamp:
- Apr 3, 2014 2:03:48 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r166741 r166742 1 2014-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 1 16 2014-04-02 Simon Fraser <simon.fraser@apple.com> 2 17 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h
r166560 r166742 37 37 WKNavigationActionPolicyCancel, 38 38 WKNavigationActionPolicyAllow, 39 WKNavigationActionPolicyDownload,40 39 41 40 // FIXME: Remove this. 42 41 WKNavigationPolicyDecisionCancel = WKNavigationActionPolicyCancel, 43 42 WKNavigationPolicyDecisionAllow = WKNavigationActionPolicyAllow, 44 WKNavigationPolicyDecisionDownload = WKNavigationActionPolicyDownload,45 43 }; 46 44 … … 51 49 WKNavigationResponsePolicyCancel, 52 50 WKNavigationResponsePolicyAllow, 53 WKNavigationResponsePolicyBecomeDownload,54 51 55 52 // FIXME: Remove this. 56 53 WKNavigationResponsePolicyDecisionCancel = WKNavigationResponsePolicyCancel, 57 54 WKNavigationResponsePolicyDecisionAllow = WKNavigationResponsePolicyAllow, 58 WKNavigationResponsePolicyDecisionBecomeDownload = WKNavigationResponsePolicyBecomeDownload,59 55 }; 60 56 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
r164146 r166742 29 29 #if WK_API_ENABLED 30 30 31 static const WKNavigationActionPolicy _WKNavigationActionPolicyDownload = (WKNavigationActionPolicy)(WKNavigationActionPolicyAllow + 1); 32 33 static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownload = (WKNavigationResponsePolicy)(WKNavigationResponsePolicyAllow + 1); 34 31 35 @protocol WKNavigationDelegatePrivate <WKNavigationDelegate> 32 36 -
trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm
r166623 r166742 270 270 break; 271 271 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 273 277 listener->download(); 274 278 break; … … 311 315 break; 312 316 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 314 322 listener->download(); 315 323 break; -
trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm
r166470 r166742 34 34 #import <WebKit2/_WKDownload.h> 35 35 #import <WebKit2/_WKDownloadDelegate.h> 36 #import <WebKit2/WKNavigationDelegate .h>36 #import <WebKit2/WKNavigationDelegatePrivate.h> 37 37 #import <WebKit2/WKProcessPoolPrivate.h> 38 38 #import <WebKit2/WKWebView.h> … … 136 136 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler 137 137 { 138 decisionHandler( WKNavigationPolicyDecisionDownload);138 decisionHandler(_WKNavigationActionPolicyDownload); 139 139 } 140 140 @end … … 151 151 - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler 152 152 { 153 decisionHandler( WKNavigationResponsePolicyDecisionBecomeDownload);153 decisionHandler(_WKNavigationResponsePolicyBecomeDownload); 154 154 } 155 155 @end
Note: See TracChangeset
for help on using the changeset viewer.