roytam1/basilisk55
1
0
Fork 0
mirror of https://github.com/roytam1/basilisk55.git synced 2026-05-26 15:02:46 +00:00
Code Issues Projects Releases Wiki Activity

revert most of "Switch working copy to Goanna 4" (https://github.com/MoonchildProductions/moebius/commit/c4895374053ab93b4f365d3e690e99a30ffa1a2f) in order to keep upstream patch applicable

Browse Source
This commit is contained in:
Roy Tam
2019-02-20 00:30:25 +08:00
parent ebfc3f0a8f
commit f63e51e471
4574 changed files with 242120 additions and 238886 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devtools/client/aboutdebugging/test/addons/test-devtools-webextension-nobg/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "test-devtools-webextension-nobg",
"version": "1.0",
"applications": {
"gecko": {
"goanna": {
"id": "test-devtools-webextension-nobg@mozilla.org"
}
}
devtools/client/aboutdebugging/test/addons/test-devtools-webextension/manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "test-devtools-webextension",
"version": "1.0",
"applications": {
"gecko": {
"goanna": {
"id": "test-devtools-webextension@mozilla.org"
}
},
devtools/client/aboutdebugging/test/browser_addons_reload.js
+1 -1
View File
@@ -148,7 +148,7 @@ add_task(function* reloadButtonRefreshesMetadata() {
"name": "Temporary web extension",
"version": "1.0",
"applications": {
"gecko": {
"goanna": {
"id": ADDON_ID
}
}
devtools/client/debugger/new/debugger.js
+1 -1
View File
@@ -11350,7 +11350,7 @@ var Debugger =
this._clients.get(aPacket.from)._onThreadState(aPacket);
}
// TODO: Bug 1151156 - Remove once Goanna 40 is on b2g-stable.
// TODO: Bug 1151156 - Remove once Gecko 40 is on b2g-stable.
if (!this.traits.noNeedToFakeResumptionOnNavigation) {
// On navigation the server resumes, so the client must resume as well.
// We achieve that by generating a fake resumption packet that triggers
devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon_webext_contentscript/manifest.json
+1 -1
View File
@@ -4,7 +4,7 @@
"description": "test content script sources",
"version": "0.1.0",
"applications": {
"gecko": {
"goanna": {
"id": "test-contentscript-sources@mozilla.com"
}
},
devtools/client/debugger/views/filter-view.js
+1 -1
View File
@@ -294,7 +294,7 @@ FilterView.prototype = {
* The key press listener for the search container.
*/
_onKeyPress: function (e) {
// This attribute is not implemented in Goanna at this time, see bug 680830.
// This attribute is not implemented in Gecko at this time, see bug 680830.
e.char = String.fromCharCode(e.charCode);
// Perform the required action based on the specified operator.
devtools/client/framework/devtools.js
+1 -1
View File
@@ -49,7 +49,7 @@ function DevTools() {
DevTools.prototype = {
// The windowtype of the main window, used in various tools. This may be set
// to something different by other goanna apps.
// to something different by other gecko apps.
chromeWindowType: "navigator:browser",
registerDefaults() {
devtools/client/framework/toolbox-options.xhtml
+1 -1
View File
@@ -173,7 +173,7 @@
<legend>&options.context.advancedSettings;</legend>
<label title="&options.showPlatformData.tooltip;">
<input type="checkbox"
id="devtools-show-goanna-data"
id="devtools-show-gecko-data"
data-pref="devtools.performance.ui.show-platform-data"/>
<span>&options.showPlatformData.label;</span>
</label>
devtools/client/locales/en-US/performance.dtd
+3 -3
View File
@@ -88,10 +88,10 @@
<!ENTITY performanceUI.invertFlameGraph.tooltiptext "Inverting the flame chart displays the profiled call paths starting from the youngest frames and expanding out to the older frames.">
<!-- LOCALIZATION NOTE (performanceUI.showPlatformData): This is the
- label for the checkbox that toggles whether or not Goanna platform data
- label for the checkbox that toggles whether or not Gecko platform data
- is displayed in the profiler. -->
<!ENTITY performanceUI.showPlatformData "Show Goanna Platform Data">
<!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Goanna platform symbols.">
<!ENTITY performanceUI.showPlatformData "Show Gecko Platform Data">
<!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Gecko platform symbols.">
<!-- LOCALIZATION NOTE (performanceUI.showJITOptimizations): This string
- is displayed next to a checkbox determining whether or not JIT optimization data
devtools/client/locales/en-US/performance.properties
+1 -1
View File
@@ -62,7 +62,7 @@ graphs.memory=MB
# These strings are displayed in the categories graph of the Performance Tools,
# as the legend for each block in every bar. These labels should be kept
# AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph.
category.other=Goanna
category.other=Gecko
category.css=Styles
category.js=JIT
category.gc=GC
devtools/client/locales/en-US/toolbox.dtd
+2 -2
View File
@@ -201,9 +201,9 @@
- label for the checkbox that toggles the display of the platform data in the,
- Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
- in about:config, in the options panel. -->
<!ENTITY options.showPlatformData.label "Show Goanna platform data">
<!ENTITY options.showPlatformData.label "Show Gecko platform data">
<!ENTITY options.showPlatformData.tooltip "If you enable this option the JavaScript Profiler reports will include
Goanna platform symbols">
Gecko platform symbols">
<!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
- section. -->
devtools/client/performance/docs/markers.md
+5 -5
View File
@@ -10,11 +10,11 @@
* unsigned short processType;
* boolean isOffMainThread;
The `processType` a GoannaProcessType enum listed in xpcom/build/nsXULAppAPI.h,
The `processType` a GeckoProcessType enum listed in xpcom/build/nsXULAppAPI.h,
specifying if this marker originates in a content, chrome, plugin etc. process.
Additionally, markers may be created from any thread on those processes, and
`isOffMainThread` highights whether or not they're from the main thread. The most
common type of marker is probably going to be from a GoannaProcessType_Content's
common type of marker is probably going to be from a GeckoProcessType_Content's
main thread when debugging content.
## DOMEvent
@@ -39,7 +39,7 @@ elements. Fired via `PresShell::DoReflow`
## Styles
Style markers (labeled as "Recalculating Styles") are triggered when Goanna
Style markers (labeled as "Recalculating Styles") are triggered when Gecko
needs to figure out the computational style of an element. Fired via
`RestyleTracker::DoProcessRestyles` when there are elements to restyle.
@@ -82,7 +82,7 @@ a setTimeout.
There are also many more potential JS causes, some which are just internally
used and won't emit a marker, but the below ones are only of interest to
Goanna hackers, most likely
Gecko hackers, most likely
* "promise thenable"
* "worker runnable"
@@ -181,7 +181,7 @@ serializing/deserializing data off the main thread.
Composite markers trace the actual time an inner composite operation
took on the compositor thread. Currently, these markers are only especially
interesting for Goanna platform developers, and thus disabled by default.
interesting for Gecko platform developers, and thus disabled by default.
## CompositeForwardTransaction
devtools/client/performance/legacy/actors.js
+2 -2
View File
@@ -78,7 +78,7 @@ LegacyProfilerFront.prototype = {
start: Task.async(function* (options = {}) {
// Check for poller status even if the profiler is already active --
// profiler can be activated via `console.profile` or another source, like
// the Goanna Profiler.
// the Gecko Profiler.
if (!this._poller) {
this._poller = new Poller(this._checkProfilerStatus, this._PROFILER_CHECK_TIMER,
false);
@@ -143,7 +143,7 @@ LegacyProfilerFront.prototype = {
// If TEST_PROFILER_FILTER_STATUS defined (via array of fields), filter
// out any field from isActive, used only in tests. Used to filter out
// buffer status fields to simulate older goannas.
// buffer status fields to simulate older geckos.
if (this._target.TEST_PROFILER_FILTER_STATUS) {
data = Object.keys(data).reduce((acc, prop) => {
if (this._target.TEST_PROFILER_FILTER_STATUS.indexOf(prop) === -1) {
devtools/client/performance/legacy/front.js
+2 -2
View File
@@ -76,7 +76,7 @@ const LegacyPerformanceFront = Class({
// Sets `this._profiler`, `this._timeline`.
// Only initialize the timeline fronts if the respective actors
// are available. Older Goanna versions don't have existing implementations,
// are available. Older Gecko versions don't have existing implementations,
// in which case all the methods we need can be easily mocked.
yield this._connectActors();
yield this._registerListeners();
@@ -277,7 +277,7 @@ const LegacyPerformanceFront = Class({
// All actors are started asynchronously over the remote debugging protocol.
// Get the corresponding start times from each one of them.
// The timeline actors are target-dependent, so start those as well,
// even though these are mocked in older Goannas (FF < 35)
// even though these are mocked in older Geckos (FF < 35)
let profilerStart = this._profiler.start(options);
let timelineStart = this._timeline.start(options);
devtools/client/performance/modules/marker-formatters.js
+2 -2
View File
@@ -11,7 +11,7 @@ const { Ci } = require("chrome");
const { L10N, PREFS } = require("devtools/client/performance/modules/global");
// String used to fill in platform data when it should be hidden.
const GOANNA_SYMBOL = "(Goanna)";
const GECKO_SYMBOL = "(Gecko)";
/**
* Mapping of JS marker causes to a friendlier form. Only
@@ -95,7 +95,7 @@ exports.Formatters = {
JSFields: function (marker) {
if ("causeName" in marker && !JS_MARKER_MAP[marker.causeName]) {
let label = PREFS["show-platform-data"] ? marker.causeName : GOANNA_SYMBOL;
let label = PREFS["show-platform-data"] ? marker.causeName : GECKO_SYMBOL;
return {
[L10N.getStr("marker.field.causeName")]: label
};
devtools/client/performance/test/browser_perf-calltree-js-categories.js
+7 -7
View File
@@ -26,7 +26,7 @@ add_task(function* () {
Services.prefs.setBoolPref(UI_SHOW_PLATFORM_DATA_PREF, true);
yield startRecording(panel);
// To show the `Goanna` category in the tree.
// To show the `Gecko` category in the tree.
yield busyWait(100);
yield stopRecording(panel);
@@ -36,23 +36,23 @@ add_task(function* () {
is($(".call-tree-cells-container").hasAttribute("categories-hidden"), false,
"The call tree cells container should show the categories now.");
ok(goannaCategoryPresent($$),
"A category node with the text `Goanna` is displayed in the tree.");
ok(geckoCategoryPresent($$),
"A category node with the text `Gecko` is displayed in the tree.");
// Disable platform data to hide the categories.
Services.prefs.setBoolPref(UI_SHOW_PLATFORM_DATA_PREF, false);
is($(".call-tree-cells-container").getAttribute("categories-hidden"), "",
"The call tree cells container should hide the categories now.");
ok(!goannaCategoryPresent($$),
"A category node with the text `Goanna` doesn't exist in the tree anymore.");
ok(!geckoCategoryPresent($$),
"A category node with the text `Gecko` doesn't exist in the tree anymore.");
yield teardownToolboxAndRemoveTab(panel);
});
function goannaCategoryPresent($$) {
function geckoCategoryPresent($$) {
for (let elem of $$(".call-tree-category")) {
if (elem.textContent.trim() == "Goanna") {
if (elem.textContent.trim() == "Gecko") {
return true;
}
}
devtools/client/performance/test/browser_perf-tree-view-02.js
+1 -1
View File
@@ -88,7 +88,7 @@ add_task(function () {
"The .A node's function cell displays the correct line.");
is($fun(".call-tree-host", $$(".call-tree-item")[1]).textContent.trim(), "foo",
"The .A node's function cell displays the correct host.");
is($fun(".call-tree-category", $$(".call-tree-item")[1]).textContent.trim(), "Goanna",
is($fun(".call-tree-category", $$(".call-tree-item")[1]).textContent.trim(), "Gecko",
"The .A node's function cell displays the correct category.");
ok($$(".call-tree-item")[1].getAttribute("tooltiptext").includes(MANGLED_FN),
devtools/client/performance/test/browser_perf-tree-view-11.js
+1 -1
View File
@@ -40,7 +40,7 @@ function* spawnTest() {
case "C":
ok(!$(".opt-icon", row), "frames without opt data do not have an icon");
break;
case "Goanna":
case "Gecko":
ok(!$(".opt-icon", row), "meta category frames with opt data do not have an icon");
break;
case "(root)":
devtools/client/performance/test/unit/test_marker-utils.js
+1 -1
View File
@@ -70,7 +70,7 @@ add_task(function () {
"Defaults to enum for GC reasons when not L10N'd");
equal(MarkerBlueprintUtils.getMarkerFields(
{ name: "Javascript", causeName: "Some Platform Field" })[0].value, "(Goanna)",
{ name: "Javascript", causeName: "Some Platform Field" })[0].value, "(Gecko)",
"Correctly obfuscates JS markers when platform data is off.");
Services.prefs.setBoolPref(PLATFORM_DATA_PREF, true);
equal(MarkerBlueprintUtils.getMarkerFields(
devtools/client/responsive.html/test/browser/browser_device_change.js
+1 -1
View File
@@ -18,7 +18,7 @@ const testDevice = {
"width": 320,
"height": 570,
"pixelRatio": 5.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "custom",
devtools/client/responsive.html/test/browser/browser_device_modal_submit.js
+1 -1
View File
@@ -11,7 +11,7 @@ const addedDevice = {
"width": 320,
"height": 570,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": false,
"os": "custom",
devtools/client/responsive.html/test/browser/browser_dpr_change.js
+1 -1
View File
@@ -14,7 +14,7 @@ const testDevice = {
"width": 320,
"height": 470,
"pixelRatio": 5.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "custom",
devtools/client/responsive.html/test/browser/browser_touch_device.js
+1 -1
View File
@@ -12,7 +12,7 @@ const testDevice = {
"width": 320,
"height": 470,
"pixelRatio": 5.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "custom",
devtools/client/responsive.html/test/browser/devices.json
+51 -51
View File
@@ -6,7 +6,7 @@
"width": 320,
"height": 570,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -16,7 +16,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch4012X; rv:28.0) Goanna/28.0 Firefox/28.0",
"userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch4012X; rv:28.0) Gecko/28.0 Firefox/28.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -26,7 +26,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch4019X; rv:28.0) Goanna/28.0 Firefox/28.0",
"userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch4019X; rv:28.0) Gecko/28.0 Firefox/28.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -36,7 +36,7 @@
"width": 320,
"height": 480,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch6015X; rv:32.0) Goanna/32.0 Firefox/32.0",
"userAgent": "Mozilla/5.0 (Mobile; ALCATELOneTouch6015X; rv:32.0) Gecko/32.0 Firefox/32.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -46,7 +46,7 @@
"width": 320,
"height": 480,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Goanna) Version/5.0.2 Mobile/8C148 Safari/6533.18.5",
"userAgent": "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5",
"touch": true,
"firefoxOS": false,
"os": "ios"
@@ -56,7 +56,7 @@
"width": 320,
"height": 568,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Goanna) Version/7.0 Mobile/11A465 Safari/9537.53",
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
"touch": true,
"firefoxOS": false,
"os": "ios"
@@ -66,7 +66,7 @@
"width": 320,
"height": 568,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 9_2_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Goanna) Version/9.0 Mobile/13D15 Safari/601.1",
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 9_2_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13D15 Safari/601.1",
"touch": true,
"firefoxOS": false,
"os": "ios",
@@ -77,7 +77,7 @@
"width": 375,
"height": 667,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Goanna) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"touch": true,
"firefoxOS": false,
"os": "ios"
@@ -87,7 +87,7 @@
"width": 414,
"height": 736,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Goanna) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"touch": true,
"firefoxOS": false,
"os": "ios",
@@ -98,7 +98,7 @@
"width": 375,
"height": 667,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Goanna) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"touch": true,
"firefoxOS": false,
"os": "ios",
@@ -109,7 +109,7 @@
"width": 414,
"height": 736,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Goanna) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4",
"touch": true,
"firefoxOS": false,
"os": "ios"
@@ -119,7 +119,7 @@
"width": 360,
"height": 640,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Goanna) Version/10.0.9.2372 Mobile Safari/537.10+",
"userAgent": "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile Safari/537.10+",
"touch": true,
"firefoxOS": false,
"os": "blackberryos"
@@ -129,7 +129,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "android"
@@ -139,7 +139,7 @@
"width": 360,
"height": 640,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "android"
@@ -149,7 +149,7 @@
"width": 320,
"height": 533,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Nexus S Build/GRJ22) AppleWebKit/533.1 (KHTML, like Goanna) Version/4.0 Mobile Safari/533.1",
"userAgent": "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Nexus S Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
"touch": true,
"firefoxOS": true,
"os": "android"
@@ -159,7 +159,7 @@
"width": 384,
"height": 640,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.4; en-us; Nexus 4 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Goanna) Chrome/42.0.2307.2 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.4; en-us; Nexus 4 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2307.2 Mobile Safari/537.36",
"touch": true,
"firefoxOS": true,
"os": "android",
@@ -170,7 +170,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.4; en-us; Nexus 5 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Goanna) Chrome/42.0.2307.2 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.4; en-us; Nexus 5 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2307.2 Mobile Safari/537.36",
"touch": true,
"firefoxOS": true,
"os": "android",
@@ -181,7 +181,7 @@
"width": 412,
"height": 732,
"pixelRatio": 3.5,
"userAgent": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Goanna) Chrome/48.0.2564.23 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.23 Mobile Safari/537.36",
"touch": true,
"firefoxOS": true,
"os": "android",
@@ -192,7 +192,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; rv:32.0) Goanna/32.0 Firefox/32.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:32.0) Gecko/32.0 Firefox/32.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -202,7 +202,7 @@
"width": 360,
"height": 640,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Mobile; LGL25; rv:32.0) Goanna/32.0 Firefox/32.0",
"userAgent": "Mozilla/5.0 (Mobile; LGL25; rv:32.0) Gecko/32.0 Firefox/32.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -212,7 +212,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; LG-D300; rv:18.1) Goanna/18.1 Firefox/18.1",
"userAgent": "Mozilla/5.0 (Mobile; LG-D300; rv:18.1) Gecko/18.1 Firefox/18.1",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -222,7 +222,7 @@
"width": 384,
"height": 640,
"pixelRatio": 1.25,
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Goanna) Version/4.0 Chrome/30.0.1599.103 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.1599.103 Mobile Safari/537.36",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -243,7 +243,7 @@
"width": 360,
"height": 640,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Goanna) NokiaBrowser/8.5.0 Mobile Safari/534.13",
"userAgent": "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -253,7 +253,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Android 5.1.1; Mobile; rv:43.0) Goanna/43.0 Firefox/43.0",
"userAgent": "Mozilla/5.0 (Android 5.1.1; Mobile; rv:43.0) Gecko/43.0 Firefox/43.0",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -263,7 +263,7 @@
"width": 360,
"height": 640,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Goanna) Version/4.0 Mobile Safari/534.30",
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -273,7 +273,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Goanna) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -283,7 +283,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Goanna) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36",
"touch": true,
"firefoxOS": false,
"os": "android",
@@ -294,7 +294,7 @@
"width": 360,
"height": 640,
"pixelRatio": 4,
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Goanna) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36",
"touch": true,
"firefoxOS": false,
"os": "android",
@@ -305,7 +305,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "android"
@@ -315,7 +315,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; rv:28.0) Goanna/28.0 Firefox/28.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -325,7 +325,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; rv:30.0) Goanna/30.0 Firefox/30.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:30.0) Gecko/30.0 Firefox/30.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -335,7 +335,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; ZTEOPEN; rv:18.1) Goanna/18.0 Firefox/18.1",
"userAgent": "Mozilla/5.0 (Mobile; ZTEOPEN; rv:18.1) Gecko/18.0 Firefox/18.1",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -345,7 +345,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; OPEN2; rv:28.0) Goanna/28.0 Firefox/28.0",
"userAgent": "Mozilla/5.0 (Mobile; OPEN2; rv:28.0) Gecko/28.0 Firefox/28.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -355,7 +355,7 @@
"width": 320,
"height": 450,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; OPENC; rv:32.0) Goanna/32.0 Firefox/32.0",
"userAgent": "Mozilla/5.0 (Mobile; OPENC; rv:32.0) Gecko/32.0 Firefox/32.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -365,7 +365,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; rv:28.0) Goanna/28.0 Firefox/28.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -377,7 +377,7 @@
"width": 1280,
"height": 800,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Goanna) Silk/3.13 Safari/535.19 Silk-Accelerated=true",
"userAgent": "Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true",
"touch": true,
"firefoxOS": false,
"os": "fireos",
@@ -388,7 +388,7 @@
"width": 1024,
"height": 768,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Goanna) Version/7.0 Mobile/11A465 Safari/9537.53",
"userAgent": "Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
"touch": true,
"firefoxOS": false,
"os": "ios"
@@ -398,7 +398,7 @@
"width": 1024,
"height": 768,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Goanna) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
"userAgent": "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
"touch": true,
"firefoxOS": false,
"os": "ios",
@@ -409,7 +409,7 @@
"width": 1024,
"height": 768,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Goanna) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
"userAgent": "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
"touch": true,
"firefoxOS": false,
"os": "ios"
@@ -419,7 +419,7 @@
"width": 1024,
"height": 768,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Goanna) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
"userAgent": "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
"touch": true,
"firefoxOS": false,
"os": "ios",
@@ -430,7 +430,7 @@
"width": 1024,
"height": 600,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Goanna) Version/7.2.1.0 Safari/536.2+",
"userAgent": "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+",
"touch": true,
"firefoxOS": false,
"os": "blackberryos"
@@ -440,7 +440,7 @@
"width": 1280,
"height": 800,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Tablet; rv:32.0) Goanna/32.0 Firefox/32.0",
"userAgent": "Mozilla/5.0 (Tablet; rv:32.0) Gecko/32.0 Firefox/32.0",
"touch": true,
"firefoxOS": true,
"os": "android"
@@ -450,7 +450,7 @@
"width": 960,
"height": 600,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Goanna) Chrome/42.0.2307.2 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2307.2 Mobile Safari/537.36",
"touch": true,
"firefoxOS": false,
"os": "android",
@@ -461,7 +461,7 @@
"width": 1280,
"height": 800,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Goanna) Chrome/42.0.2307.2 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2307.2 Mobile Safari/537.36",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -471,7 +471,7 @@
"width": 360,
"height": 640,
"pixelRatio": 2,
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Goanna) Version/4.0 Mobile Safari/534.30",
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
"touch": true,
"firefoxOS": false,
"os": "android"
@@ -481,7 +481,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Goanna) Version/4.0 Mobile Safari/534.30",
"userAgent": "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
"touch": true,
"firefoxOS": false,
"os": "android",
@@ -492,7 +492,7 @@
"width": 1200,
"height": 1920,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (X11; Linux) AppleWebKit/534.34 (KHTML, like Goanna) QtCarBrowser Safari/534.34",
"userAgent": "Mozilla/5.0 (X11; Linux) AppleWebKit/534.34 (KHTML, like Gecko) QtCarBrowser Safari/534.34",
"touch": true,
"firefoxOS": false,
"os": "linux"
@@ -502,7 +502,7 @@
"width": 1024,
"height": 600,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Tablet; rv:32.0) Goanna/32.0 Firefox/32.0",
"userAgent": "Mozilla/5.0 (Tablet; rv:32.0) Gecko/32.0 Firefox/32.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
@@ -590,7 +590,7 @@
"width": 854,
"height": 480,
"pixelRatio": 0.87,
"userAgent": "Mozilla/5.0 (Nintendo WiiU) AppleWebKit/536.28 (KHTML, like Goanna) NX/3.0.3.12.15 NintendoBrowser/4.1.1.9601.EU",
"userAgent": "Mozilla/5.0 (Nintendo WiiU) AppleWebKit/536.28 (KHTML, like Gecko) NX/3.0.3.12.15 NintendoBrowser/4.1.1.9601.EU",
"touch": true,
"firefoxOS": false,
"os": "nintendo"
@@ -600,7 +600,7 @@
"width": 960,
"height": 544,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Playstation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Goanna) Silk/3.2",
"userAgent": "Mozilla/5.0 (Playstation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2",
"touch": true,
"firefoxOS": false,
"os": "playstation"
@@ -632,7 +632,7 @@
"width": 320,
"height": 290,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Linux; Android 5.0.1; Moto 360 Build/LWX48T) AppleWebkit/537.36 (KHTML, like Goanna) Chrome/19.77.34.5 Mobile Safari/537.36",
"userAgent": "Mozilla/5.0 (Linux; Android 5.0.1; Moto 360 Build/LWX48T) AppleWebkit/537.36 (KHTML, like Gecko) Chrome/19.77.34.5 Mobile Safari/537.36",
"touch": true,
"firefoxOS": true,
"os": "android"
devtools/client/responsive.html/test/unit/test_add_device.js
+1 -1
View File
@@ -19,7 +19,7 @@ add_task(function* () {
"width": 320,
"height": 570,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
devtools/client/responsive.html/test/unit/test_change_device.js
+1 -1
View File
@@ -24,7 +24,7 @@ add_task(function* () {
"width": 320,
"height": 570,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
devtools/client/responsive.html/test/unit/test_update_device_displayed.js
+1 -1
View File
@@ -20,7 +20,7 @@ add_task(function* () {
"width": 320,
"height": 570,
"pixelRatio": 1.5,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true,
"os": "fxos"
devtools/client/responsivedesign/test/browser_responsiveui_customuseragent.js
+1 -1
View File
@@ -8,7 +8,7 @@ const DEFAULT_UA = Cc["@mozilla.org/network/protocol;1?name=http"]
.getService(Ci.nsIHttpProtocolHandler)
.userAgent;
const CHROME_UA = "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36" +
" (KHTML, like Goanna) Chrome/41.0.2228.0 Safari/537.36";
" (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36";
add_task(function* () {
yield addTab(TEST_URI);
devtools/client/shared/test/browser_devices.json
+2 -2
View File
@@ -6,7 +6,7 @@
"width": 320,
"height": 480,
"pixelRatio": 1,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true
},
@@ -15,7 +15,7 @@
"width": 360,
"height": 640,
"pixelRatio": 3,
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Goanna/39.0 Firefox/39.0",
"userAgent": "Mozilla/5.0 (Mobile; rv:39.0) Gecko/39.0 Firefox/39.0",
"touch": true,
"firefoxOS": true
}
devtools/client/shared/test/browser_flame-graph-utils-03.js
+2 -2
View File
@@ -84,12 +84,12 @@ var EXPECTED_OUTPUT = [{
}, {
blocks: [{
startTime: 0,
frameKey: "Goanna",
frameKey: "Gecko",
x: 0,
y: 45,
width: 50,
height: 15,
text: "Goanna"
text: "Gecko"
}]
}, {
blocks: []
devtools/client/shared/test/browser_flame-graph-utils-04.js
+2 -2
View File
@@ -112,12 +112,12 @@ var EXPECTED_OUTPUT = [{
}, {
blocks: [{
startTime: 0,
frameKey: "Goanna",
frameKey: "Gecko",
x: 0,
y: 45,
width: 50,
height: 15,
text: "Goanna"
text: "Gecko"
}]
}, {
blocks: []
devtools/client/shared/vendor/REACT_UPGRADING
Vendored
+4 -4
View File
@@ -36,7 +36,7 @@ search/replace. There is only about ~14 places to change.
Now move into our repo (note the naming of `react-dev.js`, it's the dev version):
* cp build/react-with-addons.js <goanna-dev>/devtools/client/shared/vendor/react-dev.js
* cp build/react-with-addons.js <gecko-dev>/devtools/client/shared/vendor/react-dev.js
Now we need to generate a production version of React:
@@ -49,7 +49,7 @@ MOVE OFF XUL and we don't need to do this anymore once that happens.
After patching `build/react-with-addons.js` again, copy the production
version over:
* cp build/react-with-addons.js <goanna-dev>/devtools/client/shared/vendor/react.js
* cp build/react-with-addons.js <gecko-dev>/devtools/client/shared/vendor/react.js
You also need to copy the ReactDOM and ReactDOMServer package. It requires React, so
right now we are just manually changing the path from `react` to
@@ -84,9 +84,9 @@ Into this:
});
```
* cp build/react-dom.js <goanna-dev>/devtools/client/shared/vendor/react-dom.js
* cp build/react-dom.js <gecko-dev>/devtools/client/shared/vendor/react-dom.js
* (change `require('react')` at the top of the file to the right path)
* Copy/paste existing monkey patch
* Apply monkeyPatchReactDOM() to the returned object ReactDOM object.
* cp build/react-dom.js <goanna-dev>/devtools/client/shared/vendor/react-dom-server.js
* cp build/react-dom.js <gecko-dev>/devtools/client/shared/vendor/react-dom-server.js
* (change `require('react')` at the top of the file to the right path)
devtools/client/sourceeditor/codemirror/codemirror.bundle.js
+9 -9
View File
@@ -263,7 +263,7 @@ var CodeMirror =
var userAgent = navigator.userAgent;
var platform = navigator.platform;
var goanna = /goanna\/\d/i.test(userAgent);
var gecko = /gecko\/\d/i.test(userAgent);
var ie_upto10 = /MSIE \d/.test(userAgent);
var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
var ie = ie_upto10 || ie_11up;
@@ -288,7 +288,7 @@ var CodeMirror =
if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
var captureRightClick = goanna || (ie && ie_version >= 9);
var captureRightClick = gecko || (ie && ie_version >= 9);
// Optimize some code when these features are not used.
var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -416,7 +416,7 @@ var CodeMirror =
// Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
if (!webkit && !(goanna && mobile)) d.scroller.draggable = true;
if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
if (place) {
if (place.appendChild) place.appendChild(d.wrapper);
@@ -1936,7 +1936,7 @@ var CodeMirror =
try { var rng = range(start.node, start.offset, end.offset, end.node); }
catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
if (rng) {
if (!goanna && this.cm.state.focused) {
if (!gecko && this.cm.state.focused) {
sel.collapse(start.node, start.offset);
if (!rng.collapsed) sel.addRange(rng);
} else {
@@ -1944,7 +1944,7 @@ var CodeMirror =
sel.addRange(rng);
}
if (old && sel.anchorNode == null) sel.addRange(old);
else if (goanna) this.startGracePeriod();
else if (gecko) this.startGracePeriod();
}
this.rememberSelection();
},
@@ -4205,10 +4205,10 @@ var CodeMirror =
function setScrollTop(cm, val) {
if (Math.abs(cm.doc.scrollTop - val) < 2) return;
cm.doc.scrollTop = val;
if (!goanna) updateDisplaySimple(cm, {top: val});
if (!gecko) updateDisplaySimple(cm, {top: val});
if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
cm.display.scrollbars.setScrollTop(val);
if (goanna) updateDisplaySimple(cm);
if (gecko) updateDisplaySimple(cm);
startWorker(cm, 100);
}
// Sync scroller and scrollbar, ensure the gutter elements are
@@ -4239,7 +4239,7 @@ var CodeMirror =
// being wrong would just be a slight flicker on the first wheel
// scroll (if it is large enough).
if (ie) wheelPixelsPerUnit = -.53;
else if (goanna) wheelPixelsPerUnit = 15;
else if (gecko) wheelPixelsPerUnit = 15;
else if (chrome) wheelPixelsPerUnit = -.7;
else if (safari) wheelPixelsPerUnit = -1/3;
@@ -4287,7 +4287,7 @@ var CodeMirror =
// estimated pixels/delta value, we just handle horizontal
// scrolling entirely here. It'll be slightly off from native, but
// better than glitching out.
if (dx && !goanna && !presto && wheelPixelsPerUnit != null) {
if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
if (dy && canScrollY)
setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
devtools/client/sourceeditor/codemirror/lib/codemirror.js
Vendored
+9 -9
View File
@@ -24,7 +24,7 @@
var userAgent = navigator.userAgent;
var platform = navigator.platform;
var goanna = /goanna\/\d/i.test(userAgent);
var gecko = /gecko\/\d/i.test(userAgent);
var ie_upto10 = /MSIE \d/.test(userAgent);
var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
var ie = ie_upto10 || ie_11up;
@@ -49,7 +49,7 @@
if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
var captureRightClick = goanna || (ie && ie_version >= 9);
var captureRightClick = gecko || (ie && ie_version >= 9);
// Optimize some code when these features are not used.
var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -177,7 +177,7 @@
// Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
if (!webkit && !(goanna && mobile)) d.scroller.draggable = true;
if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
if (place) {
if (place.appendChild) place.appendChild(d.wrapper);
@@ -1697,7 +1697,7 @@
try { var rng = range(start.node, start.offset, end.offset, end.node); }
catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
if (rng) {
if (!goanna && this.cm.state.focused) {
if (!gecko && this.cm.state.focused) {
sel.collapse(start.node, start.offset);
if (!rng.collapsed) sel.addRange(rng);
} else {
@@ -1705,7 +1705,7 @@
sel.addRange(rng);
}
if (old && sel.anchorNode == null) sel.addRange(old);
else if (goanna) this.startGracePeriod();
else if (gecko) this.startGracePeriod();
}
this.rememberSelection();
},
@@ -3966,10 +3966,10 @@
function setScrollTop(cm, val) {
if (Math.abs(cm.doc.scrollTop - val) < 2) return;
cm.doc.scrollTop = val;
if (!goanna) updateDisplaySimple(cm, {top: val});
if (!gecko) updateDisplaySimple(cm, {top: val});
if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
cm.display.scrollbars.setScrollTop(val);
if (goanna) updateDisplaySimple(cm);
if (gecko) updateDisplaySimple(cm);
startWorker(cm, 100);
}
// Sync scroller and scrollbar, ensure the gutter elements are
@@ -4000,7 +4000,7 @@
// being wrong would just be a slight flicker on the first wheel
// scroll (if it is large enough).
if (ie) wheelPixelsPerUnit = -.53;
else if (goanna) wheelPixelsPerUnit = 15;
else if (gecko) wheelPixelsPerUnit = 15;
else if (chrome) wheelPixelsPerUnit = -.7;
else if (safari) wheelPixelsPerUnit = -1/3;
@@ -4048,7 +4048,7 @@
// estimated pixels/delta value, we just handle horizontal
// scrolling entirely here. It'll be slightly off from native, but
// better than glitching out.
if (dx && !goanna && !presto && wheelPixelsPerUnit != null) {
if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
if (dy && canScrollY)
setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
devtools/client/sourceeditor/css-autocompleter.js
+2 -2
View File
@@ -18,7 +18,7 @@ const {getClientCssProperties} = require("devtools/shared/fronts/css-properties"
* - CSS Selectors
* - Some other known CSS keywords
*
* Goanna provides a list of both property names and their corresponding values.
* Gecko provides a list of both property names and their corresponding values.
* We take out a list of matching selectors using the Inspector actor's
* `getSuggestionsForQuery` method. Now the only thing is to parse the CSS being
* edited by the user, figure out what token or word is being written and last
@@ -41,7 +41,7 @@ const {getClientCssProperties} = require("devtools/shared/fronts/css-properties"
* - If the state is "value", the corresponding property name
*
* In case of "value" and "property" states, we simply use the information
* provided by Goanna to filter out the possible suggestions.
* provided by Gecko to filter out the possible suggestions.
* For "selector" state, we request the Inspector actor to query the page DOM
* and filter out the possible suggestions.
* For "media" and "keyframes" state, the only possible suggestions for now are
devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js
+1 -1
View File
@@ -193,7 +193,7 @@ function checkState(testCases, index, sourceEditor, popup) {
/**
* Returns a list of all property names and a map of property name vs possible
* CSS values provided by the Goanna engine.
* CSS values provided by the Gecko engine.
*
* @return {Object} An object with following properties:
* - CSSProperties {Array} Array of string containing all the possible