corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 4ca40a403e9d (bug 1249640) for XPCshell failures on OSX. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst
2016-02-24 19:02:10 +01:00
parent 34b2891e04
commit ce5aa61e4c
5 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml
View File

@@ -285,20 +285,5 @@
<driverVersionComparator> BETWEEN_INCLUSIVE_START </driverVersionComparator> <driverVersionComparator> BETWEEN_INCLUSIVE_START </driverVersionComparator>
</gfxBlacklistEntry> </gfxBlacklistEntry>
<gfxBlacklistEntry>
<os>All</os>
<vendor>0xdcdc</vendor>
<devices>
<device>0x2783</device>
<device>0x1234</device>
<device>0x2782</device>
</devices>
<feature> CANVAS2D_ACCELERATION </feature>
<featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
<driverVersion> 8.52.322.1000 </driverVersion>
<driverVersionMax> 9.52.322.1000 </driverVersionMax>
<driverVersionComparator> BETWEEN_EXCLUSIVE </driverVersionComparator>
</gfxBlacklistEntry>
</gfxItems> </gfxItems>
</blocklist> </blocklist>

3
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js
View File

@@ -80,9 +80,6 @@ function run_test() {
status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_9_LAYERS); status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT3D_9_LAYERS);
do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK); do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_CANVAS2D_ACCELERATION);
do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
gTestserver.stop(do_test_finished); gTestserver.stop(do_test_finished);
} }

3
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js
View File

@@ -107,9 +107,6 @@ function run_test() {
status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBGL_ANGLE); status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBGL_ANGLE);
do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK); do_check_eq(status, Ci.nsIGfxInfo.FEATURE_STATUS_OK);
status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_CANVAS2D_ACCELERATION);
do_check_eq(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DRIVER_VERSION);
gTestserver.stop(do_test_finished); gTestserver.stop(do_test_finished);
} }

5
widget/GfxInfoBase.cpp
View File

@@ -153,8 +153,6 @@ GetPrefNameForFeature(int32_t aFeature)
case nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION_DECODE: case nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION_DECODE:
name = BLACKLIST_PREF_BRANCH "webrtc.hw.acceleration.decode"; name = BLACKLIST_PREF_BRANCH "webrtc.hw.acceleration.decode";
break; break;
case nsIGfxInfo::FEATURE_CANVAS2D_ACCELERATION:
name = BLACKLIST_PREF_BRANCH "canvas2d.acceleration";
default: default:
break; break;
} }
@@ -352,8 +350,6 @@ BlacklistFeatureToGfxFeature(const nsAString& aFeature)
return nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION_DECODE; return nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION_DECODE;
else if (aFeature.EqualsLiteral("WEBRTC_HW_ACCELERATION")) else if (aFeature.EqualsLiteral("WEBRTC_HW_ACCELERATION"))
return nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION; return nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION;
else if (aFeature.EqualsLiteral("CANVAS2D_ACCELERATION"))
return nsIGfxInfo::FEATURE_CANVAS2D_ACCELERATION;
// If we don't recognize the feature, it may be new, and something // If we don't recognize the feature, it may be new, and something
// this version doesn't understand. So, nothing to do. This is // this version doesn't understand. So, nothing to do. This is
@@ -999,7 +995,6 @@ GfxInfoBase::EvaluateDownloadedBlacklist(nsTArray<GfxDriverInfo>& aDriverInfo)
nsIGfxInfo::FEATURE_WEBGL_MSAA, nsIGfxInfo::FEATURE_WEBGL_MSAA,
nsIGfxInfo::FEATURE_STAGEFRIGHT, nsIGfxInfo::FEATURE_STAGEFRIGHT,
nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION, nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION,
nsIGfxInfo::FEATURE_CANVAS2D_ACCELERATION,
0 0
}; };

2
widget/nsIGfxInfo.idl
View File

@@ -106,8 +106,6 @@ interface nsIGfxInfo : nsISupports
const long FEATURE_WEBRTC_HW_ACCELERATION_ENCODE = 14; const long FEATURE_WEBRTC_HW_ACCELERATION_ENCODE = 14;
/* Whether Webrtc Hardware acceleration is supported, starting in 42. */ /* Whether Webrtc Hardware acceleration is supported, starting in 42. */
const long FEATURE_WEBRTC_HW_ACCELERATION_DECODE = 15; const long FEATURE_WEBRTC_HW_ACCELERATION_DECODE = 15;
/* Whether Canvas acceleration is supported, starting in 45 */
const long FEATURE_CANVAS2D_ACCELERATION = 16;
/* /*
* A set of return values from GetFeatureStatus * A set of return values from GetFeatureStatus