Commit fd25889a authored by Cosmin Sabou's avatar Cosmin Sabou
Browse files

Merge mozilla-central to mozilla-inbound.

parents 179c59ef 530b9c7e

Cargo.lock

+29 −184

File changed.

Preview size limit exceeded, changes collapsed.

browser/base/content/test/static/browser_all_files_referenced.js

+2 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ var whitelist = [ 
  {file: "chrome://pippki/content/resetpassword.xul"},

  // Bug 1337345

  {file: "resource://gre/modules/Manifest.jsm"},

  // Bug 1548381

  {file: "resource://gre/modules/PasswordGenerator.jsm"},

  // Bug 1351097

  {file: "resource://gre/modules/accessibility/AccessFu.jsm"},

  // Bug 1356043

gfx/wr/Cargo.lock

+29 −164

File changed.

Preview size limit exceeded, changes collapsed.

gfx/wr/webrender/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ time = "0.1" 
api = { version = "0.60.0", path = "../webrender_api", package = "webrender_api" }

webrender_build = { version = "0.0.1", path = "../webrender_build" }

malloc_size_of = { version = "0.0.1", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }

ws = { optional = true, version = "0.8" }

ws = { optional = true, version = "0.7.3" }

svg_fmt = "0.4"



[dependencies.pathfinder_font_renderer]

python/mozbuild/mozbuild/vendor_rust.py

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ Please commit or stash these changes before vendoring, or re-run with `--ignore- 
            'bindgen',

            'fuchsia-zircon',

            'fuchsia-zircon-sys',

            'fuchsia-cprng',

        ]

    }
@@ -173,6 +172,7 @@ Please commit or stash these changes before vendoring, or re-run with `--ignore- 
    # license, but that also need to explicitly mentioned in about:license.

    RUNTIME_LICENSE_PACKAGE_WHITELIST = {

        'BSD-3-Clause': [

            'sha1',

        ]

    }