diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-22 15:50:03 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-22 15:50:03 -0700 |
| commit | 5d0e8432c63a5e7a0b42fd4621c1c454ff49985e (patch) | |
| tree | e3f42bd19b8ad6ce36b2ef9e250b4def7e2e3b63 /third_party/libjpeg/jerror.h | |
| parent | 7cfadd97215265afd7771d6c36b5cfda54427169 (diff) | |
| download | pdfium-5d0e8432c63a5e7a0b42fd4621c1c454ff49985e.tar.xz | |
Merge to XFA: Use std::set<> to track active event handlers.
Merge conflicts in JS_Runtime.cpp
(cherry picked from commit d8d223127d706aa4961b2c9b0037ab256fce9a8f)
Original Review URL: https://codereview.chromium.org/1352393003 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1365503003 .
Diffstat (limited to 'third_party/libjpeg/jerror.h')
0 files changed, 0 insertions, 0 deletions