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

Issue 1248153004: Merge to XFA: FX_BOOL combo patch. (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: FX_BOOL combo patch. Original Review URL: https://codereview.chromium.org/1257503002 Original Review URL: https://codereview.chromium.org/1253603002 Manual merge for: core/include/fxge/fx_font.h core/src/fxcodec/codec/codec_int.h fpdfsdk/src/javascript/PublicMethods.cpp R=thestig@chromium.org Committed: https://pdfium.googlesource.com/pdfium/+/1f3442ce5c035d22e2cc9fffc203892f2f749373

Patch Set 1 #

Patch Set 2 : CTTFontDesc::ReleaseFace() mismatch #

Unified diffs Side-by-side diffs Delta from patch set Stats (+150 lines, -168 lines) Patch
M core/include/fpdfapi/fpdf_page.h View 4 chunks +12 lines, -35 lines 0 comments Download
M core/include/fxge/fx_dib.h View 2 chunks +27 lines, -30 lines 0 comments Download
M core/include/fxge/fx_font.h View 2 chunks +18 lines, -11 lines 0 comments Download
M core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp View 1 chunk +5 lines, -1 line 0 comments Download
M core/src/fpdfapi/fpdf_page/fpdf_page.cpp View 5 chunks +18 lines, -20 lines 0 comments Download
M core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp View 1 chunk +0 lines, -16 lines 0 comments Download
M core/src/fpdfapi/fpdf_page/pageint.h View 2 chunks +8 lines, -2 lines 0 comments Download
M core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp View 1 chunk +1 line, -1 line 0 comments Download
M core/src/fpdftext/fpdf_text.cpp View 1 chunk +3 lines, -3 lines 0 comments Download
M core/src/fxcodec/codec/codec_int.h View 1 chunk +1 line, -1 line 0 comments Download
M core/src/fxcodec/codec/fx_codec_flate.cpp View 1 chunk +5 lines, -3 lines 0 comments Download
M core/src/fxcodec/codec/fx_codec_jpeg.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M core/src/fxcodec/jbig2/JBig2_Context.cpp View 7 chunks +14 lines, -8 lines 0 comments Download
M core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp View 1 chunk +1 line, -1 line 0 comments Download
M core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp View 1 chunk +4 lines, -3 lines 0 comments Download
M core/src/fxcrt/fx_basic_gcc.cpp View 1 chunk +1 line, -1 line 0 comments Download
M core/src/fxge/ge/fx_ge_fontmap.cpp View 4 chunks +7 lines, -7 lines 0 comments Download
M core/src/fxge/ge/fx_ge_linux.cpp View 2 chunks +3 lines, -3 lines 0 comments Download
M core/src/fxge/ge/text_int.h View 1 1 chunk +1 line, -1 line 0 comments Download
M fpdfsdk/src/fpdf_sysfontinfo.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M fpdfsdk/src/fpdf_transformpage.cpp View 1 chunk +1 line, -1 line 0 comments Download
M fpdfsdk/src/javascript/PublicMethods.cpp View 1 6 chunks +13 lines, -13 lines 0 comments Download
M public/fpdf_sysfontinfo.h View 1 chunk +3 lines, -3 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
Tom Sepez
Lei, small manual changes for review.
5 years, 5 months ago (2015-07-23 21:58:12 UTC) #1
Tom Sepez
CTTFontDesc::ReleaseFace() mismatch
5 years, 5 months ago (2015-07-23 22:07:12 UTC) #2
Lei Zhang
lgtm
5 years, 5 months ago (2015-07-23 22:37:28 UTC) #3
Tom Sepez
5 years, 5 months ago (2015-07-23 23:07:36 UTC) #4
Message was sent while issue was closed.
Committed patchset #2 (id:20001) manually as
1f3442ce5c035d22e2cc9fffc203892f2f749373 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698