summaryrefslogtreecommitdiff
path: root/xfa/fxjse/class.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-05-26 08:41:45 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-26 08:41:45 -0700
commitdd6a46c7eddc31d29b2d2630378c52c25363ce59 (patch)
tree8de9ff2f47bf3130eb5eee7fb39eff4251b3d90b /xfa/fxjse/class.cpp
parent25fa42f398d1f8007aa36531e0436dc769817ad3 (diff)
downloadpdfium-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/class.cpp')
-rw-r--r--xfa/fxjse/class.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/xfa/fxjse/class.cpp b/xfa/fxjse/class.cpp
index 18c542a65e..ff5990aa85 100644
--- a/xfa/fxjse/class.cpp
+++ b/xfa/fxjse/class.cpp
@@ -183,7 +183,7 @@ CFX_ByteString CFXJSE_Arguments::GetUTF8String(int32_t index) const {
return CFX_ByteString(*szStringVal);
}
-void* CFXJSE_Arguments::GetObject(int32_t index) const {
+void* CFXJSE_Arguments::GetObject(int32_t index, FXJSE_HCLASS hClass) const {
const CFXJSE_ArgumentsImpl* lpArguments =
reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);
v8::Local<v8::Value> hValue = (*lpArguments->m_pInfo)[index];
@@ -191,7 +191,8 @@ void* CFXJSE_Arguments::GetObject(int32_t index) const {
if (!hValue->IsObject()) {
return NULL;
}
- return FXJSE_RetrieveObjectBinding(hValue.As<v8::Object>());
+ CFXJSE_Class* lpClass = reinterpret_cast<CFXJSE_Class*>(hClass);
+ return FXJSE_RetrieveObjectBinding(hValue.As<v8::Object>(), lpClass);
}
FXJSE_HVALUE CFXJSE_Arguments::GetReturnValue() {