mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out 4 changesets (bug 1648858) for SM bustages. CLOSED TREE 

Backed out changeset 5a612e42b77d (bug 1648858)
Backed out changeset 3a1b5e883a4e (bug 1648858)
Backed out changeset 816eaac72512 (bug 1648858)
Backed out changeset 8ae692d68b1b (bug 1648858)
This commit is contained in:
Razvan Maries 2020-07-02 05:54:53 +03:00
Родитель 73b2b140cc
Коммит 3dc54daa55
16 изменённых файлов: 1020 добавлений и 1380 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/base/content/test/static/browser_all_files_referenced.js
Просмотреть файл

@ -178,8 +178,6 @@ var whitelist = [
},
// Bug 1356031 (only used by devtools)
{ file: "chrome://global/skin/icons/error-16.png" },
// Bug 1641777 (only used by devtools)
{ file: "chrome://global/content/third_party/d3/d3.js" },
// Bug 1344267
{ file: "chrome://marionette/content/test.xhtml" },
{ file: "chrome://marionette/content/test_dialog.properties" },

1
devtools/client/jar.mn
Просмотреть файл

@ -4,6 +4,7 @@
devtools.jar:
% content devtools %content/
content/shared/vendor/d3.js (shared/vendor/d3.js)
content/shared/vendor/dagre-d3.js (shared/vendor/dagre-d3.js)
content/shared/widgets/widgets.css (shared/widgets/widgets.css)
content/webconsole/index.html (webconsole/index.html)

2
devtools/client/memory/index.xhtml
Просмотреть файл

@ -23,7 +23,7 @@
defer="true">
</script>
<script src="chrome://global/content/third_party/d3/d3.js"
<script src="chrome://devtools/content/shared/vendor/d3.js"
defer="true">
</script>

2
devtools/client/memory/test/browser/browser_memory_tree_map-01.js
Просмотреть файл

