Merge pull request #781 from mbunger/master

Chrome on Android is supporting WebGL since v. 30
This commit is contained in:
pandamicro
2016-06-15 11:40:44 +08:00
committed by GitHub
+10 -2
View File
@@ -306,7 +306,6 @@ sys.EDITOR_PAGE = 102;
* @default 103
*/
sys.EDITOR_CORE = 103;
/**
* BROWSER_TYPE_WECHAT
* @property {String} BROWSER_TYPE_WECHAT
@@ -689,12 +688,13 @@ else {
}
if (_supportWebGL && sys.os === sys.OS_ANDROID) {
var browserVer = parseFloat(sys.browserVersion);
switch (sys.browserType) {
case sys.BROWSER_TYPE_MOBILE_QQ:
case sys.BROWSER_TYPE_BAIDU:
case sys.BROWSER_TYPE_BAIDU_APP:
// QQ & Baidu Brwoser 6.2+ (using blink kernel)
var browserVer = parseFloat(sys.browserVersion);
if (browserVer >= 6.2) {
_supportWebGL = true;
}
@@ -708,6 +708,14 @@ else {
_supportWebGL = true;
}
break;
case sys.BROWSER_TYPE_CHROME:
// Chrome on android supports WebGL from v. 30
if(browserVer >= 30.0) {
_supportWebGL = true;
} else {
_supportWebGL = false;
}
break;
case sys.BROWSER_TYPE_UNKNOWN:
case sys.BROWSER_TYPE_360:
case sys.BROWSER_TYPE_MIUI: