Age | Commit message (Collapse) | Author |
|
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 .
|
|
(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 .
|
|
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 .
|
|
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 .
|
|
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 .
|
|
(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 .
|
|
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
|
|
(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 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1176333002.
(cherry picked from commit 0ef0de55657db8a83372ad8eb22d84c5893afc4c)
Review URL: https://codereview.chromium.org/1195943005.
|
|
Review URL: https://codereview.chromium.org/1185843005.
|
|
Nearly automatic merge + re-run script on new files.
Original Review URL: https://codereview.chromium.org/1180593004.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1174303002.
|
|
returns 0.
Remove callers and related code that all just pass zeros around.
Also remove CFFL_IFormFiller::GetKeyDown().
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1149623012.
(cherry picked from commit 35c3163d55bebea8095474181f807ddfb2f4f806)
Review URL: https://codereview.chromium.org/1175083003.
|
|
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
|
|
Original Review URL: https://codereview.chromium.org/1160443004
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1162013003
|
|
Original Review URL: https://codereview.chromium.org/1162453003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1154613005
|
|
Set pointers in internal fields directly instead of wrapping them
Review URL: https://codereview.chromium.org/1139853003
Use phantom handles instead of weak handles
Review URL: https://codereview.chromium.org/1129253004
Replace deprecated with non-deprecated V8 APIs
Review URL: https://codereview.chromium.org/1126203010
Add myself to OWNERS file
Review URL: https://codereview.chromium.org/1133333005
Replace v8::Handle with v8::Local and v8::Persistent with v8::Global
Review URL: https://codereview.chromium.org/1138823004
TBR=tsepez@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1140033004
|
|
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1118143003
|
|
Original Review URL: https://codereview.chromium.org/1084183008
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1105813002
|
|
Original Review URL: https://codereview.chromium.org/1096813008
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1106663002
|
|
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
|
|
Original Review URL: https://codereview.chromium.org/1060133002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1065103002
|
|
BUG=454595
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1053373002
|
|
Orignal Review URL: https://codereview.chromium.org/971033002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/969203002
|
|
Cherry-pick from b720d0a14601f1496ef15297bc46d401f5a2a890 +
Manually resolve merge conflicts +
Fix more IWYU to fix compile.
Original Review URL: https://codereview.chromium.org/963193003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/971013002
|
|
Review URL: https://codereview.chromium.org/955273003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/966653004
|
|
Original Review URL: https://codereview.chromium.org/954923004
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/952213004
|
|
Original Review URL: https://codereview.chromium.org/945623002
TBR=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/948083002
|
|
Original Review URL: https://codereview.chromium.org/908033002
R=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/932223002
|
|
Original Review URL: https://codereview.chromium.org/927263003
TBR=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/936613002
|