Title: [171733] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171733
- Author
- [email protected]
- Date
- 2014-07-29 01:38:33 -0700 (Tue, 29 Jul 2014)
Log Message
Merged r171706. <rdar://problem/17295639>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171732 => 171733)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-29 08:36:44 UTC (rev 171732)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-29 08:38:33 UTC (rev 171733)
@@ -1,5 +1,23 @@
2014-07-29 Lucas Forschler <[email protected]>
+ Merge r171706
+
+ 2014-07-28 Roger Fong <[email protected]>
+
+ Disable tagged strings for the plugin process.
+ https://bugs.webkit.org/show_bug.cgi?id=135354
+ <rdar://problem/17295639>.
+
+ Patch by Alexey Proskuryakov and Roger Fong.
+
+ Reviewed by Anders Carlsson.
+
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToReExecService):
+
+2014-07-29 Lucas Forschler <[email protected]>
+
Merge r171704
2014-07-25 Jeffrey Pfau <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (171732 => 171733)
--- branches/safari-600.1-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2014-07-29 08:36:44 UTC (rev 171732)
+++ branches/safari-600.1-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2014-07-29 08:38:33 UTC (rev 171733)
@@ -50,6 +50,8 @@
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
<string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
+ <key>NSStringDisableTagged</key>
+ <string>YES</string>
</dict>
</dict>
</dict>
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (171732 => 171733)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-07-29 08:36:44 UTC (rev 171732)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-07-29 08:38:33 UTC (rev 171733)
@@ -290,6 +290,13 @@
EnvironmentVariables environmentVariables;
addDYLDEnvironmentAdditions(launchOptions, true, environmentVariables);
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if (launchOptions.processType == ProcessLauncher::PluginProcess) {
+ // Tagged pointers break video in Flash, see bug 135354.
+ environmentVariables.set("NSStringDisableTagged", "YES");
+ }
+#endif
+
// Generate the uuid for the service instance we are about to create.
// FIXME: This UUID should be stored on the ChildProcessProxy.
RefPtr<UUIDHolder> instanceUUID = UUIDHolder::create();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
