зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to autoland
This commit is contained in:
Коммит
41c674d64c
|
@ -46,6 +46,7 @@ support-files =
|
|||
[browser_ext_browserAction_area.js]
|
||||
[browser_ext_browserAction_experiment.js]
|
||||
[browser_ext_browserAction_context.js]
|
||||
skip-if = os == 'linux' && debug # Bug 1504096
|
||||
[browser_ext_browserAction_contextMenu.js]
|
||||
# bug 1369197
|
||||
skip-if = os == 'linux'
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -1,15 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
|
||||
<ShortName>Google</ShortName>
|
||||
<Description>Google Search</Description>
|
||||
<InputEncoding>UTF-8</InputEncoding>
|
||||
<Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
|
||||
<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/>
|
||||
<Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
|
||||
<Param name="client" value="firefox-b-1-d"/>
|
||||
<Param name="q" value="{searchTerms}"/>
|
||||
</Url>
|
||||
</SearchPlugin>
|
|
@ -1,15 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
|
||||
<ShortName>Google</ShortName>
|
||||
<Description>Google Search</Description>
|
||||
<InputEncoding>UTF-8</InputEncoding>
|
||||
<Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
|
||||
<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/>
|
||||
<Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
|
||||
<Param name="client" value="firefox-b-1-e"/>
|
||||
<Param name="q" value="{searchTerms}"/>
|
||||
</Url>
|
||||
</SearchPlugin>
|
|
@ -1,15 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
|
||||
<ShortName>Google</ShortName>
|
||||
<Description>Google Search</Description>
|
||||
<InputEncoding>UTF-8</InputEncoding>
|
||||
<Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
|
||||
<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/>
|
||||
<Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
|
||||
<Param name="client" value="firefox-b-d"/>
|
||||
<Param name="q" value="{searchTerms}"/>
|
||||
</Url>
|
||||
</SearchPlugin>
|
|
@ -1,15 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
|
||||
<ShortName>Google</ShortName>
|
||||
<Description>Google Search</Description>
|
||||
<InputEncoding>UTF-8</InputEncoding>
|
||||
<Image width="16" height="16">resource://search-plugins/images/google.ico</Image>
|
||||
<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/>
|
||||
<Url type="text/html" method="GET" template="https://www.google.com/search" rel="searchform">
|
||||
<Param name="client" value="firefox-b-e"/>
|
||||
<Param name="q" value="{searchTerms}"/>
|
||||
</Url>
|
||||
</SearchPlugin>
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
Двоичные данные
browser/components/search/searchplugins/images/google.ico
Двоичные данные
browser/components/search/searchplugins/images/google.ico
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 5.3 KiB |
|
@ -3,12 +3,12 @@
|
|||
"searchDefault": "Google",
|
||||
"searchOrder": ["Google", "Bing"],
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
|
||||
"google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
|
||||
]
|
||||
},
|
||||
"regionOverrides": {
|
||||
"US": {
|
||||
"google-b-d": "google-b-1-d"
|
||||
"google": "google-2018"
|
||||
},
|
||||
"CA": {
|
||||
"ebay": "ebay-ca",
|
||||
|
@ -54,68 +54,68 @@
|
|||
"en-US": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
|
||||
"google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
|
||||
]
|
||||
},
|
||||
"experimental-hidden": {
|
||||
"visibleDefaultEngines": [
|
||||
"amazon-ca", "amazon-au", "google-2018", "yandex-en", "google", "google-b-1-e", "google-b-e"
|
||||
"amazon-ca", "amazon-au", "google-2018", "yandex-en"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ach": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
|
||||
]
|
||||
}
|
||||
},
|
||||
"af": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af"
|
||||
"google", "bing", "amazondotcom", "ddg", "wikipedia-af"
|
||||
]
|
||||
}
|
||||
},
|
||||
"an": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
|
||||
"google", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ar": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar"
|
||||
"google", "bing", "amazondotcom", "ddg", "wikipedia-ar"
|
||||
]
|
||||
}
|
||||
},
|
||||
"as": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-in", "ddg", "wikipedia-as"
|
||||
"google", "amazon-in", "ddg", "wikipedia-as"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ast": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
|
||||
"google", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
|
||||
]
|
||||
}
|
||||
},
|
||||
"az": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az"
|
||||
"google", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az"
|
||||
]
|
||||
}
|
||||
},
|
||||
"be": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask"
|
||||
"yandex-by", "google", "ddg", "wikipedia-be", "wikipedia-be-tarask"
|
||||
]
|
||||
},
|
||||
"BY": {
|
||||
|
@ -134,56 +134,56 @@
|
|||
"bg": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "ddg", "pazaruvaj", "portalbgdict", "wikipedia-bg"
|
||||
"google", "amazondotcom", "ddg", "pazaruvaj", "portalbgdict", "wikipedia-bg"
|
||||
]
|
||||
}
|
||||
},
|
||||
"bn-BD": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "wikipedia-bn"
|
||||
"google", "bing", "ddg", "wikipedia-bn"
|
||||
]
|
||||
}
|
||||
},
|
||||
"bn-IN": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-in", "bing", "ddg", "rediff", "wikipedia-bn"
|
||||
"google", "amazon-in", "bing", "ddg", "rediff", "wikipedia-bn"
|
||||
]
|
||||
}
|
||||
},
|
||||
"br": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
|
||||
"google", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
|
||||
]
|
||||
}
|
||||
},
|
||||
"bs": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "olx", "twitter", "wikipedia-bs"
|
||||
"google", "ddg", "olx", "twitter", "wikipedia-bs"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ca": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
|
||||
"google", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
|
||||
]
|
||||
}
|
||||
},
|
||||
"cak": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es"
|
||||
"google", "bing", "amazondotcom", "ddg", "wikipedia-es"
|
||||
]
|
||||
}
|
||||
},
|
||||
"crh": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "twitter", "wikipedia-crh"
|
||||
"google", "ddg", "twitter", "wikipedia-crh"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
@ -191,56 +191,56 @@
|
|||
"default": {
|
||||
"searchOrder": ["Google", "Seznam"],
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz"
|
||||
"google", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz"
|
||||
]
|
||||
}
|
||||
},
|
||||
"cy": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
|
||||
"google", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
|
||||
]
|
||||
}
|
||||
},
|
||||
"da": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
|
||||
"google", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
|
||||
]
|
||||
}
|
||||
},
|
||||
"de": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
|
||||
"google", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
|
||||
]
|
||||
}
|
||||
},
|
||||
"dsb": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
|
||||
"google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
|
||||
]
|
||||
}
|
||||
},
|
||||
"el": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
|
||||
"google", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
|
||||
]
|
||||
}
|
||||
},
|
||||
"en-CA": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
|
||||
"google", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
|
||||
]
|
||||
}
|
||||
},
|
||||
"en-GB": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
|
||||
"google", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
|
||||
]
|
||||
},
|
||||
"experimental-hidden": {
|
||||
|
@ -252,42 +252,42 @@
|
|||
"en-ZA": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
|
||||
]
|
||||
}
|
||||
},
|
||||
"eo": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
|
||||
"google", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
|
||||
]
|
||||
}
|
||||
},
|
||||
"es-AR": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
|
||||
"google", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
|
||||
]
|
||||
}
|
||||
},
|
||||
"es-CL": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
|
||||
"google", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
|
||||
]
|
||||
}
|
||||
},
|
||||
"es-ES": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
|
||||
"google", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
|
||||
]
|
||||
}
|
||||
},
|
||||
"es-MX": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
|
||||
"google", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
|
||||
]
|
||||
},
|
||||
"experimental-hidden": {
|
||||
|
@ -299,49 +299,49 @@
|
|||
"et": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee"
|
||||
"google", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee"
|
||||
]
|
||||
}
|
||||
},
|
||||
"eu": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
|
||||
"google", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
|
||||
]
|
||||
}
|
||||
},
|
||||
"fa": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa"
|
||||
"google", "amazondotcom", "bing", "ddg", "wikipedia-fa"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ff": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
|
||||
"google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
|
||||
]
|
||||
}
|
||||
},
|
||||
"fi": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
|
||||
"google", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
|
||||
]
|
||||
}
|
||||
},
|
||||
"fr": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr"
|
||||
"google", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr"
|
||||
]
|
||||
}
|
||||
},
|
||||
"fy-NL": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
|
||||
"google", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
|
||||
]
|
||||
},
|
||||
"experimental-hidden": {
|
||||
|
@ -353,105 +353,105 @@
|
|||
"ga-IE": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
|
||||
"google", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
|
||||
]
|
||||
}
|
||||
},
|
||||
"gd": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
|
||||
"google", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
|
||||
]
|
||||
}
|
||||
},
|
||||
"gl": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
|
||||
"google", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
|
||||
]
|
||||
}
|
||||
},
|
||||
"gn": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
|
||||
]
|
||||
}
|
||||
},
|
||||
"gu-IN": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "gujaratilexicon", "wikipedia-gu"
|
||||
"google", "bing", "amazon-in", "ddg", "gujaratilexicon", "wikipedia-gu"
|
||||
]
|
||||
}
|
||||
},
|
||||
"he": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "wikipedia-he", "morfix-dic"
|
||||
"google", "ddg", "wikipedia-he", "morfix-dic"
|
||||
]
|
||||
}
|
||||
},
|
||||
"hi-IN": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "wikipedia-hi"
|
||||
"google", "bing", "ddg", "wikipedia-hi"
|
||||
]
|
||||
}
|
||||
},
|
||||
"hr": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
|
||||
"google", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
|
||||
]
|
||||
}
|
||||
},
|
||||
"hsb": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
|
||||
"google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
|
||||
]
|
||||
}
|
||||
},
|
||||
"hu": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu"
|
||||
"google", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu"
|
||||
]
|
||||
}
|
||||
},
|
||||
"hy-AM": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
|
||||
"google", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ia": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
|
||||
]
|
||||
}
|
||||
},
|
||||
"id": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "wikipedia-id"
|
||||
"google", "ddg", "wikipedia-id"
|
||||
]
|
||||
}
|
||||
},
|
||||
"is": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
|
||||
"google", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
|
||||
]
|
||||
}
|
||||
},
|
||||
"it": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
|
||||
"google", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
@ -459,7 +459,7 @@
|
|||
"default": {
|
||||
"searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて!goo", "Twitter", "Wikipedia (ja)"],
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
|
||||
"google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
@ -467,28 +467,28 @@
|
|||
"default": {
|
||||
"searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて!goo", "Twitter", "Wikipedia (ja)"],
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
|
||||
"google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ka": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
|
||||
]
|
||||
}
|
||||
},
|
||||
"kab": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "wikipedia-kab"
|
||||
"google", "bing", "ddg", "wikipedia-kab"
|
||||
]
|
||||
}
|
||||
},
|
||||
"kk": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"yandex-kk", "google-b-d", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
|
||||
"yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
|
||||
]
|
||||
},
|
||||
"KZ": {
|
||||
|
@ -507,119 +507,119 @@
|
|||
"km": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
|
||||
]
|
||||
}
|
||||
},
|
||||
"kn": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn"
|
||||
"google", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ko": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr"
|
||||
"google", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr"
|
||||
]
|
||||
}
|
||||
},
|
||||
"lij": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
|
||||
"google", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
|
||||
]
|
||||
}
|
||||
},
|
||||
"lo": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "wikipedia-lo", "twitter"
|
||||
"google", "bing", "ddg", "wikipedia-lo", "twitter"
|
||||
]
|
||||
}
|
||||
},
|
||||
"lt": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter"
|
||||
"google", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ltg": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
|
||||
"google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
|
||||
]
|
||||
}
|
||||
},
|
||||
"lv": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
|
||||
"google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
|
||||
]
|
||||
}
|
||||
},
|
||||
"mai": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi"
|
||||
"google", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi"
|
||||
]
|
||||
}
|
||||
},
|
||||
"mk": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk"
|
||||
"google", "bing", "amazondotcom", "ddg", "wikipedia-mk"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ml": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "rediff", "webdunia", "wikipedia", "wikipedia-ml"
|
||||
"google", "bing", "amazon-in", "ddg", "rediff", "webdunia", "wikipedia", "wikipedia-ml"
|
||||
]
|
||||
}
|
||||
},
|
||||
"mr": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-in", "ddg", "rediff", "wikipedia-mr"
|
||||
"google", "amazon-in", "ddg", "rediff", "wikipedia-mr"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ms": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
|
||||
]
|
||||
}
|
||||
},
|
||||
"my": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
|
||||
]
|
||||
}
|
||||
},
|
||||
"nb-NO": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
|
||||
"google", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ne-NP": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "twitter", "wikipedia-ne"
|
||||
"google", "bing", "ddg", "twitter", "wikipedia-ne"
|
||||
]
|
||||
}
|
||||
},
|
||||
"nl": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
|
||||
"google", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
|
||||
]
|
||||
},
|
||||
"experimental-hidden": {
|
||||
|
@ -631,42 +631,42 @@
|
|||
"nn-NO": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN"
|
||||
"google", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN"
|
||||
]
|
||||
}
|
||||
},
|
||||
"oc": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
|
||||
"google", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
|
||||
]
|
||||
}
|
||||
},
|
||||
"or": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or"
|
||||
"google", "bing", "amazon-in", "ddg", "wikipedia-or"
|
||||
]
|
||||
}
|
||||
},
|
||||
"pa-IN": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa"
|
||||
"google", "bing", "amazon-in", "ddg", "wikipedia-pa"
|
||||
]
|
||||
}
|
||||
},
|
||||
"pl": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
|
||||
"google", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
|
||||
]
|
||||
}
|
||||
},
|
||||
"pt-BR": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
|
||||
"google", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
|
||||
]
|
||||
},
|
||||
"experimental-hidden": {
|
||||
|
@ -678,28 +678,28 @@
|
|||
"pt-PT": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt"
|
||||
"google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt"
|
||||
]
|
||||
}
|
||||
},
|
||||
"rm": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
|
||||
"google", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ro": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro"
|
||||
"google", "bing", "amazondotcom", "ddg", "wikipedia-ro"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ru": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
|
||||
"yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
|
||||
]
|
||||
},
|
||||
"RU": {
|
||||
|
@ -718,84 +718,84 @@
|
|||
"si": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "ddg", "wikipedia-si"
|
||||
"google", "amazondotcom", "ddg", "wikipedia-si"
|
||||
]
|
||||
}
|
||||
},
|
||||
"sk": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
|
||||
"google", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
|
||||
]
|
||||
}
|
||||
},
|
||||
"sl": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
|
||||
"google", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
|
||||
]
|
||||
}
|
||||
},
|
||||
"son": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
|
||||
"google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
|
||||
]
|
||||
}
|
||||
},
|
||||
"sq": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
|
||||
"google", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
|
||||
]
|
||||
}
|
||||
},
|
||||
"sr": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak"
|
||||
"google", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak"
|
||||
]
|
||||
}
|
||||
},
|
||||
"sv-SE": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
|
||||
"google", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ta": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-in", "ddg", "wikipedia-ta"
|
||||
"google", "amazon-in", "ddg", "wikipedia-ta"
|
||||
]
|
||||
}
|
||||
},
|
||||
"te": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te"
|
||||
"google", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te"
|
||||
]
|
||||
}
|
||||
},
|
||||
"th": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
|
||||
"google", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
|
||||
]
|
||||
}
|
||||
},
|
||||
"tl": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
|
||||
]
|
||||
}
|
||||
},
|
||||
"tr": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr"
|
||||
"yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
|
||||
]
|
||||
},
|
||||
"TR": {
|
||||
|
@ -814,56 +814,56 @@
|
|||
"trs": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es"
|
||||
"google", "bing", "amazondotcom", "ddg", "wikipedia-es"
|
||||
]
|
||||
}
|
||||
},
|
||||
"uk": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "meta-ua", "ddg", "wikipedia-uk", "hotline-ua"
|
||||
"google", "bing", "meta-ua", "ddg", "wikipedia-uk", "hotline-ua"
|
||||
]
|
||||
}
|
||||
},
|
||||
"ur": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
|
||||
"google", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
|
||||
]
|
||||
}
|
||||
},
|
||||
"uz": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
|
||||
"google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
|
||||
]
|
||||
}
|
||||
},
|
||||
"vi": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "coccoc", "ddg", "wikipedia-vi"
|
||||
"google", "coccoc", "ddg", "wikipedia-vi"
|
||||
]
|
||||
}
|
||||
},
|
||||
"wo": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
|
||||
"google", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
|
||||
]
|
||||
}
|
||||
},
|
||||
"xh": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "bing", "ddg", "wikipedia"
|
||||
"google", "bing", "ddg", "wikipedia"
|
||||
]
|
||||
}
|
||||
},
|
||||
"zh-CN": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
|
||||
"baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
|
||||
]
|
||||
},
|
||||
"CN": {
|
||||
|
@ -873,7 +873,7 @@
|
|||
"zh-TW": {
|
||||
"default": {
|
||||
"visibleDefaultEngines": [
|
||||
"google-b-d", "ddg", "readmoo", "wikipedia-zh-TW"
|
||||
"google", "ddg", "readmoo", "wikipedia-zh-TW"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -24,10 +24,10 @@ let region = Services.prefs.getCharPref("browser.search.region");
|
|||
let code = "";
|
||||
switch (region) {
|
||||
case "US":
|
||||
code = "firefox-b-1-d";
|
||||
code = "firefox-b-1";
|
||||
break;
|
||||
case "DE":
|
||||
code = "firefox-b-d";
|
||||
code = "firefox-b";
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@ if (code) {
|
|||
codes.context = code;
|
||||
codes.newTab = code;
|
||||
codes.submission = code;
|
||||
codes.keyword = code;
|
||||
codes.keyword = `${code}-ab`;
|
||||
}
|
||||
|
||||
function promiseContentSearchReady(browser) {
|
||||
|
|
|
@ -131,7 +131,7 @@ support-files =
|
|||
[browser_switch_remoteness.js]
|
||||
run-if = e10s
|
||||
[browser_upgrade_backup.js]
|
||||
skip-if = (os == 'linux' && (asan || debug)) || (verify && debug && (os == 'mac')) # Bug 1435394 disabled on Linux
|
||||
skip-if = (os == 'linux' && (asan || debug)) || (verify && debug && (os == 'mac')) || (os == 'win' && bits == 64) # Bug 1435394 disabled on Linux and Windows
|
||||
[browser_windowRestore_perwindowpb.js]
|
||||
[browser_248970_b_perwindowpb.js]
|
||||
# Disabled because of leaks.
|
||||
|
|
|
@ -484,6 +484,14 @@ void Assembler::ToggleCall(CodeLocationLabel inst_, bool enabled) {
|
|||
AutoFlushICache::flush(uintptr_t(call), 8);
|
||||
}
|
||||
|
||||
// Patches loads generated by MacroAssemblerCompat::mov(CodeLabel*, Register).
|
||||
// The loading code is implemented in movePatchablePtr().
|
||||
void Assembler::UpdateLoad64Value(Instruction* inst0, uint64_t value) {
|
||||
MOZ_ASSERT(inst0->IsLDR());
|
||||
uint64_t* literal = inst0->LiteralAddress<uint64_t*>();
|
||||
*literal = value;
|
||||
}
|
||||
|
||||
class RelocationIterator {
|
||||
CompactBufferReader reader_;
|
||||
uint32_t tableStart_;
|
||||
|
|
|
@ -209,9 +209,16 @@ class Assembler : public vixl::Assembler {
|
|||
BufferOffset fImmPool64(ARMFPRegister dest, double value);
|
||||
BufferOffset fImmPool32(ARMFPRegister dest, float value);
|
||||
|
||||
uint32_t currentOffset() const {
|
||||
return nextOffset().getOffset();
|
||||
}
|
||||
|
||||
void bind(Label* label) { bind(label, nextOffset()); }
|
||||
void bind(Label* label, BufferOffset boff);
|
||||
void bind(RepatchLabel* label);
|
||||
void bind(CodeLabel* label) {
|
||||
label->target()->bind(currentOffset());
|
||||
}
|
||||
|
||||
bool oom() const {
|
||||
return AssemblerShared::oom() || armbuffer_.oom() ||
|
||||
|
@ -242,11 +249,20 @@ class Assembler : public vixl::Assembler {
|
|||
}
|
||||
}
|
||||
|
||||
static void UpdateLoad64Value(Instruction* inst0, uint64_t value);
|
||||
|
||||
static void Bind(uint8_t* rawCode, const CodeLabel& label) {
|
||||
auto mode = label.linkMode();
|
||||
size_t patchAtOffset = label.patchAt().offset();
|
||||
size_t targetOffset = label.target().offset();
|
||||
*reinterpret_cast<const void**>(rawCode + patchAtOffset) =
|
||||
rawCode + targetOffset;
|
||||
|
||||
if (mode == CodeLabel::MoveImmediate) {
|
||||
Instruction* inst = (Instruction*)(rawCode + patchAtOffset);
|
||||
Assembler::UpdateLoad64Value(inst, (uint64_t)(rawCode + targetOffset));
|
||||
} else {
|
||||
*reinterpret_cast<const void**>(rawCode + patchAtOffset) =
|
||||
rawCode + targetOffset;
|
||||
}
|
||||
}
|
||||
|
||||
void retarget(Label* cur, Label* next);
|
||||
|
|
|
@ -760,30 +760,72 @@ MoveOperand CodeGeneratorARM64::toMoveOperand(const LAllocation a) const {
|
|||
class js::jit::OutOfLineTableSwitch
|
||||
: public OutOfLineCodeBase<CodeGeneratorARM64> {
|
||||
MTableSwitch* mir_;
|
||||
Vector<CodeLabel, 8, JitAllocPolicy> codeLabels_;
|
||||
CodeLabel jumpLabel_;
|
||||
|
||||
void accept(CodeGeneratorARM64* codegen) override {
|
||||
codegen->visitOutOfLineTableSwitch(this);
|
||||
}
|
||||
|
||||
public:
|
||||
OutOfLineTableSwitch(TempAllocator& alloc, MTableSwitch* mir)
|
||||
: mir_(mir), codeLabels_(alloc) {}
|
||||
OutOfLineTableSwitch(MTableSwitch* mir)
|
||||
: mir_(mir) {}
|
||||
|
||||
MTableSwitch* mir() const { return mir_; }
|
||||
|
||||
bool addCodeLabel(CodeLabel label) { return codeLabels_.append(label); }
|
||||
CodeLabel codeLabel(unsigned i) { return codeLabels_[i]; }
|
||||
CodeLabel* jumpLabel() { return &jumpLabel_; }
|
||||
};
|
||||
|
||||
void CodeGeneratorARM64::visitOutOfLineTableSwitch(OutOfLineTableSwitch* ool) {
|
||||
MOZ_CRASH("visitOutOfLineTableSwitch");
|
||||
MTableSwitch* mir = ool->mir();
|
||||
|
||||
masm.haltingAlign(sizeof(void*));
|
||||
masm.bind(ool->jumpLabel());
|
||||
masm.addCodeLabel(*ool->jumpLabel());
|
||||
|
||||
for (size_t i = 0; i < mir->numCases(); i++) {
|
||||
LBlock* caseblock = skipTrivialBlocks(mir->getCase(i))->lir();
|
||||
Label* caseheader = caseblock->label();
|
||||
uint32_t caseoffset = caseheader->offset();
|
||||
|
||||
// The entries of the jump table need to be absolute addresses,
|
||||
// and thus must be patched after codegen is finished.
|
||||
CodeLabel cl;
|
||||
masm.writeCodePointer(&cl);
|
||||
cl.target()->bind(caseoffset);
|
||||
masm.addCodeLabel(cl);
|
||||
}
|
||||
}
|
||||
|
||||
void CodeGeneratorARM64::emitTableSwitchDispatch(MTableSwitch* mir,
|
||||
Register index_,
|
||||
Register base_) {
|
||||
MOZ_CRASH("emitTableSwitchDispatch");
|
||||
Register index,
|
||||
Register base) {
|
||||
Label* defaultcase = skipTrivialBlocks(mir->getDefault())->lir()->label();
|
||||
|
||||
// Let the lowest table entry be indexed at 0.
|
||||
if (mir->low() != 0) {
|
||||
masm.sub32(Imm32(mir->low()), index);
|
||||
}
|
||||
|
||||
// Jump to the default case if input is out of range.
|
||||
int32_t cases = mir->numCases();
|
||||
masm.branch32(Assembler::AboveOrEqual, index, Imm32(cases), defaultcase);
|
||||
|
||||
// Because the target code has not yet been generated, we cannot know the
|
||||
// instruction offsets for use as jump targets. Therefore we construct
|
||||
// an OutOfLineTableSwitch that winds up holding the jump table.
|
||||
//
|
||||
// Because the jump table is generated as part of out-of-line code,
|
||||
// it is generated after all the regular codegen, so the jump targets
|
||||
// are guaranteed to exist when generating the jump table.
|
||||
OutOfLineTableSwitch* ool = new(alloc()) OutOfLineTableSwitch(mir);
|
||||
addOutOfLineCode(ool, mir);
|
||||
|
||||
// Use the index to get the address of the jump target from the table.
|
||||
masm.mov(ool->jumpLabel(), base);
|
||||
BaseIndex pointer(base, index, ScalePointer);
|
||||
|
||||
// Load the target from the jump table and branch to it.
|
||||
masm.branchToComputedAddress(pointer);
|
||||
}
|
||||
|
||||
void CodeGenerator::visitMathD(LMathD* math) {
|
||||
|
|
|
@ -150,15 +150,16 @@ class LModMaskI : public LInstructionHelper<1, 1, 2> {
|
|||
};
|
||||
|
||||
// Takes a tableswitch with an integer to decide
|
||||
class LTableSwitch : public LInstructionHelper<0, 1, 1> {
|
||||
class LTableSwitch : public LInstructionHelper<0, 1, 2> {
|
||||
public:
|
||||
LIR_HEADER(TableSwitch);
|
||||
|
||||
LTableSwitch(const LAllocation& in, const LDefinition& inputCopy,
|
||||
MTableSwitch* ins)
|
||||
const LDefinition& jumpTablePointer, MTableSwitch* ins)
|
||||
: LInstructionHelper(classOpcode) {
|
||||
setOperand(0, in);
|
||||
setTemp(0, inputCopy);
|
||||
setTemp(1, jumpTablePointer);
|
||||
setMir(ins);
|
||||
}
|
||||
|
||||
|
@ -167,20 +168,22 @@ class LTableSwitch : public LInstructionHelper<0, 1, 1> {
|
|||
const LAllocation* index() { return getOperand(0); }
|
||||
const LDefinition* tempInt() { return getTemp(0); }
|
||||
// This is added to share the same CodeGenerator prefixes.
|
||||
const LDefinition* tempPointer() { return nullptr; }
|
||||
const LDefinition* tempPointer() { return getTemp(1); }
|
||||
};
|
||||
|
||||
// Takes a tableswitch with an integer to decide
|
||||
class LTableSwitchV : public LInstructionHelper<0, BOX_PIECES, 2> {
|
||||
class LTableSwitchV : public LInstructionHelper<0, BOX_PIECES, 3> {
|
||||
public:
|
||||
LIR_HEADER(TableSwitchV);
|
||||
|
||||
LTableSwitchV(const LBoxAllocation& input, const LDefinition& inputCopy,
|
||||
const LDefinition& floatCopy, MTableSwitch* ins)
|
||||
const LDefinition& floatCopy, const LDefinition& jumpTablePointer,
|
||||
MTableSwitch* ins)
|
||||
: LInstructionHelper(classOpcode) {
|
||||
setBoxOperand(InputValue, input);
|
||||
setTemp(0, inputCopy);
|
||||
setTemp(1, floatCopy);
|
||||
setTemp(2, jumpTablePointer);
|
||||
setMir(ins);
|
||||
}
|
||||
|
||||
|
@ -190,7 +193,7 @@ class LTableSwitchV : public LInstructionHelper<0, BOX_PIECES, 2> {
|
|||
|
||||
const LDefinition* tempInt() { return getTemp(0); }
|
||||
const LDefinition* tempFloat() { return getTemp(1); }
|
||||
const LDefinition* tempPointer() { return nullptr; }
|
||||
const LDefinition* tempPointer() { return getTemp(2); }
|
||||
};
|
||||
|
||||
class LMulI : public LBinaryMath<0> {
|
||||
|
|
|
@ -272,11 +272,12 @@ void LIRGenerator::visitPowHalf(MPowHalf* ins) {
|
|||
LTableSwitch* LIRGeneratorARM64::newLTableSwitch(const LAllocation& in,
|
||||
const LDefinition& inputCopy,
|
||||
MTableSwitch* tableswitch) {
|
||||
return new (alloc()) LTableSwitch(in, inputCopy, tableswitch);
|
||||
return new (alloc()) LTableSwitch(in, inputCopy, temp(), tableswitch);
|
||||
}
|
||||
|
||||
LTableSwitchV* LIRGeneratorARM64::newLTableSwitchV(MTableSwitch* tableswitch) {
|
||||
MOZ_CRASH("NYI");
|
||||
return new(alloc()) LTableSwitchV(useBox(tableswitch->getOperand(0)),
|
||||
temp(), tempDouble(), temp(), tableswitch);
|
||||
}
|
||||
|
||||
void LIRGeneratorARM64::lowerUrshD(MUrsh* mir) {
|
||||
|
|
|
@ -1526,8 +1526,10 @@ void MacroAssembler::branchTestMagic(Condition cond, const Address& valaddr,
|
|||
}
|
||||
|
||||
void MacroAssembler::branchToComputedAddress(const BaseIndex& addr) {
|
||||
// Not used by Rabaldr.
|
||||
MOZ_CRASH("NYI - branchToComputedAddress");
|
||||
vixl::UseScratchRegisterScope temps(&this->asVIXL());
|
||||
const ARMRegister scratch64 = temps.AcquireX();
|
||||
loadPtr(addr, scratch64.asUnsized());
|
||||
Br(scratch64);
|
||||
}
|
||||
|
||||
void MacroAssembler::cmp32Move32(Condition cond, Register lhs, Register rhs,
|
||||
|
|
|
@ -50,6 +50,12 @@ const vixl::MacroAssembler& MacroAssemblerCompat::asVIXL() const {
|
|||
return *static_cast<const vixl::MacroAssembler*>(this);
|
||||
}
|
||||
|
||||
void MacroAssemblerCompat::mov(CodeLabel* label, Register dest) {
|
||||
BufferOffset bo = movePatchablePtr(ImmPtr(/* placeholder */ nullptr), dest);
|
||||
label->patchAt()->bind(bo.getOffset());
|
||||
label->setLinkMode(CodeLabel::MoveImmediate);
|
||||
}
|
||||
|
||||
BufferOffset MacroAssemblerCompat::movePatchablePtr(ImmPtr ptr, Register dest) {
|
||||
const size_t numInst = 1; // Inserting one load instruction.
|
||||
const unsigned numPoolEntries = 2; // Every pool entry is 4 bytes.
|
||||
|
|
|
@ -722,6 +722,7 @@ class MacroAssemblerCompat : public vixl::MacroAssembler {
|
|||
void mov(ImmPtr imm, Register dest) { movePtr(imm, dest); }
|
||||
void mov(wasm::SymbolicAddress imm, Register dest) { movePtr(imm, dest); }
|
||||
void mov(Register src, Register dest) { movePtr(src, dest); }
|
||||
void mov(CodeLabel* label, Register dest);
|
||||
|
||||
void move32(Imm32 imm, Register dest) {
|
||||
Mov(ARMRegister(dest, 32), (int64_t)imm.value);
|
||||
|
@ -2016,10 +2017,6 @@ class MacroAssemblerCompat : public vixl::MacroAssembler {
|
|||
}
|
||||
}
|
||||
|
||||
// FIXME: Should be in Assembler?
|
||||
// FIXME: Should be const?
|
||||
uint32_t currentOffset() const { return nextOffset().getOffset(); }
|
||||
|
||||
protected:
|
||||
bool buildOOLFakeExitFrame(void* fakeReturnAddr) {
|
||||
uint32_t descriptor = MakeFrameDescriptor(framePushed(), FrameType::IonJS,
|
||||
|
|
|
@ -32,7 +32,10 @@
|
|||
#define JS_SMALL_BRANCH
|
||||
#endif
|
||||
|
||||
#if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
|
||||
#if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64) || \
|
||||
defined(JS_CODEGEN_ARM64)
|
||||
// JS_CODELABEL_LINKMODE gives labels additional metadata
|
||||
// describing how Bind() should patch them.
|
||||
#define JS_CODELABEL_LINKMODE
|
||||
#endif
|
||||
|
||||
|
|
|
@ -6,5 +6,5 @@
|
|||
== box-sizing-content-box-002.xht box-sizing-content-box-002-ref.xht
|
||||
== box-sizing-content-box-003.xht box-sizing-content-box-003-ref.xht
|
||||
fuzzy-if(skiaContent,0-15,0-50) fuzzy-if(OSX,0-255,0-4875) skip-if(Android||gtkWidget) == box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht # bug 982547, Bug 1295466, Bug 1321707, Bug 1338039
|
||||
fuzzy-if(Android,0-27,0-874) fuzzy-if(gtkWidget,0-255,0-2775) == box-sizing-replaced-002.xht box-sizing-replaced-002-ref.xht # Bug 1128229, Bug 1313772
|
||||
fuzzy-if(Android&&isDebugBuild,0-27,0-874) fuzzy-if(Android&&!isDebugBuild,0-255,0-2625) fuzzy-if(gtkWidget,0-255,0-2775) == box-sizing-replaced-002.xht box-sizing-replaced-002-ref.xht # Bug 1128229, Bug 1313772 # Bug 1465260
|
||||
fuzzy-if(Android,0-27,0-925) fuzzy-if(gtkWidget,0-14,0-43) == box-sizing-replaced-003.xht box-sizing-replaced-003-ref.xht # Bug 1128229
|
||||
|
|
|
@ -1,2 +1,4 @@
|
|||
[object-position-svg-001o.html]
|
||||
disabled:
|
||||
if webrender: bug 1463827
|
||||
expected: FAIL
|
||||
|
|
|
@ -581,34 +581,6 @@ function fetchRegion(ss) {
|
|||
});
|
||||
}
|
||||
|
||||
// This converts our legacy google engines to the
|
||||
// new codes. We have to manually change them here
|
||||
// because we can't change the default name in absearch.
|
||||
function convertGoogleEngines(engineNames) {
|
||||
let overrides = {
|
||||
"google": "google-b-d",
|
||||
"google-2018": "google-b-1-d",
|
||||
};
|
||||
|
||||
let esrOverrides = {
|
||||
"google": "google-b-e",
|
||||
"google-2018": "google-b-1-e",
|
||||
"google-b-d": "google-b-e",
|
||||
"google-b-1-d": "google-b-1-e",
|
||||
};
|
||||
|
||||
if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) {
|
||||
overrides = esrOverrides;
|
||||
}
|
||||
for (let engine in overrides) {
|
||||
let index = engineNames.indexOf(engine);
|
||||
if (index > -1) {
|
||||
engineNames[index] = overrides[engine];
|
||||
}
|
||||
}
|
||||
return engineNames;
|
||||
}
|
||||
|
||||
// This will make an HTTP request to a Mozilla server that will return
|
||||
// JSON data telling us what engine should be set as the default for
|
||||
// the current region, and how soon we should check again.
|
||||
|
@ -3596,8 +3568,6 @@ SearchService.prototype = {
|
|||
}
|
||||
}
|
||||
|
||||
engineNames = convertGoogleEngines(engineNames);
|
||||
|
||||
for (let name of engineNames) {
|
||||
uris.push(APP_SEARCH_PREFIX + name + ".xml");
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче