Title: [260089] branches/safari-610.1.10-branch/Source/WebKitLegacy/mac
- Revision
- 260089
- Author
- alanc...@apple.com
- Date
- 2020-04-14 12:14:35 -0700 (Tue, 14 Apr 2020)
Log Message
Cherry-pick r260043. rdar://problem/61784032
REGRESSION (r259843): "Missing Plug-In" when dragging an image into Mail Compose
https://bugs.webkit.org/show_bug.cgi?id=210458
<rdar://problem/61735361>
Reviewed by Wenson Hsieh.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::createPlugin):
r259843 changed this code from making a dictionary with a set of key->object mappings
to making a dictionary with an array of keys as its only key and an array of objects
as that key's value. Not quite the same thing.
Go back to dictionaryWithObjects:forKeys:.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260043 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.10-branch/Source/WebKitLegacy/mac/ChangeLog (260088 => 260089)
--- branches/safari-610.1.10-branch/Source/WebKitLegacy/mac/ChangeLog 2020-04-14 19:12:50 UTC (rev 260088)
+++ branches/safari-610.1.10-branch/Source/WebKitLegacy/mac/ChangeLog 2020-04-14 19:14:35 UTC (rev 260089)
@@ -1,3 +1,40 @@
+2020-04-14 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r260043. rdar://problem/61784032
+
+ REGRESSION (r259843): "Missing Plug-In" when dragging an image into Mail Compose
+ https://bugs.webkit.org/show_bug.cgi?id=210458
+ <rdar://problem/61735361>
+
+ Reviewed by Wenson Hsieh.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::createPlugin):
+ r259843 changed this code from making a dictionary with a set of key->object mappings
+ to making a dictionary with an array of keys as its only key and an array of objects
+ as that key's value. Not quite the same thing.
+
+ Go back to dictionaryWithObjects:forKeys:.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260043 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-13 Tim Horton <timothy_hor...@apple.com>
+
+ REGRESSION (r259843): "Missing Plug-In" when dragging an image into Mail Compose
+ https://bugs.webkit.org/show_bug.cgi?id=210458
+ <rdar://problem/61735361>
+
+ Reviewed by Wenson Hsieh.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::createPlugin):
+ r259843 changed this code from making a dictionary with a set of key->object mappings
+ to making a dictionary with an array of keys as its only key and an array of objects
+ as that key's value. Not quite the same thing.
+
+ Go back to dictionaryWithObjects:forKeys:.
+
2020-04-11 Wenson Hsieh <wenson_hs...@apple.com>
[macOS] [WK1] Touch Bar flashes when typing in Vietnamese in Mail
Modified: branches/safari-610.1.10-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (260088 => 260089)
--- branches/safari-610.1.10-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2020-04-14 19:12:50 UTC (rev 260088)
+++ branches/safari-610.1.10-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2020-04-14 19:14:35 UTC (rev 260089)
@@ -1918,7 +1918,7 @@
#if PLATFORM(MAC)
SEL selector = @selector(webView:plugInViewWithArguments:);
if ([[webView UIDelegate] respondsToSelector:selector]) {
- NSDictionary *attributes = @{ attributeKeys.get(): createNSArray(paramValues).get() };
+ NSDictionary *attributes = [NSDictionary dictionaryWithObjects:createNSArray(paramValues).get() forKeys:attributeKeys.get()];
NSDictionary *arguments = [[NSDictionary alloc] initWithObjectsAndKeys:
attributes, WebPlugInAttributesKey,
@(loadManually ? WebPlugInModeFull : WebPlugInModeEmbed), WebPlugInModeKey,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
