Modified: trunk/Tools/ChangeLog (154804 => 154805)
--- trunk/Tools/ChangeLog 2013-08-29 04:03:05 UTC (rev 154804)
+++ trunk/Tools/ChangeLog 2013-08-29 06:11:10 UTC (rev 154805)
@@ -1,3 +1,15 @@
+2013-08-28 Alexey Proskuryakov <[email protected]>
+
+ [WK2][Mac] WebKitTestRunner doesn't force system appearance
+ https://bugs.webkit.org/show_bug.cgi?id=120437
+
+ Reviewed by Darin Adler.
+
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WTR::InjectedBundle::platformInitialize): Set AppleAquaColorVariant,
+ AppleHighlightColor and AppleOtherHighlightColor to the same values that DRT uses.
+ Fixed formatting.
+
2013-08-16 Ryosuke Niwa <[email protected]>
<https://webkit.org/b/119806> [Mac] Add a way to easily test attributed string generation
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (154804 => 154805)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2013-08-29 04:03:05 UTC (rev 154804)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2013-08-29 06:11:10 UTC (rev 154805)
@@ -39,17 +39,23 @@
void InjectedBundle::platformInitialize(WKTypeRef)
{
+ static const int NoFontSmoothing = 0;
+ static const int BlueTintedAppearance = 1;
+
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInteger:4], @"AppleAntiAliasingThreshold",
- [NSNumber numberWithInteger:0], @"AppleFontSmoothing",
+ [NSNumber numberWithInteger:4], @"AppleAntiAliasingThreshold",
+ [NSNumber numberWithInteger:NoFontSmoothing], @"AppleFontSmoothing",
+ [NSNumber numberWithInteger:BlueTintedAppearance], @"AppleAquaColorVariant",
+ @"0.709800 0.835300 1.000000", @"AppleHighlightColor",
+ @"0.500000 0.500000 0.500000", @"AppleOtherHighlightColor",
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
- [NSNumber numberWithBool:NO], @"NSScrollAnimationEnabled",
+ [NSNumber numberWithBool:NO], @"NSScrollAnimationEnabled",
#else
- [NSNumber numberWithBool:NO], @"AppleScrollAnimationEnabled",
+ [NSNumber numberWithBool:NO], @"AppleScrollAnimationEnabled",
#endif
- [NSNumber numberWithBool:NO], @"NSOverlayScrollersEnabled",
- @"Always", @"AppleShowScrollBars",
- [NSArray arrayWithObject:@"en"], @"AppleLanguages",
+ [NSNumber numberWithBool:NO], @"NSOverlayScrollersEnabled",
+ @"Always", @"AppleShowScrollBars",
+ [NSArray arrayWithObject:@"en"], @"AppleLanguages",
[NSDictionary dictionaryWithObjectsAndKeys:@"notational", @"notationl", nil], @"NSTestCorrectionDictionary",
nil];
