Backout changeset 28aab9d91f12 (Bug 916071)

This commit is contained in:
Makoto Kato 2013-09-24 12:55:46 +09:00
parent ddce009986
commit 41da4e36b5
3 changed files with 2 additions and 3 deletions

View File

@ -1715,7 +1715,7 @@ skip-if(B2G) == 751012-1a.html 751012-1-ref.html
skip-if(B2G) == 751012-1b.html 751012-1-ref.html
random-if(Android) == 753329-1.html about:blank
== 758561-1.html 758561-1-ref.html
fuzzy-if(true,1,19) fails-if(d2d&&!remoteFX) random-if(Android&&AndroidVersion<15) == 759036-1.html 759036-1-ref.html
fuzzy-if(true,1,19) fails-if(d2d) random-if(Android&&AndroidVersion<15) == 759036-1.html 759036-1-ref.html
fuzzy-if(true,17,5860) random-if(Android&&AndroidVersion<15) == 759036-2.html 759036-2-ref.html
== 776265-1a.html 776265-1-ref.html
== 776265-1b.html 776265-1-ref.html

View File

@ -15,7 +15,7 @@ HTTP(..) != font-features-hlig.html font-features-ref.html
# compare Turkish rendering with reference using ZWNJ to break the ligature
# (also works via Pango)
fails-if(d2d&&!remoteFX) HTTP(..) == font-features-turkish.html font-features-turkish-ref.html
fails-if(d2d) HTTP(..) == font-features-turkish.html font-features-turkish-ref.html
# compare Turkish rendering with explicitly disabled ligatures
HTTP(..) == font-features-turkish.html font-features-noliga.html

View File

@ -584,7 +584,6 @@ function BuildConditionSandbox(aURL) {
sandbox.azureQuartz = info.AzureCanvasBackend == "quartz";
sandbox.azureSkia = info.AzureCanvasBackend == "skia";
sandbox.azureSkiaGL = info.AzureSkiaAccelerated; // FIXME: assumes GL right now
sandbox.remoteFX = gfxInfo.adapterVendorID == "0x1414";
// true if we are using the same Azure backend for rendering canvas and content
sandbox.contentSameGfxBackendAsCanvas = info.AzureContentBackend == info.AzureCanvasBackend
|| (info.AzureContentBackend == "none" && info.AzureCanvasBackend == "cairo");