Title: [150101] trunk
- Revision
- 150101
- Author
- bda...@apple.com
- Date
- 2013-05-14 21:35:26 -0700 (Tue, 14 May 2013)
Log Message
Printing in 1Password app is broken with screen fonts disabled
https://bugs.webkit.org/show_bug.cgi?id=116133
-and corresponding-
<rdar://problem/13162981>
Reviewed by Anders Carlsson.
Source/WebKit/mac:
Return YES from [WebPreferences screenFontSubstitutionEnabled] for versions of the
1Password app that were linked on or before MountainLion.
* WebView/WebPreferences.mm:
(needsScreenFontsEnabledQuirk):
(-[WebPreferences screenFontSubstitutionEnabled]):
WebKitLibraries:
Need WKExecutableWasLinkedOnOrBeforeMountainLion() for this quirk.
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceMountainLion.a:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (150100 => 150101)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-15 04:27:42 UTC (rev 150100)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-15 04:35:26 UTC (rev 150101)
@@ -1,3 +1,19 @@
+2013-05-14 Beth Dakin <bda...@apple.com>
+
+ Printing in 1Password app is broken with screen fonts disabled
+ https://bugs.webkit.org/show_bug.cgi?id=116133
+ -and corresponding-
+ <rdar://problem/13162981>
+
+ Reviewed by Anders Carlsson.
+
+ Return YES from [WebPreferences screenFontSubstitutionEnabled] for versions of the
+ 1Password app that were linked on or before MountainLion.
+
+ * WebView/WebPreferences.mm:
+ (needsScreenFontsEnabledQuirk):
+ (-[WebPreferences screenFontSubstitutionEnabled]):
+
2013-05-13 Dan Bernstein <m...@apple.com>
Make -[WebNavigationData url] the destination of the navigation
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (150100 => 150101)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2013-05-15 04:27:42 UTC (rev 150100)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2013-05-15 04:35:26 UTC (rev 150101)
@@ -1777,8 +1777,21 @@
[self _setBoolValue:enabled forKey:WebKitDiagnosticLoggingEnabledKey];
}
+static bool needsScreenFontsEnabledQuirk()
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ static bool is1PasswordNeedingScreenFontsQuirk = WKExecutableWasLinkedOnOrBeforeMountainLion()
+ && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"ws.agile.1Password"];
+ return is1PasswordNeedingScreenFontsQuirk;
+#else
+ return NO;
+#endif
+}
+
- (BOOL)screenFontSubstitutionEnabled
{
+ if (needsScreenFontsEnabledQuirk())
+ return YES;
return [self _boolValueForKey:WebKitScreenFontSubstitutionEnabledKey];
}
Modified: trunk/WebKitLibraries/ChangeLog (150100 => 150101)
--- trunk/WebKitLibraries/ChangeLog 2013-05-15 04:27:42 UTC (rev 150100)
+++ trunk/WebKitLibraries/ChangeLog 2013-05-15 04:35:26 UTC (rev 150101)
@@ -1,3 +1,17 @@
+2013-05-14 Beth Dakin <bda...@apple.com>
+
+ Printing in 1Password app is broken with screen fonts disabled
+ https://bugs.webkit.org/show_bug.cgi?id=116133
+ -and corresponding-
+ <rdar://problem/13162981>
+
+ Reviewed by Anders Carlsson.
+
+ Need WKExecutableWasLinkedOnOrBeforeMountainLion() for this quirk.
+
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceMountainLion.a:
+
2013-05-08 Roger Fong <roger_f...@apple.com>
Unreviewed. Update WebKitLibraries/win to handle different architectures properly.
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
(Binary files differ)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes