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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 1415933007: Merge to XFA: Cleanup after syncing CPDFSDK_BAAnnot (Closed)

Created:
5 years, 1 month ago by dsinclair
Modified:
5 years, 1 month 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: Cleanup after syncing CPDFSDK_BAAnnot This cleans up various things after syncing BAAnnot to master. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1418043007 . (cherry picked from commit 110650e68e519e8cf14fe1119b77cf3309ed2d0b) Committed: https://pdfium.googlesource.com/pdfium/+/bfe042a4c4f0bd739c568754ebee6d993e134ad3

Patch Set 1 #

Total comments: 4

Patch Set 2 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+21 lines, -37 lines) Patch
M fpdfsdk/include/fsdk_baseannot.h View 6 chunks +6 lines, -10 lines 0 comments Download
M fpdfsdk/src/fsdk_annothandler.cpp View 1 2 chunks +7 lines, -7 lines 0 comments Download
M fpdfsdk/src/fsdk_baseannot.cpp View 5 chunks +8 lines, -20 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
dsinclair
PTAL. Conflicts marked. https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/include/fsdk_baseannot.h File fpdfsdk/include/fsdk_baseannot.h (left): https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/include/fsdk_baseannot.h#oldcode120 fpdfsdk/include/fsdk_baseannot.h:120: public: Merge conflict. https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/src/fsdk_annothandler.cpp File fpdfsdk/src/fsdk_annothandler.cpp ...
5 years, 1 month ago (2015-11-04 18:57:20 UTC) #1
Lei Zhang
lgtm https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/src/fsdk_annothandler.cpp File fpdfsdk/src/fsdk_annothandler.cpp (right): https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/src/fsdk_annothandler.cpp#newcode145 fpdfsdk/src/fsdk_annothandler.cpp:145: if (!pAnnot->IsXFAField()) On 2015/11/04 18:57:20, dsinclair wrote: > ...
5 years, 1 month ago (2015-11-04 19:01:54 UTC) #2
dsinclair
https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/src/fsdk_annothandler.cpp File fpdfsdk/src/fsdk_annothandler.cpp (right): https://codereview.chromium.org/1415933007/diff/1/fpdfsdk/src/fsdk_annothandler.cpp#newcode145 fpdfsdk/src/fsdk_annothandler.cpp:145: if (!pAnnot->IsXFAField()) On 2015/11/04 19:01:54, Lei Zhang wrote: > ...
5 years, 1 month ago (2015-11-04 19:04:09 UTC) #3
dsinclair
5 years, 1 month ago (2015-11-04 19:04:16 UTC) #4
Message was sent while issue was closed. 
Committed patchset #2 (id:20001) manually as
bfe042a4c4f0bd739c568754ebee6d993e134ad3 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698