Skip to content
This repository has been archived by the owner on Jul 3, 2018. It is now read-only.

Commit

Permalink
merge upstream Gecko and SpiderNode
Browse files Browse the repository at this point in the history
  • Loading branch information
mykmelez committed Dec 26, 2016
1 parent 6a4b862 commit 30814a9
Show file tree
Hide file tree
Showing 30,824 changed files with 2,415,763 additions and 1,132,380 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .cargo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config
34 changes: 34 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,37 @@ BasedOnStyle: Mozilla

# Ignore all comments because they aren't reflowed properly.
CommentPragmas: "^"

# Force pointers to the type for C++.
DerivePointerAlignment: false
PointerAlignment: Left

# Prevent the loss of indentation with these macros
MacroBlockBegin: "^\
NS_INTERFACE_MAP_BEGIN|\
NS_INTERFACE_TABLE_HEAD|\
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION|\
NS_IMPL_CYCLE_COLLECTION_.*_BEGIN|\
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED|\
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED|\
NS_INTERFACE_TABLE_BEGIN|\
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$"
MacroBlockEnd: "^\
NS_INTERFACE_MAP_END|\
NS_IMPL_CYCLE_COLLECTION_.*_END|\
NS_INTERFACE_TABLE_END|\
NS_INTERFACE_MAP_END_INHERITING|\
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\
NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED$"

SortIncludes: false


# All of the following items are default
# in the Mozila coding style from clang format 4.0
AlwaysBreakAfterReturnType: TopLevel
BinPackArguments: false
BinPackParameters: false
SpaceAfterTemplateKeyword: false
ReflowComments: false
73 changes: 70 additions & 3 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,70 @@
^mfbt/.*
^js/.*
^media/.*
^build/clang-plugin/tests/.*
^config/gcc-stl-wrapper.template.h
^config/msvc-stl-wrapper.template.h
^js/src/jsapi-tests/.*

# Generated from ./tools/rewriting/ThirdPartyPaths.txt
# awk '{print "^"$1".*"}' ./tools/rewriting/ThirdPartyPaths.txt
^browser/components/translation/cld2/.*
^build/stlport/.*
^db/sqlite3/src/.*
^dom/media/platforms/ffmpeg/libav.*
^extensions/spellcheck/hunspell/src/.*
^gfx/2d/convolver.*
^gfx/2d/image_operations.*
^gfx/angle/.*
^gfx/cairo/.*
^gfx/graphite2/.*
^gfx/harfbuzz/.*
^gfx/ots/.*
^gfx/qcms/.*
^gfx/skia/.*
^gfx/ycbcr/.*
^intl/hyphenation/hyphen/.*
^intl/icu/.*
^ipc/chromium/.*
^js/src/ctypes/libffi/.*
^js/src/dtoa.c.*
^js/src/jit/arm64/vixl/.*
^media/gmp-clearkey/0.1/openaes/.*
^media/kiss_fft/.*
^media/libav/.*
^media/libcubeb/.*
^media/libjpeg/.*
^media/libmkv/.*
^media/libnestegg/.*
^media/libogg/.*
^media/libopus/.*
^media/libpng/.*
^media/libsoundtouch/.*
^media/libspeex_resampler/.*
^media/libstagefright/.*
^media/libtheora/.*
^media/libtremor/.*
^media/libvorbis/.*
^media/libvpx/.*
^media/libyuv/.*
^media/mtransport/.*
^media/openmax_dl/.*
^media/pocketsphinx/.*
^media/sphinxbase/.*
^media/webrtc/trunk/.*
^memory/jemalloc/src/.*
^mfbt/decimal/.*
^mfbt/double-conversion/.*
^mfbt/lz4.*
^mobile/android/thirdparty/.*
^modules/brotli/.*
^modules/freetype2/.*
^modules/libbz2/.*
^modules/libmar/.*
^modules/zlib/.*
^netwerk/sctp/src/.*
^netwerk/srtp/src/.*
^nsprpub/.*
^other-licenses/.*
^security/sandbox/chromium/.*
^testing/gtest/gmock/.*
^testing/gtest/gtest/.*
^toolkit/components/protobuf/.*
^toolkit/crashreporter/google-breakpad/.*
16 changes: 16 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Checks run by clang-tidy over Mozilla code.

# The following checks are currently enabled:
# * modernize-raw-string-literal -
# Replace string literals containing escaped characters with raw string literals
# * modernize-use-bool-literals
# Replace integer literals which are cast to bool
# * modernize-loop-convert
# Converts for(...; ...; ...) loops to use the new range-based loops in C++11
# * modernize-use-default
# Replace default bodies of special member functions with = default;
# * modernize-use-override
# Use C++11's override and remove virtual where applicable

