Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Issue 1239313005: Merge to XFA - else after returns. (Closed)

Created:
5 years, 5 months ago by Tom Sepez
Modified:
5 years, 5 months ago
Reviewers:
Lei Zhang
CC:
pdfium-reviews_googlegroups.com
Base URL:
https://pdfium.googlesource.com/pdfium.git@xfa
Target Ref:
refs/heads/xfa
Visibility:
Public.

Description

Merge to XFA - else after returns. (cherry picked from commit 3c012fef2bb72c8ec1faa73e11ee35539b2559d6) Original Review URL: https://codereview.chromium.org/1243953004 . R=thestig@chromium.org Committed: https://pdfium.googlesource.com/pdfium/+/2f2ffece124e4ed4b96d2846263015d4b5ad6c00

Patch Set 1 #

Total comments: 21

Patch Set 2 : Fix issues. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+18944 lines, -19488 lines) Patch
M core/include/fpdftext/fpdf_text.h View 1 1 chunk +0 lines, -2 lines 0 comments Download
M core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp View 1 1 chunk +2 lines, -1 line 0 comments Download
M core/src/fpdfapi/fpdf_font/fpdf_font.cpp View 1 1 chunk +5 lines, -6 lines 0 comments Download
M core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp View 1 5 chunks +17 lines, -16 lines 0 comments Download
M core/src/fpdfapi/fpdf_page/fpdf_page.cpp View 1 1 chunk +3 lines, -4 lines 0 comments Download
M core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp View 1 4 chunks +10 lines, -12 lines 0 comments Download
M core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp View 1 1 chunk +2 lines, -1 line 0 comments Download
M core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp View 1 1 chunk +13 lines, -7 lines 0 comments Download
M core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp View 1 1 chunk +1 line, -2 lines 0 comments Download
M core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp View 1 1 chunk +4 lines, -5 lines 0 comments Download
M core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp View 1 11 chunks +44 lines, -45 lines 0 comments Download
M core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp View 1 14 chunks +62 lines, -95 lines 0 comments Download
M core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp View 1 1 chunk +2 lines, -1 line 0 comments Download
M core/src/fpdfapi/fpdf_render/fpdf_render.cpp View 1 2 chunks +4 lines, -2 lines 0 comments Download
M core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp View 1 2 chunks +6 lines, -4 lines 0 comments Download
M core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp View 1 3 chunks +12 lines, -6 lines 0 comments Download
M core/src/fpdfdoc/doc_action.cpp View 1 3 chunks +17 lines, -10 lines 0 comments Download
M core/src/fpdfdoc/doc_ap.cpp View 1 1 chunk +7 lines, -7 lines 0 comments Download
M core/src/fpdfdoc/doc_basic.cpp View 1 1 chunk +5 lines, -6 lines 0 comments Download
M core/src/fpdfdoc/doc_form.cpp View 1 3 chunks +97 lines, -111 lines 0 comments Download
M core/src/fpdfdoc/doc_formcontrol.cpp View 1 2 chunks +15 lines, -18 lines 0 comments Download
M core/src/fpdfdoc/doc_formfield.cpp View 1 1 chunk +3 lines, -2 lines 0 comments Download
M core/src/fpdfdoc/doc_metadata.cpp View 1 2 chunks +8 lines, -8 lines 0 comments Download
M core/src/fpdfdoc/doc_ocg.cpp View 1 2 chunks +5 lines, -6 lines 0 comments Download
M core/src/fpdfdoc/doc_utils.cpp View 1 1 chunk +5 lines, -3 lines 0 comments Download
M core/src/fpdfdoc/doc_vt.cpp View 1 16 chunks +55 lines, -73 lines 0 comments Download
M core/src/fpdftext/fpdf_text_int.cpp View 1 12 chunks +24 lines, -166 lines 0 comments Download
M core/src/fpdftext/text_int.h View 1 2 chunks +1 line, -2 lines 0 comments Download
M core/src/fxcodec/codec/fx_codec_icc.cpp View 1 1 chunk +2 lines, -1 line 0 comments Download
M core/src/fxcodec/codec/fx_codec_jbig.cpp View 1 1 chunk +25 lines, -26 lines 0 comments Download
M core/src/fxcodec/codec/fx_codec_jpeg.cpp View 1 1 chunk +4 lines, -2 lines 0 comments Download
M core/src/fxcrt/fx_basic_array.cpp View 1 1 chunk +2 lines, -1 line 0 comments Download
M core/src/fxcrt/fx_basic_bstring.cpp View 1 2 chunks +6 lines, -5 lines 0 comments Download
M core/src/fxcrt/fx_basic_util.cpp View 1 1 chunk +12 lines, -12 lines 0 comments Download
M core/src/fxcrt/fx_basic_wstring.cpp View 1 2 chunks +6 lines, -3 lines 0 comments Download
M core/src/fxge/agg/src/fx_agg_driver.cpp View 1 3 chunks +6 lines, -3 lines 0 comments Download
M core/src/fxge/dib/fx_dib_composite.cpp View 1 4 chunks +8 lines, -4 lines 0 comments Download
M core/src/fxge/dib/fx_dib_convert.cpp View 1 4 chunks +16 lines, -8 lines 0 comments Download
M core/src/fxge/dib/fx_dib_engine.cpp View 1 2 chunks +3 lines, -6 lines 0 comments Download
M core/src/fxge/dib/fx_dib_main.cpp View 1 2 chunks +3 lines, -4 lines 0 comments Download
M core/src/fxge/dib/fx_dib_transform.cpp View 1 1 chunk +4 lines, -2 lines 0 comments Download
M core/src/fxge/ge/fx_ge_device.cpp View 1 1 chunk +5 lines, -4 lines 0 comments Download
M core/src/fxge/ge/fx_ge_font.cpp View 1 3 chunks +12 lines, -15 lines 0 comments Download
M core/src/fxge/ge/fx_ge_fontmap.cpp View 1 3 chunks +4 lines, -8 lines 0 comments Download
M core/src/fxge/ge/fx_ge_linux.cpp View 1 1 chunk +4 lines, -5 lines 0 comments Download
M core/src/fxge/ge/fx_ge_path.cpp View 1 2 chunks +4 lines, -2 lines 0 comments Download
M core/src/fxge/ge/fx_ge_text.cpp View 1 1 chunk +28 lines, -32 lines 0 comments Download
M core/src/fxge/skia/fx_skia_blitter_new.cpp View 1 1 chunk +1530 lines, -1531 lines 0 comments Download
M core/src/fxge/win32/fx_win32_device.cpp View 1 6 chunks +41 lines, -39 lines 0 comments Download
M core/src/fxge/win32/fx_win32_dib.cpp View 1 1 chunk +2 lines, -1 line 0 comments Download
M core/src/fxge/win32/fx_win32_dwrite.cpp View 1 3 chunks +8 lines, -12 lines 0 comments Download
M core/src/fxge/win32/fx_win32_gdipext.cpp View 1 1 chunk +4 lines, -4 lines 0 comments Download
M core/src/fxge/win32/fx_win32_print.cpp View 1 1 chunk +20 lines, -22 lines 0 comments Download
M fpdfsdk/src/formfiller/FFL_ComboBox.cpp View 1 4 chunks +271 lines, -283 lines 0 comments Download
M fpdfsdk/src/formfiller/FFL_IFormFiller.cpp View 1 8 chunks +632 lines, -672 lines 0 comments Download
M fpdfsdk/src/formfiller/FFL_TextField.cpp View 1 5 chunks +227 lines, -227 lines 0 comments Download
M fpdfsdk/src/fpdf_ext.cpp View 1 1 chunk +104 lines, -104 lines 0 comments Download
M fpdfsdk/src/fpdfdoc.cpp View 1 3 chunks +184 lines, -185 lines 0 comments Download
M fpdfsdk/src/fpdfppo.cpp View 1 2 chunks +402 lines, -412 lines 0 comments Download
M fpdfsdk/src/fpdfsave.cpp View 1 2 chunks +284 lines, -288 lines 0 comments Download
M fpdfsdk/src/fsdk_annothandler.cpp View 1 5 chunks +22 lines, -53 lines 0 comments Download
M fpdfsdk/src/fsdk_baseannot.cpp View 1 2 chunks +707 lines, -717 lines 0 comments Download
M fpdfsdk/src/fsdk_baseform.cpp View 1 30 chunks +1780 lines, -1847 lines 0 comments Download
M fpdfsdk/src/fsdk_mgr.cpp View 1 3 chunks +12 lines, -22 lines 0 comments Download
M fpdfsdk/src/fsdk_rendercontext.cpp View 1 2 chunks +12 lines, -14 lines 0 comments Download
M fpdfsdk/src/fxedit/fxet_edit.cpp View 1 18 chunks +2447 lines, -2474 lines 0 comments Download
M fpdfsdk/src/javascript/Document.cpp View 1 15 chunks +1082 lines, -1121 lines 0 comments Download
M fpdfsdk/src/javascript/Field.cpp View 1 4 chunks +3232 lines, -3231 lines 0 comments Download
M fpdfsdk/src/javascript/JS_EventHandler.cpp View 1 3 chunks +371 lines, -384 lines 0 comments Download
M fpdfsdk/src/javascript/JS_GlobalData.cpp View 1 3 chunks +419 lines, -426 lines 0 comments Download
M fpdfsdk/src/javascript/JS_Runtime.cpp View 1 6 chunks +129 lines, -136 lines 0 comments Download
M fpdfsdk/src/javascript/PublicMethods.cpp View 1 6 chunks +1671 lines, -1674 lines 0 comments Download
M fpdfsdk/src/javascript/global.cpp View 1 3 chunks +424 lines, -438 lines 0 comments Download
M fpdfsdk/src/javascript/util.cpp View 1 4 chunks +511 lines, -524 lines 0 comments Download
M fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp View 1 2 chunks +367 lines, -372 lines 0 comments Download
M fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp View 1 5 chunks +438 lines, -438 lines 0 comments Download
M fpdfsdk/src/pdfwindow/PWL_FontMap.cpp View 1 6 chunks +344 lines, -372 lines 0 comments Download
M fpdfsdk/src/pdfwindow/PWL_Wnd.cpp View 1 9 chunks +684 lines, -701 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
Tom Sepez
Lei, for review. Manual merge for: core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp core/src/fpdfdoc/doc_vt.cpp core/src/fxge/ge/fx_ge_text.cpp fpdfsdk/src/formfiller/FFL_IFormFiller.cpp fpdfsdk/src/formfiller/FFL_TextField.cpp fpdfsdk/src/fpdf_ext.cpp fpdfsdk/src/fpdfdoc.cpp fpdfsdk/src/fpdfppo.cpp fpdfsdk/src/fpdfsave.cpp ...
5 years, 5 months ago (2015-07-22 23:20:11 UTC) #1
Lei Zhang
https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp File fpdfsdk/src/formfiller/FFL_IFormFiller.cpp (right): https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp#newcode585 fpdfsdk/src/formfiller/FFL_IFormFiller.cpp:585: else We missed this on master, FYI. https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp#newcode1117 fpdfsdk/src/formfiller/FFL_IFormFiller.cpp:1117: ...
5 years, 5 months ago (2015-07-23 02:01:03 UTC) #2
Tom Sepez
On 2015/07/23 02:01:03, Lei Zhang wrote: > https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp > File fpdfsdk/src/formfiller/FFL_IFormFiller.cpp (right): > > https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp#newcode585 ...
5 years, 5 months ago (2015-07-23 15:35:52 UTC) #3
Tom Sepez
https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp File fpdfsdk/src/formfiller/FFL_IFormFiller.cpp (right): https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp#newcode585 fpdfsdk/src/formfiller/FFL_IFormFiller.cpp:585: else On 2015/07/23 02:01:02, Lei Zhang wrote: > We ...
5 years, 5 months ago (2015-07-23 16:17:41 UTC) #4
Lei Zhang
lgtm https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/fpdfppo.cpp File fpdfsdk/src/fpdfppo.cpp (right): https://codereview.chromium.org/1239313005/diff/1/fpdfsdk/src/fpdfppo.cpp#newcode263 fpdfsdk/src/fpdfppo.cpp:263: for(FX_DWORD i = 0; i < count; i ...
5 years, 5 months ago (2015-07-23 20:36:18 UTC) #5
Tom Sepez
5 years, 5 months ago (2015-07-23 21:42:15 UTC) #6
Message was sent while issue was closed.
Committed patchset #2 (id:10001) manually as
2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698