| OLD | NEW |
| 1 # Building PDFium | 1 # Building PDFium |
| 2 | 2 |
| 3 ## Prerequisites | 3 ## Prerequisites |
| 4 | 4 |
| 5 Get the chromium depot tools via the instructions at | 5 Get the chromium depot tools via the instructions at |
| 6 http://www.chromium.org/developers/how-tos/install-depot-tools (this provides | 6 http://www.chromium.org/developers/how-tos/install-depot-tools (this provides |
| 7 the gclient utilty needed below). | 7 the gclient utilty needed below). |
| 8 | 8 |
| 9 Also install Python, Subversion, and Git and make sure they're in your path. | 9 Also install Python, Subversion, and Git and make sure they're in your path. |
| 10 | 10 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 The pdfium\_test program supports reading, parsing, and rasterizing the pages of | 62 The pdfium\_test program supports reading, parsing, and rasterizing the pages of |
| 63 a .pdf file to .ppm or .png output image files (windows supports two other | 63 a .pdf file to .ppm or .png output image files (windows supports two other |
| 64 formats). For example: `out/Debug/pdfium_test --ppm path/to/myfile.pdf | 64 formats). For example: `out/Debug/pdfium_test --ppm path/to/myfile.pdf |
| 65 ` | 65 ` |
| 66 | 66 |
| 67 ## Waterfall | 67 ## Waterfall |
| 68 | 68 |
| 69 The current health of the source tree can be found at | 69 The current health of the source tree can be found at |
| 70 http://build.chromium.org/p/client.pdfium/console | 70 http://build.chromium.org/p/client.pdfium/console |
| 71 | 71 |
| 72 ## Bugs |
| 73 |
| 74 We will be using this |
| 75 [bug tracker](https://code.google.com/p/pdfium/issues/list), but for security |
| 76 bugs, please use [Chromium's security bug template] |
| 77 (https://code.google.com/p/chromium/issues/entry?template=Security%20Bug) |
| 78 and add the "Cr-Internals-Plugins-PDF" label. |
| 79 |
| 80 ## Contributing code |
| 81 |
| 82 For contributing code, we will follow |
| 83 [Chromium's process](http://dev.chromium.org/developers/contributing-code) |
| 84 as much as possible. The main exceptions are: |
| 85 |
| 86 1. Code has to conform to the existing style and not Chromium/Google style. |
| 87 2. There is no commit queue, approved committers can land their changes via |
| 88 `git cl land` |
| 89 3. Changes must be merged to the XFA branch as well (see below). |
| 90 |
| 72 ## Branches | 91 ## Branches |
| 73 | 92 |
| 74 There is a branch for a forthcoming feature called XFA that you can get by | 93 There is a branch for a forthcoming feature called XFA that you can get by |
| 75 following the steps above, then: `git checkout origin/xfa build/gyp_pdfium ninja | 94 following the steps above, then: |
| 76 -C out/Debug | 95 |
| 77 ` | 96 ``` |
| 97 git checkout origin/xfa |
| 98 build/gyp_pdfium |
| 99 ninja -C out/Debug |
| 100 ``` |
| 101 |
| 102 Merging to XFA requires: |
| 103 |
| 104 ``` |
| 105 git checkout origin/xfa |
| 106 git checkout -b merge_branch |
| 107 git branch --set-upstream-to=origin/xfa |
| 108 git cherry-pick -x <commit hash> |
| 109 git commit --amend # add Merge to XFA |
| 110 git cl upload |
| 111 ``` |
| 112 |
| 113 Then wait for approval, and `git cl land` |
| OLD | NEW |