Bug 1507524 - Update miscellaneous things with the new WR location. r=jrmuizel
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 22 Nov 2018 21:47:50 +0000
changeset 504193 57c4ae4edecad603cf84f8bceab57765c0859987
parent 504192 89caaea53d18aaf2d4b90b98a2f989a8cdc7062b
child 504194 b7f29f09e6ea1766148add6ab91da70051034743
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1507524
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1507524 - Update miscellaneous things with the new WR location. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D12060
.clang-format-ignore
.eslintignore
gfx/webrender_bindings/README.webrender
tools/rewriting/ThirdPartyPaths.txt
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -71,19 +71,17 @@ gfx/angle/.*
 gfx/cairo/.*
 gfx/graphite2/.*
 gfx/harfbuzz/.*
 gfx/ots/.*
 gfx/qcms/.*
 gfx/sfntly/.*
 gfx/skia/.*
 gfx/vr/service/openvr/.*
-gfx/webrender/.*
-gfx/webrender_api/.*
-gfx/wrench/.*
+gfx/wr/.*
 gfx/ycbcr/.*
 intl/hyphenation/hyphen/.*
 intl/icu/.*
 ipc/chromium/src/third_party/.*
 js/src/ctypes/libffi/.*
 js/src/dtoa.c.*
 js/src/jit/arm64/vixl/.*
 js/src/vtune/disable_warnings.h
--- a/.eslintignore
+++ b/.eslintignore
@@ -243,16 +243,17 @@ dom/imptests/**
 dom/media/webvtt/**
 
 # Third-party
 editor/libeditor/tests/browserscope/**
 
 # Third-party
 gfx/ots/**
 gfx/skia/**
+gfx/wr/**
 
 # intl/ exclusions
 intl/icu/**
 intl/locale/**
 intl/strres/**
 intl/uconv/**
 
 # Exclude everything but self-hosted JS
--- a/gfx/webrender_bindings/README.webrender
+++ b/gfx/webrender_bindings/README.webrender
@@ -28,40 +28,38 @@ For a debug webrender build:
 What if you have to pull in an update to webrender itself? You have two options,
 listed below. Both options will give you a set of patches and the ability to do
 try pushes to verify the update. After that, continue with the steps below to
 actually land the update into the tree.
 
 Option A:
    Use a script to do the update for you. This will usually work, if you satisfy
    all the assumptions the script is making. The script can be found at
-   https://github.com/staktrace/moz-scripts/blob/master/try-latest-webrender.sh
+   https://github.com/staktrace/wrupdater/blob/master/try-latest-webrender.sh
    and contains documentation on how to use it. Read the documentation carefully
    before trying to use it.
 
 Option B:
    Do the update manually. This is a little more cumbersome but may be required
    if the script doesn't work or the repos are in a state that violates hidden
    assumptions in the script (e.g. if the webrender_bindings/Cargo.toml file is
    no longer in the format expected by the script). The steps to do this are,
    roughly:
    - Update your mozilla-central checkout to the latest code on mozilla-central.
    - Check out and update the webrender repo to the version you want
-   - Copy over the webrender, webrender_api, and part of the wrench folders into
-     gfx/. The best way to do this is to simply delete the gfx/webrender,
-     gfx/webrender_api, and gfx/wrench folders and use |cp -R| to copy them in
-     again from the webrender repo, and then delete the gfx/wrench/reftests,
-     gfx/wrench/benchmarks, and gfx/wrench/script folders. Update the revision
-     in gfx/webrender_bindings/revision.txt file with the git changeset hash.
+   - Copy over the webrender repo to gfx/wr. The easiest way to do this is
+     simply delete gfx/wr, and use |cp -R| to copy it back, and then delete the
+     gfx/wr/.git/ subfolder. Update the revision in
+     gfx/webrender_bindings/revision.txt file with the git changeset hash.
    - If you need to modify webrender_bindings/Cargo.toml file, do so now. Changes
      at this step usually consist of:
      (a) Updating version numbers. Go through the version numbers of ALL the
          dependencies in the Cargo.toml file (webrender, euclid, etc.) and make
          sure the version numbers listed match what's in the new
-         gfx/webrender/Cargo.toml and gfx/webrender_api/Cargo.toml files.
+         gfx/wr/webrender/Cargo.toml and gfx/wr/webrender_api/Cargo.toml files.
      (b) Turning on or off any new features that were added in upstream WR. This
          used to happen a lot but is pretty rare now.
    - Go to toolkit/library/rust and run |cargo update -p webrender -p webrender_api|.
      If it complains about version numbers of other crates not lining up, add those
      as well, e.g. |cargo update -p webrender -p webrender_api -p gleam -p euclid|.
      You may need to do this a few times until you get all the crates to make it
      happy.
    - Run the same cargo update command from the previous step in the
--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@@ -29,19 +29,17 @@ gfx/angle/
 gfx/cairo/
 gfx/graphite2/
 gfx/harfbuzz/
 gfx/ots/
 gfx/qcms/
 gfx/sfntly/
 gfx/skia/
 gfx/vr/service/openvr/
-gfx/webrender/
-gfx/webrender_api/
-gfx/wrench/
+gfx/wr/
 gfx/ycbcr/
 intl/hyphenation/hyphen/
 intl/icu/
 ipc/chromium/src/third_party/
 js/src/ctypes/libffi/
 js/src/dtoa.c
 js/src/jit/arm64/vixl/
 js/src/vtune/disable_warnings.h