diff options
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/build/moz.build | 5 | ||||
| -rw-r--r-- | layout/tools/reftest/bootstrap.js | 9 | ||||
| -rw-r--r-- | layout/tools/reftest/reftest.jsm | 8 | ||||
| -rw-r--r-- | layout/tools/reftest/runreftest.py | 7 |
4 files changed, 4 insertions, 25 deletions
diff --git a/layout/build/moz.build b/layout/build/moz.build index a628f3ee2..5b607c171 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -39,7 +39,6 @@ LOCAL_INCLUDES += [ '/dom/jsurl', '/dom/media', '/dom/offline', - '/dom/speakermanager', '/dom/storage', '/dom/svg', '/dom/xbl', @@ -73,10 +72,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': '/dom/system', '/dom/system/android', ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += [ - '/dom/system/gonk', - ] if CONFIG['MOZ_WEBSPEECH']: LOCAL_INCLUDES += [ diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js index c081335c2..18ca74f69 100644 --- a/layout/tools/reftest/bootstrap.js +++ b/layout/tools/reftest/bootstrap.js @@ -33,11 +33,6 @@ var WindowListener = { }; function startup(data, reason) { - // b2g is bootstrapped by b2g_start_script.js - if (Services.appinfo.widgetToolkit == "gonk") { - return; - } - if (Services.appinfo.OS == "Android") { Cm.addBootstrappedManifestLocation(data.installPath); Services.wm.addListener(WindowListener); @@ -66,10 +61,6 @@ function startup(data, reason) { } function shutdown(data, reason) { - if (Services.appinfo.widgetToolkit == "gonk") { - return; - } - if (Services.appinfo.OS == "Android") { Services.wm.removeListener(WindowListener); Cm.removedBootstrappedManifestLocation(data.installPath); diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm index 69d804453..bd9976b0f 100644 --- a/layout/tools/reftest/reftest.jsm +++ b/layout/tools/reftest/reftest.jsm @@ -324,11 +324,7 @@ this.OnRefTestLoad = function OnRefTestLoad(win) if (Services.appinfo.OS == "Android") { let doc; - if (Services.appinfo.widgetToolkit == "gonk") { - doc = gContainingWindow.document.getElementsByTagName("html")[0]; - } else { - doc = gContainingWindow.document.getElementById('main-window'); - } + doc = gContainingWindow.document.getElementById('main-window'); while (doc.hasChildNodes()) { doc.removeChild(doc.firstChild); } @@ -684,7 +680,7 @@ function BuildConditionSandbox(aURL) { gWindowUtils.layerManagerRemote == true; // Shortcuts for widget toolkits. - sandbox.B2G = xr.widgetToolkit == "gonk"; + sandbox.B2G = false; sandbox.Android = xr.OS == "Android" && !sandbox.B2G; sandbox.cocoaWidget = xr.widgetToolkit == "cocoa"; sandbox.gtkWidget = xr.widgetToolkit == "gtk2" diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index e1c20ccd9..7845903bd 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -598,11 +598,8 @@ class RefTest(object): timeout = None signal.signal(signal.SIGINT, lambda sigid, frame: None) - if mozinfo.info.get('appname') == 'b2g' and mozinfo.info.get('toolkit') != 'gonk': - runner_cls = mozrunner.Runner - else: - runner_cls = mozrunner.runners.get(mozinfo.info.get('appname', 'firefox'), - mozrunner.Runner) + runner_cls = mozrunner.runners.get(mozinfo.info.get('appname', 'firefox'), + mozrunner.Runner) runner = runner_cls(profile=profile, binary=binary, process_class=mozprocess.ProcessHandlerMixin, |