diff options
author | dsinclair <dsinclair@chromium.org> | 2016-05-26 08:41:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-26 08:41:45 -0700 |
commit | dd6a46c7eddc31d29b2d2630378c52c25363ce59 (patch) | |
tree | 8de9ff2f47bf3130eb5eee7fb39eff4251b3d90b /xfa/fxjse/value.cpp | |
parent | 25fa42f398d1f8007aa36531e0436dc769817ad3 (diff) | |
download | pdfium-dd6a46c7eddc31d29b2d2630378c52c25363ce59.tar.xz |
Revert of Remove parameters which are always null (patchset #1 id:1 of https://codereview.chromium.org/2009413002/ )
Reason for revert:
Suspect that the lack of this parameter being
passed accurately to GetObject is leading to
https://bugs.chromium.org/p/chromium/issues/detail?id=613607, and that the right
fix will be to pass it.
Original issue's description:
> Remove parameters which are always null
>
> These parameters are never set, remove them and their supporting code.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/818e1900a3811e1bde1e594e4966db612f845966
TBR=tsepez@chromium.org,thestig@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2014863002
Diffstat (limited to 'xfa/fxjse/value.cpp')
-rw-r--r-- | xfa/fxjse/value.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxjse/value.cpp b/xfa/fxjse/value.cpp index d3366cf08e..c23e12c32f 100644 --- a/xfa/fxjse/value.cpp +++ b/xfa/fxjse/value.cpp @@ -72,8 +72,9 @@ int32_t FXJSE_Value_ToInteger(FXJSE_HVALUE hValue) { return reinterpret_cast<CFXJSE_Value*>(hValue)->ToInteger(); } -void* FXJSE_Value_ToObject(FXJSE_HVALUE hValue) { - return reinterpret_cast<CFXJSE_Value*>(hValue)->ToObject(); +void* FXJSE_Value_ToObject(FXJSE_HVALUE hValue, FXJSE_HCLASS hClass) { + CFXJSE_Class* lpClass = reinterpret_cast<CFXJSE_Class*>(hClass); + return reinterpret_cast<CFXJSE_Value*>(hValue)->ToObject(lpClass); } void FXJSE_Value_SetUndefined(FXJSE_HVALUE hValue) { @@ -237,7 +238,7 @@ CFXJSE_Value* CFXJSE_Value::Create(v8::Isolate* pIsolate) { return new CFXJSE_Value(pIsolate); } -void* CFXJSE_Value::ToObject() const { +void* CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const { ASSERT(!m_hValue.IsEmpty()); CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate); @@ -247,7 +248,7 @@ void* CFXJSE_Value::ToObject() const { if (!hValue->IsObject()) return nullptr; - return FXJSE_RetrieveObjectBinding(hValue.As<v8::Object>()); + return FXJSE_RetrieveObjectBinding(hValue.As<v8::Object>(), lpClass); } V8_INLINE static double FXJSE_ftod(FX_FLOAT fNumber) { |