Title: [169031] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (169030 => 169031)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-19 00:45:10 UTC (rev 169030)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-19 00:51:36 UTC (rev 169031)
@@ -1,3 +1,22 @@
+2014-05-18 Lucas Forschler <[email protected]>
+
+ Merge r168976
+
+ 2014-05-16 Brent Fulgham <[email protected]>
+
+ Work around bug in Silverlight
+ https://bugs.webkit.org/show_bug.cgi?id=133004
+
+ Reviewed by Anders Carlsson.
+
+ * PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
+ (WebKit::PluginProcessMainDelegate::doPreInitializationWork): Add low-resolution flag
+ to user defaults prior to NSApplication invocation. This code was moved from
+ PluginProcess::platformInitializeProcess.
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitializeProcess): Move low-resolution flag
+ setting to PluginProcessMainDelegate.
+
2014-05-15 Matthew Hanson <[email protected]>
Merge r168745.
Modified: branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm (169030 => 169031)
--- branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2014-05-19 00:45:10 UTC (rev 169030)
+++ branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2014-05-19 00:51:36 UTC (rev 169031)
@@ -58,6 +58,14 @@
EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/PluginProcessShim.dylib");
#if USE(APPKIT)
+#if defined(__i386__)
+ // We must set the state of AppleMagnifiedMode before NSApplication initialization so that the value will be in
+ // place before Cocoa startup logic runs and caches the value.
+ NSDictionary *defaults = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"AppleMagnifiedMode", nil];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
+ [defaults release];
+#endif
+
// Initialize AppKit.
[NSApplication sharedApplication];
Modified: branches/safari-538.34-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (169030 => 169031)
--- branches/safari-538.34-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-05-19 00:45:10 UTC (rev 169030)
+++ branches/safari-538.34-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-05-19 00:51:36 UTC (rev 169031)
@@ -429,12 +429,6 @@
// allowing plug-ins to change the mouse cursor at any time.
WKEnableSettingCursorWhenInBackground();
-#if defined(__i386__)
- NSDictionary *defaults = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"AppleMagnifiedMode", nil];
- [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
- [defaults release];
-#endif
-
RetainPtr<CFURLRef> pluginURL = adoptCF(CFURLCreateWithFileSystemPath(0, m_pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
if (!pluginURL)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
