Title: [186775] tags/Safari-601.1.40/Source/WebKit2
- Revision
- 186775
- Author
- bshaf...@apple.com
- Date
- 2015-07-13 13:07:53 -0700 (Mon, 13 Jul 2015)
Log Message
Merged r186770. rdar://problem/21686508
Modified Paths
Diff
Modified: tags/Safari-601.1.40/Source/WebKit2/ChangeLog (186774 => 186775)
--- tags/Safari-601.1.40/Source/WebKit2/ChangeLog 2015-07-13 20:05:47 UTC (rev 186774)
+++ tags/Safari-601.1.40/Source/WebKit2/ChangeLog 2015-07-13 20:07:53 UTC (rev 186775)
@@ -1,3 +1,19 @@
+2015-07-13 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r186770.
+
+ 2015-07-13 Anders Carlsson <ander...@apple.com>
+
+ Silverlight causes tabs to hang
+ https://bugs.webkit.org/show_bug.cgi?id=146912
+ rdar://problem/21686508
+
+ Reviewed by Sam Weinig.
+
+ Make sure to link production builds of the legacy plug-in process against the shim on 10.11 and newer.
+
+ * Configurations/PluginProcess.xcconfig:
+
2015-07-12 Babak Shafiei <bshaf...@apple.com>
Merge r186712.
Modified: tags/Safari-601.1.40/Source/WebKit2/Configurations/PluginProcess.xcconfig (186774 => 186775)
--- tags/Safari-601.1.40/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-07-13 20:05:47 UTC (rev 186774)
+++ tags/Safari-601.1.40/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-07-13 20:07:53 UTC (rev 186775)
@@ -27,6 +27,12 @@
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(LDFLAGS_SHIM_$(CONFIGURATION));
+
+LDFLAGS_SHIM_Production[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
+LDFLAGS_SHIM_Production[sdk=macosx10.9*] = ;
+LDFLAGS_SHIM_Production[sdk=macosx10.10*] = ;
+
EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
SKIP_INSTALL[sdk=iphone*] = YES;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
