Title: [170322] trunk/Source/WebKit2
- Revision
- 170322
- Author
- [email protected]
- Date
- 2014-06-23 14:40:06 -0700 (Mon, 23 Jun 2014)
Log Message
Policy delegate methods should use CompletionHandlerCallChecker
https://bugs.webkit.org/show_bug.cgi?id=134215
Reviewed by Dan Bernstein.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
(WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170321 => 170322)
--- trunk/Source/WebKit2/ChangeLog 2014-06-23 21:33:34 UTC (rev 170321)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-23 21:40:06 UTC (rev 170322)
@@ -1,5 +1,16 @@
2014-06-23 Anders Carlsson <[email protected]>
+ Policy delegate methods should use CompletionHandlerCallChecker
+ https://bugs.webkit.org/show_bug.cgi?id=134215
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+ (WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
+
+2014-06-23 Anders Carlsson <[email protected]>
+
Don't use the WK prefix for internal C++ types
https://bugs.webkit.org/show_bug.cgi?id=134214
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (170321 => 170322)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-06-23 21:33:34 UTC (rev 170321)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-06-23 21:40:06 UTC (rev 170322)
@@ -305,7 +305,10 @@
[navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
[navigationAction _setOriginalURL:originalRequest.url()];
- [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction.get() decisionHandler:[listener](WKNavigationActionPolicy actionPolicy) {
+ RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(webView:decidePolicyForNavigationAction:decisionHandler:));
+ [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction.get() decisionHandler:[listener, checker](WKNavigationActionPolicy actionPolicy) {
+ checker->didCallCompletionHandler();
+
switch (actionPolicy) {
case WKNavigationActionPolicyAllow:
listener->use();
@@ -364,7 +367,10 @@
[navigationResponse setResponse:resourceResponse.nsURLResponse()];
[navigationResponse setCanShowMIMEType:canShowMIMEType];
- [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationResponse:navigationResponse.get() decisionHandler:[listener](WKNavigationResponsePolicy responsePolicy) {
+ RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(webView:decidePolicyForNavigationResponse:decisionHandler:));
+ [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationResponse:navigationResponse.get() decisionHandler:[listener, checker](WKNavigationResponsePolicy responsePolicy) {
+ checker->didCallCompletionHandler();
+
switch (responsePolicy) {
case WKNavigationResponsePolicyAllow:
listener->use();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
