907254 - reftest.js doesnt need anymore to avoid using GfxInfo on B2G

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Don't special-case B2G anymore regarding GfxInfo

Now that we have GfxInfo on B2G, reftest.js can use it, so it can get the right variables (like azureSkiaGL) correctly set up on B2G too, allowing to pass reftests there.

Comment 1

[Benoit Jacob [:bjacob] (mostly away)]

Comment on attachment 792890 [details] [diff] [review]
Don't special-case B2G anymore regarding GfxInfo

oops... accidentally committed unwanted changes.

Comment 2

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Don't special-case B2G anymore regarding GfxInfo

Comment 3

[Benoit Jacob [:bjacob] (mostly away)]

Comment on attachment 792890 [details] [diff] [review]
Don't special-case B2G anymore regarding GfxInfo

># HG changeset patch
># Parent cdff2e0daee9380a923a17c590d3b498ed40e28f
>diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
>--- a/layout/tools/reftest/reftest.js
>+++ b/layout/tools/reftest/reftest.js
>@@ -533,38 +533,29 @@ function BuildConditionSandbox(aURL) {
>     }
> 
>     var testRect = gBrowser.getBoundingClientRect();
>     sandbox.smallScreen = false;
>     if (gContainingWindow.innerWidth < 800 || gContainingWindow.innerHeight < 1000) {
>         sandbox.smallScreen = true;
>     }
> 
>-#if REFTEST_B2G
>-    // XXX nsIGfxInfo isn't available in B2G
>-    sandbox.d2d = false;
>-    sandbox.azureQuartz = false;
>-    sandbox.azureSkia = false;
>-    sandbox.azureSkiaGL = false;
>-    sandbox.contentSameGfxBackendAsCanvas = false;
>-#else
>     var gfxInfo = (NS_GFXINFO_CONTRACTID in CC) && CC[NS_GFXINFO_CONTRACTID].getService(CI.nsIGfxInfo);
>     try {
>       sandbox.d2d = gfxInfo.D2DEnabled;
>     } catch (e) {
>       sandbox.d2d = false;
>     }
>     var info = gfxInfo.getInfo();
>     sandbox.azureQuartz = info.AzureCanvasBackend == "quartz";
>     sandbox.azureSkia = info.AzureCanvasBackend == "skia";
>     sandbox.azureSkiaGL = info.AzureSkiaAccelerated; // FIXME: assumes GL right now
>     // 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");
>-#endif
> 
>     sandbox.layersGPUAccelerated =
>       gWindowUtils.layerManagerType != "Basic";
>     sandbox.layersOpenGL =
>       gWindowUtils.layerManagerType == "OpenGL";
>     sandbox.layersOMTC =
>       gWindowUtils.layerManagerRemote == true;
> 
>diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
>--- a/testing/mochitest/android.json
>+++ b/testing/mochitest/android.json
>@@ -1,10 +1,12 @@
> {
>-"runtests": {},
>+"runtests": {
>+ "content/canvas/test"
>+},
> "excludetests": {
>  "content/base/test/test_bug166235.html": "",
>  "content/base/test/test_bug338583.html": "",
>  "content/base/test/test_bug466080.html": "",
>  "content/base/test/test_bug475156.html": "bug 855762",
>  "content/base/test/test_bug482935.html": "bug 855762",
>  "content/base/test/test_bug503481.html": "TIMED_OUT",
>  "content/base/test/test_bug503481b.html": "TIMED_OUT",

Comment 4

[Benoit Jacob [:bjacob] (mostly away)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/fd2a749d5a32

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/fd2a749d5a32