Age | Commit message (Collapse) | Author |
|
Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
follwed by scripts.
Original Review URL: https://codereview.chromium.org/1179693003.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1179953002.
|
|
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
|
|
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
|
|
New manual edits in the following to fix compilation:
fx_bmp.h, fx_gif.h, fx_graphics.h
Original Review URL: https://codereview.chromium.org/1169963003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1170103004
|
|
Original Review URL: https://codereview.chromium.org/1128043009
Original Review URL: https://codereview.chromium.org/1142463005
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1144683002
|
|
Review URL: https://codereview.chromium.org/1084303002
(cherry picked from commit cfc1a654ef3e8b65bc447815d35932c185bf1422)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1125363002
|
|
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
|
|
|