Age | Commit message (Collapse) | Author |
|
Merge conflicts in:
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Define.h
New code in:
fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
(cherry picked from commit 213a172779fddbd7e588ee2e2b3906ccc47d6896)
Original Review URL: https://codereview.chromium.org/1386173002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1395713002 .
|
|
(cherry picked from commit ebd39a6a8fcbbbf1c5a2e6f1b2e30f452971d0ee)
Original Review URL: https://codereview.chromium.org/1389003003 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1394023002 .
|
|
New code changes in JS_Runtime.cpp.
(cherry picked from commit 3dedace9623fef6161a8666e53a4ab2b9be61e4c)
Original Review URL: https://codereview.chromium.org/1367033002 .
Also merge to XFA: Run FXJS_V8 embedder tests against a shared isolate,
since the two go together.
(cherry picked from commit 4ea721cb7954898a9722c389dae86c62957352d0)
Original Review URL: https://codereview.chromium.org/1377293004 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1381633008 .
|
|
Manual edits in JS_Define.h.
(cherry picked from commit f0a5b2803c09f3605dcd606e764ef604f0d2a8ea)
Original Review URL: https://codereview.chromium.org/1382263002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1382683008 .
|
|
(cherry picked from commit 5b3d0208723f21c50b9922bdc500c9d78c359a25)
Original Review URL: https://codereview.chromium.org/1389783002 .
New changes to fix IWYU in:
fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
xfa/include/fxfa/fxfa.h
xfa/include/fxfa/fxfa_objectacc.h
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1388023003 .
|
|
CJS_EmbedObj.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1374723004 .
(cherry picked from commit 4942ed7a79188bd832c2a599e7dd94ea59b674ae)
Review URL: https://codereview.chromium.org/1390623003 .
|
|
Also remove dead CJS_EmbedObj::{Begin,End}Timer code.
BUG=539107
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1384883002 .
(cherry picked from commit 794c9b67d3d519342aa7e15052766f7d4a99f551)
Review URL: https://codereview.chromium.org/1386053002 .
|
|
Small manaul merge in JS_Object.cpp
(cherry picked from commit 5e8b7356d68e35d7d631a2a917e651a4e7c73b65)
Original Review URL: https://codereview.chromium.org/1385983002 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1381233005 .
|
|
BUG=537173
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1376093002 .
(cherry picked from commit ac67d4765a8ac36cd00c9fc8b6f2b80a3e1cff72)
Review URL: https://codereview.chromium.org/1378193006 .
|
|
This is partially based on https://codereview.chromium.org/1198903002/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1377733005 .
|
|
(cherry picked from commit d6d9dc6b9a45368abdf43477592ee9f6cdb6102e)
(cherry picked from commit cfff2f65aaec70247d020188bc68a0dc4fb34c3e)
Original Review URL: https://codereview.chromium.org/1372963003 .
Original Review URL: https://codereview.chromium.org/1367813003 .
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1370133007 .
|
|
This makes the XFA branch look more like the master. I suspect a patch
was lost during the intial XFA checkin.
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/1366053003 .
|
|
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 .
|
|
This probably broke at 06b60021e when the FXJS slot moved to 0
from 1 unless explicitly overriden by the embedder, which conflicted
with the FXJSE_ usage of slot 0.
Also simplify some logic used to track global intialization of the
underling JS.
TEST=run_javascript_tests.py on XFA branch doesn't segv.
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/1351173002 .
|
|
New edits in:
fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
fpdfsdk/include/javascript/IJavaScript.h
fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
(cherry picked from commit bca779d0957965eb2ebfad5479e0894844749626)
Original Review URL: https://codereview.chromium.org/1360523004 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1348393007 .
|
|
(cherry picked from commit 270fc65d5824eeedbb2ed17516a72721bde9c9ef)
Original Review URL: https://codereview.chromium.org/1349423006 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1357243002 .
|
|
(cherry picked from commit 34b39e1d4fa0b16d47770b823230344356cc451a)
Original Review URL: https://codereview.chromium.org/1350703003 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1342403005 .
|
|
Manual edits:
fpdfsdk/include/javascript/JS_Define.h
fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
(cherry picked from commit 506df426d5d64d68e9dc27ffebcf56f6c6a1bccf)
Original Review URL: https://codereview.chromium.org/1347833002 .
(cherry picked from commit 455019ca48f60bd285e043986471f51f17c69a0d)
Original Review URL: https://codereview.chromium.org/1349783003 .
(cherry picked from commit 1af240cc45480520b447be767686e73a29c48f9e)
Original Review URL: https://codereview.chromium.org/1348693003 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1356563003 .
|
|
(cherry picked from commit b17d62601b21dfce85718e08cfd0ffce3a45d74e)
(cherry picked from commit 09ed30750282bf56a92d0e646ab22c64bea81a36)
Manual edits:
fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp - add lockers.
fppdfsdk/src/javascript/JS_Runtime.cpp - rework XFA init path.
Original Review URL: https://codereview.chromium.org/1338073002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1348433002 .
|
|
(cherry picked from commit 9a817f092e6800e9338b41acf4ea0416b6ad4467)
Original Review URL: https://codereview.chromium.org/1338993005 .
Small manual merge in
fpdfsdk/src/javascript/JS_GlobalData.cpp
fpdfsdk/src/javascript/global.cpp
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1341913002 .
|
|
(cherry picked from commit f9e40aec10263f9445d69598657f42550294d653)
Orignal Review URL: https://codereview.chromium.org/1342433002 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1338003004 .
|
|
(cherry picked from commit df4de98c06075b0e491ac645f2d118a6813cedc9)
Trivial manual merges in
fpdfsdk/include/javascript/JS_Runtime.h
fpdfsdk/src/javascript/JS_Runtime.cpp
Original Review URL: https://codereview.chromium.org/1335763002 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1334313002 .
|
|
Conflicts:
fpdfsdk/src/javascript/Document.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
New:
fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
(cherry picked from commit 6df59849472958e7de96da6d9fc7b223b7c1f1c3)
Original Review URL: https://codereview.chromium.org/1332973002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1334833003 .
|
|
(cherry picked from commit 23213b2750e33dfe96b091b78ec8b10fe4d73a67)
Original Review URL: https://codereview.chromium.org/1329583004 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1325823006 .
|
|
Manual merge in fpdfsdk/src/javascript/JS_Context.cpp
(cherry picked from commit 6e945a1ebbacde3ed2a4fc83ccb7215ccbc46931)
Original Review URL: https://codereview.chromium.org/1318543012 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1318343004 .
|
|
(cherry picked from commit c3f4894a6862c74b9ab32b4ec38c531de6ecd83c)
Original Review URL: https://codereview.chromium.org/1298393003 .
Fixed IWYU in core/src/fpdftext/text_int.h exposed by new inclusion.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1294933008 .
|
|
(cherry picked from commit 71c15a5e6652952a94ba3a3ef7ac0392e3a06962)
Original Review URL: https://codereview.chromium.org/1299963002 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1301073003 .
|
|
New manual edits: two unused members deleted, one adapted.
fde_csscache.cpp
fde_csscache.h
fpdfxfa_doc.h
fx_ge_fontmap.cpp
(cherry picked from commit 1d9dbd53b205b2b4d9e75a7eeb95e80837917ea3)
(cherry picked from commit cb4d0ea68308e3c51a6ba9551b393bb2f639afc4)
(cherry picked from commit 9cf44c2ed09a8b2ff243eb6dbb72a8cceae1b5ff)
(cherry picked from commit 2a2a6aa7f51352fc481e78f6ad9d41f2738bcc48)
(cherry picked from commit ce4ffb8183af3fa2bb5133f0f7370a88e064c516)
Original Review URL: https://codereview.chromium.org/1297723002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1301793002 .
|
|
(cherry picked from commit ed7599b9042169f11b00f1126bfd3aff0f56b35f)
Original Review URL: https://codereview.chromium.org/1289903004 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1286083005 .
|
|
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1284193005 .
(cherry picked from commit 632b807b386878afdb42322f0037f8998306f4a9)
Review URL: https://codereview.chromium.org/1301453002 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1287193005 .
(cherry picked from commit 0f6b51c0fdd14f5762bf3c7412ac59c825443cc3)
Review URL: https://codereview.chromium.org/1288393004 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1292613003 .
(cherry picked from commit c2c3f7b5f0396409451a9d344f35ec1929a76e9f)
Review URL: https://codereview.chromium.org/1296043002 .
|
|
(cherry picked from commit b0b1a8bd45ed72e4fd22f5f0a394b7897ae573c7)
Original Review URL: https://codereview.chromium.org/1293673003 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1292283002 .
|
|
(cherry picked from commit 2a0a26c94ef8131ee29ac4d466c42593cf2ff005)
Review URL: https://codereview.chromium.org/1286383004 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1296493003 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1287863002 .
(cherry picked from commit 388a3b0b8d6f75d47978c08299300f121f04884c)
Review URL: https://codereview.chromium.org/1292653002 .
|
|
- Delete unneeded CFFL_ComboBox::CanCopy() and friends.
- Delete unneeded CFFL_FormFiller::CanCopy() and friends.
- Delete unneeded CFFL_TextField::CanCopy() and friends.
- Delete unneeded FormFiller::DoCopy() and friends.
- Rename CFFL_FormFiller::On{Set,Kill}Focus to avoid conflicts.
BUG=pdfium:185
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1283493004 .
(cherry picked from commit 3a3849176aa6e2db8baf2f9367b2d96c71815319)
Review URL: https://codereview.chromium.org/1279123006 .
|
|
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1196853002 .
(cherry picked from commit f2d3911ce1a07812d75e7671e038d0922a823528)
Review URL: https://codereview.chromium.org/1280883003 .
|
|
Also add a presubmit that checks for this so I don't have to keep doing it.
No behavior change.
Generated by:
find . -name '*.cpp' -o -name '*.h' | \
grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/
See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.
BUG=none
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277043002 .
|
|
It would seem that this never merged completely.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277583002 .
|
|
(cherry picked from commit 7ea305f1bd4efc1838fba053e4399358d6765ec7)
Original Review URL: https://codereview.chromium.org/1269783005 .
BUG=chromium:515718
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1270293002 .
|
|
(cherry picked from commit d539de991cacf02811880c434d4393c8275163d2)
Original Review URL: https://codereview.chromium.org/1256283005 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1272043002 .
|
|
No behavior change.
Generated by:
find . -name '*.cpp' -o -name '*.h' | \
grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/
See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.
BUG=none
|
|
Origin Review URL:
- https://codereview.chromium.org/1234053003
- https://codereview.chromium.org/1241863004
- https://codereview.chromium.org/1235303003
R=tsepez@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1263963002 .
|
|
(cherry picked from commit a25b4bca69ab26d174edb8cefbdcfc1a0353915a)
Original Review URL: https://codereview.chromium.org/1254973004 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1252943010 .
|
|
Original Review URL: https://codereview.chromium.org/1257163002 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1259113003 .
|
|
(cherry picked from commit aafeff816e22c1333c17d8a0eb4fe8927c28142d)
Original Review URL: https://codereview.chromium.org/1242263010 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1244023004 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1249643003 .
(cherry picked from commit b05f1fd710496dea44b001bb905fa1c16a39bb28)
Review URL: https://codereview.chromium.org/1250433003 .
|
|
Original Review URL: https://codereview.chromium.org/1235393002 .
(cherry picked from commit fb07e2843dad0774d5842c2b08e7792164efc14a)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1244503002 .
|
|
(cherry picked from commit e3db14f4d0e11ed30bd7e014ffa8cea9d6fb93ad)
Original Review URL: https://codereview.chromium.org/1233203004 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1236383003 .
|
|
There are more CFX_MapPtrTemplate usage on the XFA branch, so it is
not removed.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1181593003.
(cherry picked from commit e8d3691c82d1be805ffdce3329d00313af7ce0ab)
Review URL: https://codereview.chromium.org/1198663004.
|