Title: [238290] trunk/Source/WebKit
- Revision
- 238290
- Author
- cdu...@apple.com
- Date
- 2018-11-16 11:00:50 -0800 (Fri, 16 Nov 2018)
Log Message
WebKit.UnavailablePlugIn API test is crashing in debug
https://bugs.webkit.org/show_bug.cgi?id=191753
Reviewed by Alex Christensen.
Add missing early returns. Those were mistakenly dropped in r235200.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::NavigationClient::decidePolicyForPluginLoad):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (238289 => 238290)
--- trunk/Source/WebKit/ChangeLog 2018-11-16 18:52:59 UTC (rev 238289)
+++ trunk/Source/WebKit/ChangeLog 2018-11-16 19:00:50 UTC (rev 238290)
@@ -1,5 +1,17 @@
2018-11-16 Chris Dumez <cdu...@apple.com>
+ WebKit.UnavailablePlugIn API test is crashing in debug
+ https://bugs.webkit.org/show_bug.cgi?id=191753
+
+ Reviewed by Alex Christensen.
+
+ Add missing early returns. Those were mistakenly dropped in r235200.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::NavigationClient::decidePolicyForPluginLoad):
+
+2018-11-16 Chris Dumez <cdu...@apple.com>
+
[Mac] Regression: WebContent process's display name is no longer set
https://bugs.webkit.org/show_bug.cgi?id=191722
<rdar://problem/45960550>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (238289 => 238290)
--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2018-11-16 18:52:59 UTC (rev 238289)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2018-11-16 19:00:50 UTC (rev 238290)
@@ -362,12 +362,16 @@
void NavigationState::NavigationClient::decidePolicyForPluginLoad(WebKit::WebPageProxy&, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, API::Dictionary& pluginInformation, CompletionHandler<void(WebKit::PluginModuleLoadPolicy, const String&)>&& completionHandler)
{
- if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler)
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForPluginLoadWithCurrentPolicyPluginInfoCompletionHandler) {
completionHandler(currentPluginLoadPolicy, { });
+ return;
+ }
auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
- if (!navigationDelegate)
+ if (!navigationDelegate) {
completionHandler(currentPluginLoadPolicy, { });
+ return;
+ }
auto checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(_webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:completionHandler:));
[(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView decidePolicyForPluginLoadWithCurrentPolicy:wkPluginModuleLoadPolicy(currentPluginLoadPolicy) pluginInfo:wrapper(pluginInformation) completionHandler:BlockPtr<void(_WKPluginModuleLoadPolicy, NSString *)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)](_WKPluginModuleLoadPolicy policy, NSString *unavailabilityDescription) mutable {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
