Title: [189768] trunk
- Revision
- 189768
- Author
- mmaxfi...@apple.com
- Date
- 2015-09-14 18:21:54 -0700 (Mon, 14 Sep 2015)
Log Message
WebKitTestRunner declarative language setting is broken for iOS
https://bugs.webkit.org/show_bug.cgi?id=149119
Unreviewed.
Tools:
In all of the patches on webkit.org/b/189669, my patch to get this working on iOS was
lost in the final version which got committed. This simply implements the existing
OS X behavior on iOS.
* WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm:
(WTR::InjectedBundle::platformInitialize):
LayoutTests:
* platform/ios-simulator/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (189767 => 189768)
--- trunk/LayoutTests/ChangeLog 2015-09-15 00:58:45 UTC (rev 189767)
+++ trunk/LayoutTests/ChangeLog 2015-09-15 01:21:54 UTC (rev 189768)
@@ -1,3 +1,12 @@
+2015-09-14 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ WebKitTestRunner declarative language setting is broken for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149119
+
+ Unreviewed.
+
+ * platform/ios-simulator/TestExpectations:
+
2015-09-14 Chris Dumez <cdu...@apple.com>
Document.createNodeIterator(null) / Document.createTreeWalker(null) should throw a TypeError
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (189767 => 189768)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-09-15 00:58:45 UTC (rev 189767)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-09-15 01:21:54 UTC (rev 189768)
@@ -2815,6 +2815,3 @@
# -webkit-flex off-by-one px
webkit.org/b/126898 css3/flexbox/image-percent-max-height.html [ ImageOnlyFailure ]
-
-# WebKitTestRunner declarative language setting is broken for iOS
-webkit.org/b/149119 fast/text/international/system-language [ Skip ]
Modified: trunk/Tools/ChangeLog (189767 => 189768)
--- trunk/Tools/ChangeLog 2015-09-15 00:58:45 UTC (rev 189767)
+++ trunk/Tools/ChangeLog 2015-09-15 01:21:54 UTC (rev 189768)
@@ -1,3 +1,17 @@
+2015-09-14 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ WebKitTestRunner declarative language setting is broken for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149119
+
+ Unreviewed.
+
+ In all of the patches on webkit.org/b/189669, my patch to get this working on iOS was
+ lost in the final version which got committed. This simply implements the existing
+ OS X behavior on iOS.
+
+ * WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm:
+ (WTR::InjectedBundle::platformInitialize):
+
2015-09-14 Dewei Zhu <dewei_...@apple.com>
Unreviewed, add myself to committers list.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm (189767 => 189768)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm 2015-09-15 00:58:45 UTC (rev 189767)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm 2015-09-15 01:21:54 UTC (rev 189768)
@@ -35,10 +35,15 @@
void InjectedBundle::platformInitialize(WKTypeRef)
{
- NSDictionary *dict = [NSDictionary dictionary];
+ // Language was set up earlier in main(). Don't clobber it.
+ NSArray *languages = [[[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain] valueForKey:@"AppleLanguages"];
- [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+ RetainPtr<NSMutableDictionary *> dict = adoptNS([[NSMutableDictionary alloc] init]);
+ if (languages)
+ [dict setObject:languages forKey:@"AppleLanguages"];
+ [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict.get() forName:NSArgumentDomain];
+
[NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"localhost"];
[NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"127.0.0.1"];
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
