Bug 1132745 part 2: Add Mozilla China team's requested additional domains to CSSUnprefixingService whitelist. r=miketaylr
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 05 May 2015 09:04:23 -0700
changeset 273824 169878ee34f9743fca175a4a8e783e025c13df4d
parent 273823 80b09ba3d52e42c43cb831df5dd192680e5ca663
child 273825 10c0adba47eba848f17dd4538fd73bd640e454ee
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmiketaylr
bugs1132745
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1132745 part 2: Add Mozilla China team's requested additional domains to CSSUnprefixingService whitelist. r=miketaylr
caps/nsPrincipal.cpp
--- a/caps/nsPrincipal.cpp
+++ b/caps/nsPrincipal.cpp
@@ -640,16 +640,26 @@ IsOnFullDomainWhitelist(nsIURI* aURI)
     NS_LITERAL_CSTRING("map.baidu.com"),
     NS_LITERAL_CSTRING("3g.163.com"),
     NS_LITERAL_CSTRING("3glogo.gtimg.com"), // for 3g.163.com
     NS_LITERAL_CSTRING("info.3g.qq.com"), // for 3g.qq.com
     NS_LITERAL_CSTRING("3gimg.qq.com"), // for 3g.qq.com
     NS_LITERAL_CSTRING("img.m.baidu.com"), // for [shucheng|ks].baidu.com
     NS_LITERAL_CSTRING("m.mogujie.com"),
     NS_LITERAL_CSTRING("touch.qunar.com"),
+    NS_LITERAL_CSTRING("mjs.sinaimg.cn"), // for sina.cn
+    NS_LITERAL_CSTRING("static.qiyi.com"), // for m.iqiyi.com
+    NS_LITERAL_CSTRING("www.kuaidi100.com"), // for m.kuaidi100.com
+    NS_LITERAL_CSTRING("m.pc6.com"),
+    NS_LITERAL_CSTRING("m.haosou.com"),
+    NS_LITERAL_CSTRING("m.mi.com"),
+    NS_LITERAL_CSTRING("wappass.baidu.com"),
+    NS_LITERAL_CSTRING("m.video.baidu.com"),
+    NS_LITERAL_CSTRING("m.video.baidu.com"),
+    NS_LITERAL_CSTRING("imgcache.gtimg.cn"), // for m.v.qq.com
   };
   static const size_t sNumFullDomainsOnWhitelist =
     MOZ_ARRAY_LENGTH(sFullDomainsOnWhitelist);
 
   // Skip 0th (dummy) entry in whitelist, unless a pref is enabled.
   const size_t firstWhitelistIdx = IsWhitelistingTestDomains() ? 0 : 1;
 
   for (size_t i = firstWhitelistIdx; i < sNumFullDomainsOnWhitelist; ++i) {