Update instructions on Skia/Chromium multi try.

Change-Id: I7ac583dbf04d18210847c54f7c69cf8a4f46deea
Reviewed-on: https://skia-review.googlesource.com/10597
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>

diff --git a/site/dev/chrome/multi_repo_trybots.md b/site/dev/chrome/multi_repo_trybots.md
index c3ffbe2..4c6f09d 100644 (file)
--- a/site/dev/chrome/multi_repo_trybots.md
+++ b/site/dev/chrome/multi_repo_trybots.md
@@ -9,43 +9,42 @@ to do so on the Chromium trybots.
 
 Skia only changes
 -----------------
-If the Skia patch is already in Rietveld and there are no associated Chromium
+If the Skia patch is already in Gerrit and there are no associated Chromium
 changes, then it is possible to just run the Chromium trybots. This will apply
 the Skia patch and run the bot.
 
 Skia and Chromium changes
 -------------------------
-If the Skia patch is already in Rietveld and there are associated Chromium
+If the Skia patch is already in Gerrit and there are associated Chromium
 changes, then in the Chromium CL add the following to
-\<chromium>/src/DEPS in the 'hooks' array just before the 'gyp' hook.
+\<chromium>/src/DEPS in the 'hooks' array.
 
       {
+        'name': 'fetch_custom_patch',
+        'pattern': '.',
+        'action': [ 'git', '-C', 'src/third_party/skia/',
+                    'fetch', 'https://skia.googlesource.com/skia', 'refs/changes/13/10513/13',
+        ],
+      },
+      {
         'name': 'apply_custom_patch',
         'pattern': '.',
-        'action': ['apply_issue',
-                   '--root_dir', 'src/third_party/skia',
-                   '--issue', '1873923002',
-                   '--patchset', '160001',
-                   '--server', 'https://codereview.chromium.org',
-                   '--force',
-                   '--ignore_deps',
-                   '-v',
-                   '-v',
-                   '--no-auth',
-                   '--blacklist', 'DEPS'
+        'action': ['git', '-C', 'src/third_party/skia/',
+                   'cherry-pick', 'FETCH_HEAD',
         ],
       },
 
-Modify the 'issue' and 'patchset' to the appropriate values.
-If this is for a project other than Skia, update the 'root_dir' and 'server'.
-Note that this can be used multiple times to apply multiple issues.
+Modify the 'refs/changes/XX/YYYY/ZZ' to the appropriate values (where YYYY is
+the numeric change number, ZZ is the patch set number and XX is the last two
+digits of the numeric change number). This can be seen in the 'Download' link on
+Gerrit.
 
-To find the patchset number in Rietveld use the URL of the '[raw]' (old UI) or
-'Raw Patch' (new UI) link on the desired patch. The last segment of this URL
-has the form 'issue\<issue>_\<patchset>.diff'.
+If this is for a project other than Skia, update the checkout directory and
+fetch source. Note that this can be used multiple times to apply multiple
+issues.
 
 An example of this being used can be seen at
-https://crrev.com/1877673002/#ps120001 .
+https://crrev.com/2786433004/#ps1 .
 
 To test locally, run `gclient runhooks` to update the Skia source code.
 Note that if your local skia patch in `third_party/skia` isn't clean (e.g., you