Age | Commit message (Collapse) | Author |
|
Manual merges everywhere.
Original Review URL: https://codereview.chromium.org/1395493007 .
(cherry picked from commit bb51c4fb6bc6095984c303c95e5336f83e66bc67)
Original Review URL: https://codereview.chromium.org/1396283006 .
(cherry picked from commit 86adb658843658969041a13bf6cf0cc950ffe8ed)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1395353004 .
|
|
This contains a missed merge of the Document:delay fixes.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1398703009 .
|
|
Original Review URL: https://codereview.chromium.org/1404723002 .
(cherry picked from commit 7d54a9f70f977ce9b72959ef55dc6300713ccafe)
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1404193002 .
|
|
These files should change in XFA in order to reduce the number of
"noise diffs" between master and XFA as seen in
https://codereview.chromium.org/1399273003/
These include: blank lines and missed merges:
3c012fe else-after-returns (partial)
fb07e28 Tidy up CPDFDOC_Environment (partial, consts missing).
624b166 Allow FPDFBookmark_GetFirstChild to return the top level bookmark
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1403063003 .
|
|
Original Review URL: https://codereview.chromium.org/1389163007 .
(cherry picked from commit 848a13b6777cbff8cc4aea3ab3d69eaa0b82ae6c)
Merge conflics in:
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1394993006 .
|
|
Original Review URL: https://codereview.chromium.org/1395733006 .
(cherry picked from commit f1c713663192368d26031a4caed1f9705f4510af)
Conflicts:
BUILD.gn
fpdfsdk/src/fpdfview.cpp
fpdfsdk/src/javascript/JS_Runtime.cpp
pdfium.gyp
samples/BUILD.gn
samples/samples.gyp
BUG=pdfium:211
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1393833006 .
|
|
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1399833002 .
|
|
(cherry picked from commit 287b63d9ab410783d71cf37291f09fd57d3059b4)
Original Review URL: https://codereview.chromium.org/1394103002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1394053003 .
|
|
As seen when running FXJSV8Embeddertest.Getters.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1380993003 .
(cherry picked from commit eda27bd13270f5324ce3caa34a09a40cffc4026f)
Review URL: https://codereview.chromium.org/1391843005 .
|
|
BUG=539106
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1386823002 .
(cherry picked from commit 7dfe5929282cb6d78d7b5e32e1d72e9db99d3066)
Review URL: https://codereview.chromium.org/1400503003 .
|
|
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 .
|
|
BUG=531339
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1377463005 .
(cherry picked from commit 9b6735445f20ae17b883b5739bf79a7c1f99e139)
Review URL: https://codereview.chromium.org/1393243002 .
|
|
(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 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1378303002 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1377853004 .
|
|
This is partially based on https://codereview.chromium.org/1198903002/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1377733005 .
|
|
Based on parts of https://codereview.chromium.org/1089823004
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1383933003 .
|
|
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1373333002 .
(cherry picked from commit 721f003bcb6a3631571bd8f046bc90bcb6def13a)
Review URL: https://codereview.chromium.org/1376033002 .
|
|
(cherry picked from commit 20fc82efdc9c9e4caa6e72d05a83b9206e8c8f72)
Original Review URL: https://codereview.chromium.org/1372103004 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1383033002 .
|
|
(cherry picked from commit 158e335717efba9dce3aa6f6d1e31ed884e1f59e)
Original Review URL: https://codereview.chromium.org/1353193004 .
TBR=jochen@chromium.org, krasin@google.com
Review URL: https://codereview.chromium.org/1376343002 .
|
|
(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 .
|
|
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1268323004 .
(cherry picked from commit 9311163b564785a3a3ccdcb09bd3b7d0b2976d1a)
Review URL: https://codereview.chromium.org/1368513002 .
|
|
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 .
|
|
The API is the same as the Foxit version, except the encoding is
specified as UTF-8 instead of local encoding.
Also remove CPDF_LWinParam since it's unused.
BUG=chromium:517713
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1335373002 .
(cherry picked from commit 0b3c8f742613da294f812e2f6e908f4026499f96)
(cherry picked from commit a9d4bc541179ec0436adc4b2e18b7fdecc5952dc)
(cherry picked from commit 4ffd89ed556e32a6527d0e88952fe20ec1e2f362)
Review URL: https://codereview.chromium.org/1345953002 .
|
|
(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 .
|
|
BUG=chromium:528376
TBR=ulan@chromium.org, tsepez@chromium.org
Original Review URL: https://codereview.chromium.org/1337433002 .
(cherry picked from commit 0d0935d3d6603dd7d851b1d5828635230f4c43ca)
Review URL: https://codereview.chromium.org/1334633004 .
|
|
At line 2026 in pdfsdk/src/javascript/PublicMethods.cpp,
the writer wants to perform type cast like line 2027 but
he made a mistake to make type conversion on m_pValue.
Even at line 2027, it's redundant to make type conversion.
The returned type of pContext->GetEventHandler() is
CJS_EventHandler*.
BUG=529310
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1325753007 .
|
|
(cherry picked from commit 9241e5a43990859f6f9a94aaa2c488d0451039e3)
Original Review URL: https://codereview.chromium.org/1312313006 .
(cherry picked from commit 343dbb841f4c12e819932e2b66dd70f817337d97)
Original Review URL: https://codereview.chromium.org/1325533004 .
BUG=507316
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1332653002 .
|
|
Small manual edit in fpdfsdk/src/javascript/app.cpp
(cherry picked from commit b830fbc03a6d12d8b5be50e85499c281a4c5da7f)
Original Review URL: https://codereview.chromium.org/1317393003 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1302423008 .
|
|
BUG=pdfium:181
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1331633002 .
(cherry picked from commit 4bc64cabc561d5df211ed02dc75c85e41fa91312)
Review URL: https://codereview.chromium.org/1327523007 .
|
|
(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 6e369c2ebb4769a42736b32154c0de12b73df45d)
Original Review URL: https://codereview.chromium.org/1327473002 .
BUG=489995
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1325743002 .
|