Checks: '-*, modernize-raw-string-literal, modernize-use-bool-literals, modernize-loop-convert, modernize-use-default, modernize-use-override'

70 changes: 25 additions & 45 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ python/**
rdf/**
startupcache/**
testing/**
!tools/lint/eslint/eslint-plugin-mozilla/
tools/lint/eslint/eslint-plugin-mozilla/node_modules/**
tools/**
tools/update-packaging/**
uriloader/**
view/**
widget/**
Expand All @@ -57,92 +55,74 @@ b2g/locales/en-US/b2g-l10n.js

# browser/ exclusions
browser/app/**
browser/branding/**/firefox-branding.js
browser/base/content/browser-social.js
browser/base/content/nsContextMenu.js
browser/base/content/sanitizeDialog.js
browser/base/content/test/general/file_csp_block_all_mixedcontent.html
browser/base/content/test/urlbar/file_blank_but_not_blank.html
browser/base/content/newtab/**
browser/components/downloads/**
browser/components/feeds/**
browser/components/privatebrowsing/**
browser/components/sessionstore/**
browser/components/tabview/**
browser/components/translation/**
# generated files in cld2
browser/components/translation/cld2/cld-worker.js
browser/extensions/pdfjs/**
# generated or library files in pocket
browser/extensions/pocket/content/panels/js/tmpl.js
browser/extensions/pocket/content/panels/js/vendor/**
browser/locales/**
# imported from chromium
browser/extensions/mortar/**

# devtools/ exclusions
devtools/client/canvasdebugger/**
devtools/client/commandline/**
devtools/client/debugger/**
devtools/client/eyedropper/**
devtools/client/framework/**
!devtools/client/framework/selection.js
!devtools/client/framework/toolbox.js
devtools/client/jsonview/lib/**
devtools/client/memory/**
devtools/client/netmonitor/test/**
devtools/client/netmonitor/har/test/**
devtools/client/projecteditor/**
devtools/client/promisedebugger/**
devtools/client/responsivedesign/**
devtools/client/scratchpad/**
devtools/client/shadereditor/**
devtools/client/shared/*.jsm
devtools/client/shared/webgl-utils.js
devtools/client/shared/developer-toolbar.js
devtools/client/shared/components/test/**
devtools/client/shared/redux/middleware/test/**
devtools/client/shared/test/**
!devtools/client/shared/test/test-actor-registry.js
devtools/client/shared/widgets/*.jsm
devtools/client/sourceeditor/test/*.js
devtools/client/webaudioeditor/**
devtools/client/webconsole/**
!devtools/client/webconsole/panel.js
!devtools/client/webconsole/jsterm.js
!devtools/client/webconsole/console-commands.js
devtools/client/webconsole/net/**
devtools/client/webconsole/test/**
devtools/client/webconsole/console-output.js
devtools/client/webconsole/hudservice.js
devtools/client/webconsole/utils.js
devtools/client/webconsole/webconsole-connection-proxy.js
devtools/client/webconsole/webconsole.js
devtools/client/webide/**
!devtools/client/webide/components/webideCli.js
devtools/server/*.js
devtools/server/*.jsm
!devtools/server/child.js
!devtools/server/css-logic.js
!devtools/server/main.js
!devtools/server/websocket-server.js
devtools/server/actors/**
devtools/server/actors/*.js
!devtools/server/actors/csscoverage.js
!devtools/server/actors/inspector.js
!devtools/server/actors/highlighters/css-grid.js
!devtools/server/actors/highlighters/eye-dropper.js
!devtools/server/actors/layout.js
!devtools/server/actors/string.js
!devtools/server/actors/styles.js
!devtools/server/actors/tab.js
!devtools/server/actors/webbrowser.js
!devtools/server/actors/webextension.js
!devtools/server/actors/styles.js
!devtools/server/actors/string.js
!devtools/server/actors/csscoverage.js
devtools/server/performance/**
devtools/server/tests/**
devtools/shared/*.js
!devtools/shared/async-storage.js
!devtools/shared/async-utils.js
!devtools/shared/defer.js
!devtools/shared/event-emitter.js
!devtools/shared/indentation.js
!devtools/shared/loader-plugin-raw.jsm
!devtools/shared/task.js
devtools/shared/*.jsm
!devtools/shared/Loader.jsm
!devtools/server/actors/webextension-inspected-window.js
devtools/server/tests/browser/**
!devtools/server/tests/browser/browser_webextension_inspected_window.js
devtools/server/tests/mochitest/**
devtools/server/tests/unit/**
devtools/shared/apps/**
devtools/shared/client/**
devtools/shared/discovery/**
devtools/shared/gcli/**
!devtools/shared/gcli/templater.js
devtools/shared/heapsnapshot/**
devtools/shared/layout/**
devtools/shared/locales/**
devtools/shared/performance/**
!devtools/shared/platform/**
devtools/shared/qrcode/**
Expand Down Expand Up @@ -178,6 +158,7 @@ devtools/client/shared/demangle.js
devtools/client/shared/vendor/*
devtools/client/sourceeditor/codemirror/*.js
devtools/client/sourceeditor/codemirror/**/*.js
devtools/client/sourceeditor/test/cm_mode_ruby.js
devtools/client/sourceeditor/test/codemirror/*
devtools/client/inspector/markup/test/lib_*
devtools/client/jsonview/lib/require.js
Expand Down Expand Up @@ -242,7 +223,6 @@ toolkit/components/reader/JSDOMParser.js
# Uses preprocessing
toolkit/content/widgets/wizard.xml
toolkit/components/jsdownloads/src/DownloadIntegration.jsm
toolkit/components/search/nsSearchService.js
toolkit/components/url-classifier/**
toolkit/components/urlformatter/nsURLFormatter.js
toolkit/identity/FirefoxAccounts.jsm
Expand Down
12 changes: 0 additions & 12 deletions .eslintrc

This file was deleted.

20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
"use strict";

module.exports = {
// When adding items to this file please check for effects on sub-directories.
"plugins": [
"mozilla"
],
"rules": {
"mozilla/import-globals": "warn",

// No (!foo in bar) or (!object instanceof Class)
"no-unsafe-negation": "error",
},
"env": {
"es6": true
},
"parserOptions": {
"ecmaVersion": 8,
},
};
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[flake8]
# See http://pep8.readthedocs.io/en/latest/intro.html#configuration
ignore = E121, E123, E126, E129, E133, E226, E241, E242, E704, W503, E402
max-line-length = 99
filename = *.py, +.lint
7 changes: 7 additions & 0 deletions .gdbinit
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ handle SIG32 noprint nostop pass
handle SIG33 noprint nostop pass
handle SIGPIPE noprint nostop pass

# Don't stop for certain other signals where it's not useful,
# such as the SIG64 signals triggered by the Linux
# sandboxing code on older kernels.
handle SIG38 noprint nostop pass
handle SIG64 noprint nostop pass
handle SIGSYS noprint nostop pass

# Show the concrete types behind nsIFoo
set print object on

Expand Down
4 changes: 3 additions & 1 deletion .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ GPATH

# Ignore talos virtualenv and tp5n files.
# The tp5n set is supposed to be decompressed at
# testing/talos/talos/page_load_test/tp5n in order to run tests like tps
# testing/talos/talos/tests/tp5n in order to run tests like tps
# locally. Similarly, running talos requires a Python package virtual
# environment. Both the virtual environment and tp5n files end up littering
# the status command, so we ignore them.
Expand All @@ -124,8 +124,10 @@ GPATH
^testing/talos/include/
^testing/talos/lib/
^testing/talos/talos/tests/tp5n.zip
^testing/talos/talos/tests/tp5n.tar.gz
^testing/talos/talos/tests/tp5n
^testing/talos/talos/tests/devtools/damp.manifest.develop
^talos-venv

# Ignore files created when running a reftest.
^lextab.py$
Expand Down
1 change: 1 addition & 0 deletions .hgtags
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,4 @@ fcef8ded82219c89298b4e376cfbdfba79a1d35a FIREFOX_AURORA_43_BASE
d98f20c25feeac4dd7ebbd1c022957df1ef58af4 FIREFOX_AURORA_49_BASE
465d150bc8be5bbf9f02a8607d4552b6a5e1697c FIREFOX_AURORA_50_BASE
fc69febcbf6c0dcc4b3dfc7a346d8d348798a65f FIREFOX_AURORA_51_BASE
1196bf3032e1bce1fb07a01fd9082a767426c5fb FIREFOX_AURORA_52_BASE
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ Ryan Flint <[email protected]>
Ryan Jones <[email protected]>
Ryan VanderMeulen <[email protected]>
Ryoichi Furukawa <[email protected]>
Sanyam Khurana <[email protected]>
[email protected]
Samir Gehani <[email protected]>
Sammy Ford
Expand Down
2 changes: 1 addition & 1 deletion CLOBBER
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Merge day clobber
Bug 1322938 needs a clobber for test_lowDiskSpace.html on Android
Loading

0 comments on commit 30814a9

Please sign in to comment.