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

Issue 1354593004: Merge to master: contention over isolate data slots (Closed)

Created:
5 years, 3 months ago by Tom Sepez
Modified:
5 years, 3 months ago
CC:
pdfium-reviews_googlegroups.com
Base URL:
https://pdfium.googlesource.com/pdfium.git@master
Target Ref:
refs/heads/master
Visibility:
Public.

Description

Merge to master: contention over isolate data slots Work on this was first performed on the XFA branch, since it has additional requirements (FXJSE layer) that needed to be accomodated by the solution. (cherry picked from commit ed7b2b50aa1744e0bc5a60bef12c61fa91d863b7) Original Review URL: https://codereview.chromium.org/1351173002 . R=thestig@chromium.org Committed: https://pdfium.googlesource.com/pdfium/+/70bc04b16646c92f221c5aa56831b01d6ec7c1ca

Patch Set 1 : cherry-pick and resolve merge conflicts. #

Patch Set 2 : Remove remaining XFA-specifics #

Patch Set 3 : Remove stray whitespace-only change. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+97 lines, -86 lines) Patch
M fpdfsdk/include/jsapi/fxjs_v8.h View 1 3 chunks +18 lines, -5 lines 0 comments Download
M fpdfsdk/src/jsapi/fxjs_v8.cpp View 1 19 chunks +78 lines, -80 lines 0 comments Download
M fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 7 (1 generated)
Tom Sepez
Jochen, Lei, quick sanity check. The merge is basically deleting the xfa specific stuff.
5 years, 3 months ago (2015-09-22 16:06:27 UTC) #2
Lei Zhang
Do you need to merge the code in fpdfsdk/include/javascript/JS_Define.h?
5 years, 3 months ago (2015-09-22 20:27:32 UTC) #3
Tom Sepez
On 2015/09/22 20:27:32, Lei Zhang wrote: > Do you need to merge the code in ...
5 years, 3 months ago (2015-09-22 22:34:32 UTC) #4
Lei Zhang
lgtm
5 years, 3 months ago (2015-09-22 22:36:17 UTC) #5
Tom Sepez
Committed patchset #3 (id:10006) manually as 70bc04b16646c92f221c5aa56831b01d6ec7c1ca (presubmit successful).
5 years, 3 months ago (2015-09-22 22:49:18 UTC) #6
Tom Sepez
5 years, 3 months ago (2015-09-22 23:03:07 UTC) #7
Message was sent while issue was closed.
On 2015/09/22 22:49:18, Tom Sepez wrote:
> Committed patchset #3 (id:10006) manually as
> 70bc04b16646c92f221c5aa56831b01d6ec7c1ca (presubmit successful).

And its reverted.  Will need to do things the XFA way, after all ...

Powered by Google App Engine
This is Rietveld 408576698