Title: [112959] branches/safari-534.56-branch/Source/WebKit2
Diff
Modified: branches/safari-534.56-branch/Source/WebKit2/ChangeLog (112958 => 112959)
--- branches/safari-534.56-branch/Source/WebKit2/ChangeLog 2012-04-02 23:04:24 UTC (rev 112958)
+++ branches/safari-534.56-branch/Source/WebKit2/ChangeLog 2012-04-02 23:15:00 UTC (rev 112959)
@@ -1,3 +1,18 @@
+2012-04-02 Mark Rowe <[email protected]>
+
+ Merge r112801.
+
+ 2012-03-31 Anders Carlsson <[email protected]>
+
+ 32-bit plug-ins need to opt into magnified mode
+ https://bugs.webkit.org/show_bug.cgi?id=82837
+ <rdar://problem/9104840>
+
+ Reviewed by Simon Fraser.
+
+ * PluginProcess/mac/PluginProcessMainMac.mm:
+ (WebKit::PluginProcessMain):
+
2012-03-16 Lucas Forschler <[email protected]>
Merge 106977
Modified: branches/safari-534.56-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm (112958 => 112959)
--- branches/safari-534.56-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-04-02 23:04:24 UTC (rev 112958)
+++ branches/safari-534.56-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-04-02 23:15:00 UTC (rev 112959)
@@ -33,6 +33,7 @@
#import "NetscapePluginModule.h"
#import "PluginProcess.h"
#import "RunLoop.h"
+#import <Foundation/NSUserDefaults.h>
#import <WebKitSystemInterface.h>
#import <runtime/InitializeThreading.h>
#import <servers/bootstrap.h>
@@ -85,6 +86,11 @@
if (cfLocalization)
WKSetDefaultLocalization(cfLocalization.get());
+#if defined(__i386__)
+ NSDictionary *defaults = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:@"AppleMagnifiedMode"];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
+#endif
+
#if !SHOW_CRASH_REPORTER
// Installs signal handlers that exit on a crash so that CrashReporter does not show up.
signal(SIGILL, _exit);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
