| OLD | NEW |
| 1 Multiple repo Chromium trybots | 1 Multiple repo Chromium trybots |
| 2 ============================== | 2 ============================== |
| 3 | 3 |
| 4 When a proposed Skia change will require a change in Chromium or Blink it is | 4 When a proposed Skia change will require a change in Chromium or Blink it is |
| 5 often helpful to locally create the Chromium and Blink changes and test with the | 5 often helpful to locally create the Chromium and Blink changes and test with the |
| 6 proposed Skia change. This often happens with Skia API changes and changes | 6 proposed Skia change. This often happens with Skia API changes and changes |
| 7 which affect Blink layout tests. While simple to do locally, this explains how | 7 which affect Blink layout tests. While simple to do locally, this explains how |
| 8 to do so on the Chromium trybots. | 8 to do so on the Chromium trybots. |
| 9 | 9 |
| 10 The basic idea is to make your Chromium and Blink change in the usual way, but | 10 The basic idea is to make your Chromium and Blink change in the usual way, but |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 If this is for a project other than Skia, update the 'root_dir' and 'server'. | 38 If this is for a project other than Skia, update the 'root_dir' and 'server'. |
| 39 Note that this can be used multiple times to apply multiple issues. | 39 Note that this can be used multiple times to apply multiple issues. |
| 40 | 40 |
| 41 To find the patchset number in Rietveld use the URL of the '[raw]' (old UI) or | 41 To find the patchset number in Rietveld use the URL of the '[raw]' (old UI) or |
| 42 'Raw Patch' (new UI) link on the desired patch. The last segment of this URL | 42 'Raw Patch' (new UI) link on the desired patch. The last segment of this URL |
| 43 has the form 'issue\<issue>_\<patchset>.diff'. | 43 has the form 'issue\<issue>_\<patchset>.diff'. |
| 44 | 44 |
| 45 An example of this being used can be seen at | 45 An example of this being used can be seen at |
| 46 https://crrev.com/1877673002/#ps120001 . | 46 https://crrev.com/1877673002/#ps120001 . |
| 47 | 47 |
| 48 Finally, run the post-sync hooks again to update the Skia source code |
| 49 |
| 50 $ gclient runhooks |
| 51 |
| 52 Note that if your local skia patch in `third_party/skia` isn't clean (e.g., you |
| 53 already applied some patch to it), then `gclient runhooks` won't successfully |
| 54 run. In that case, run `git reset --hard` inside `third_party/skia` before |
| 55 `gclient runhooks`. |
| 48 | 56 |
| 49 External changes not in rietveld | 57 External changes not in rietveld |
| 50 -------------------------------- | 58 -------------------------------- |
| 51 If the patch is to files where the above is not possible, then it is still | 59 If the patch is to files where the above is not possible, then it is still |
| 52 possible to patch the files manually by adding the following to | 60 possible to patch the files manually by adding the following to |
| 53 \<chromium>/src/DEPS in the 'hooks' array just before the 'gyp' hook. | 61 \<chromium>/src/DEPS in the 'hooks' array just before the 'gyp' hook. |
| 54 | 62 |
| 55 { | 63 { |
| 56 'name': 'apply_custom_patch', | 64 'name': 'apply_custom_patch', |
| 57 'pattern': '.', | 65 'pattern': '.', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 68 \<chromium>/src/patch/third_party/skia/include/core/SkPath.h. | 76 \<chromium>/src/patch/third_party/skia/include/core/SkPath.h. |
| 69 | 77 |
| 70 An example of this being used can be seen at | 78 An example of this being used can be seen at |
| 71 https://crrev.com/1866773002/#ps20001 . | 79 https://crrev.com/1866773002/#ps20001 . |
| 72 | 80 |
| 73 | 81 |
| 74 Try the patch | 82 Try the patch |
| 75 ------------- | 83 ------------- |
| 76 After committing these \<chromium>/src/DEPS and \<chromium>/src/patch/ changes | 84 After committing these \<chromium>/src/DEPS and \<chromium>/src/patch/ changes |
| 77 locally, 'git cl upload' can be used in the usual way. Be sure to add | 85 locally, 'git cl upload' can be used in the usual way. Be sure to add |
| 78 'COMMIT=false' to the issue description to avoid accidentally checking it in. | 86 'COMMIT=false' to the issue description to avoid accidentally checking it in. |
| OLD | NEW |