@ -9,7 +9,7 @@
const CanvasUtils = require("devtools/client/memory/components/tree-map/canvas-utils");
const D3_SCRIPT =
'<script type="application/javascript" ' +
'src="chrome://global/content/third_party/d3/d3.js">';
'src="chrome://devtools/content/shared/vendor/d3.js>';
const TEST_URL = `data:text/html,<html><body>${D3_SCRIPT}</body></html>`;
this.test = makeMemoryTest(TEST_URL, async function({ tab, panel }) {

2
devtools/client/memory/test/chrome/test_ShortestPaths_01.html
Просмотреть файл

@ -10,7 +10,7 @@ Test that the ShortestPaths component properly renders a graph of the merged sho
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
<script type="application/javascript"
src="chrome://global/content/third_party/d3/d3.js">
src="chrome://devtools/content/shared/vendor/d3.js">
</script>
<script type="application/javascript"
src="chrome://devtools/content/shared/vendor/dagre-d3.js">

2
devtools/client/memory/test/chrome/test_ShortestPaths_02.html
Просмотреть файл

@ -10,7 +10,7 @@ Test that the ShortestPaths component renders a suggestion to select a node when
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
<script type="application/javascript"
src="chrome://global/content/third_party/d3/d3.js">
src="chrome://devtools/content/shared/vendor/d3.js">
</script>
<script type="application/javascript"
src="chrome://devtools/content/shared/vendor/dagre-d3.js">

2
devtools/client/memory/test/chrome/test_TreeMap_01.html
Просмотреть файл

@ -10,7 +10,7 @@ Test that the Tree Map correctly renders onto 2 managed canvases.
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
<script type="application/javascript"
src="chrome://global/content/third_party/d3/d3.js">
src="chrome://devtools/content/shared/vendor/d3.js">
</script>
</head>
<body>

2293
third_party/js/d3/d3.js → devtools/client/shared/vendor/d3.js поставляемый
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
moz.build
Просмотреть файл

@ -152,7 +152,7 @@ DIRS += [
'config',
'python',
'testing/mozbase',
'third_party',
'third_party/python',
]
if not CONFIG['JS_STANDALONE']:

8
python/mozbuild/mozbuild/vendor/moz_yaml.py поставляемый
Просмотреть файл

@ -40,9 +40,8 @@ VALID_LICENSES = [
# Standard Licenses (as per https://spdx.org/licenses/)
"Apache-2.0",
"BSD-2-Clause",
"BSD-3-Clause",
"BSD-3-Clause-Clear",
"CC0-1.0",
"GPL-3.0",
"ISC",
"ICU",
"LGPL-2.1",
@ -50,9 +49,6 @@ VALID_LICENSES = [
"MIT",
"MPL-1.1",
"MPL-2.0",
"Unlicense",
"WTFPL",
"Zlib",
# Unique Licenses
"ACE", # http://www.cs.wustl.edu/~schmidt/ACE-copying.html
"Anti-Grain-Geometry", # http://www.antigrain.com/license/index.html
@ -456,7 +452,7 @@ class UpdateActions(object):
class License(object):
"""Voluptuous validator which verifies the license(s) are valid as per our
allow list."""
whitelist."""
def __call__(self, values):
if isinstance(values, str):

26
third_party/js/d3/LICENSE поставляемый
Просмотреть файл

@ -1,26 +0,0 @@
Copyright (c) 2010-2016, Michael Bostock
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* The name Michael Bostock may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

38
third_party/js/d3/moz.yaml поставляемый
Просмотреть файл

@ -1,38 +0,0 @@
# Version of this schema
schema: 1
bugzilla:
# Bugzilla product and component for this directory and subdirectories
product: Toolkit
component: General
# Document the source of externally hosted code
origin:
# Short name of the package/library
name: D3.js
description: JavaScript library for visualizing data using web standards
# Full URL for the package's homepage/etc
# Usually different from repository url
url: https://d3js.org/
# Human-readable identifier for this version/release
# Generally "version NNN", "tag SSS", "bookmark SSS"
release: version 3.4.2
# Revision to pull in
# Must be a long or short commit SHA (long preferred)
revision: 04fa5dd3856de768b43b4aac9e34c112f1227a17
# The package's license, where possible using the mnemonic from
# https://spdx.org/licenses/
# Multiple licenses can be specified (as a YAML list)
# A "LICENSE" file must exist containing the full license text
license: BSD-3-Clause
# If the package's license is specified in a particular file,
# this is the name of the file.
# optional
license-file: LICENSE

6
third_party/js/jar.mn поставляемый
Просмотреть файл

@ -1,6 +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/.
toolkit.jar:
content/global/third_party/d3/d3.js (d3/d3.js)

6
third_party/moz.build поставляемый
Просмотреть файл

@ -24,9 +24,3 @@ with Files('sqlite3/**'):
with Files('rlbox/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')
JAR_MANIFESTS += ['js/jar.mn']
DIRS += [
'python',
]

4
third_party/sqlite3/README.MOZILLA поставляемый
Просмотреть файл

@ -3,8 +3,8 @@ Check sqlite3.h for the version number and source id.
See http://www.sqlite.org/ for more info.
We have a mozilla-specific moz.build in src/ (normally no
moz.build there) that we use to build.
We have a mozilla-specific Makefile.in in src/ (normally no
Makefile.in there) that we use to build.
To move to a new version:

4
toolkit/content/license.html
Просмотреть файл

@ -3224,10 +3224,10 @@ DEALINGS IN THE SOFTWARE.
<h1><a id="d3"></a>D3 License</h1>
<p>This license applies to the file
<code>third_party/js/d3/d3.js</code>.
<code>devtools/client/shared/d3.js</code>.
</p>
<pre>
Copyright (c) 2010-2016, Michael Bostock
Copyright (c) 2014, Michael Bostock
All rights reserved.
Redistribution and use in source and binary forms, with or without