summaryrefslogtreecommitdiff
path: root/xfa/fxjse
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-06-02 17:45:25 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-02 17:45:25 -0700
commit8f3074bef53ed941daef3f32981b1449db7bcc26 (patch)
tree3d2aaca633cf24117bf2b3bfde236ec4047927d3 /xfa/fxjse
parentdb444d2063df6c574882d9263e885c4fe1134133 (diff)
downloadpdfium-8f3074bef53ed941daef3f32981b1449db7bcc26.tar.xz
Remove FXJSE_Value_ToObject and call methods directly
This Cl removes the global FXJSE_Value_ToObject method and adds individual methods on CXFA_Value to do the needed conversions. Review-Url: https://codereview.chromium.org/2026993003
Diffstat (limited to 'xfa/fxjse')
-rw-r--r--xfa/fxjse/include/fxjse.h2
-rw-r--r--xfa/fxjse/value.cpp7
-rw-r--r--xfa/fxjse/value.h2
3 files changed, 2 insertions, 9 deletions
diff --git a/xfa/fxjse/include/fxjse.h b/xfa/fxjse/include/fxjse.h
index 8a34ad0c7b..cf6fbf9560 100644
--- a/xfa/fxjse/include/fxjse.h
+++ b/xfa/fxjse/include/fxjse.h
@@ -93,8 +93,6 @@ double FXJSE_Value_ToDouble(CFXJSE_Value* pValue);
int32_t FXJSE_Value_ToInteger(CFXJSE_Value* pValue);
void FXJSE_Value_ToUTF8String(CFXJSE_Value* pValue,
CFX_ByteString& szStrOutput);
-CFXJSE_HostObject* FXJSE_Value_ToObject(CFXJSE_Value* pValue,
- CFXJSE_Class* pClass);
void FXJSE_Value_SetUndefined(CFXJSE_Value* pValue);
void FXJSE_Value_SetNull(CFXJSE_Value* pValue);
diff --git a/xfa/fxjse/value.cpp b/xfa/fxjse/value.cpp
index b369c0bf3b..60fa09c8c3 100644
--- a/xfa/fxjse/value.cpp
+++ b/xfa/fxjse/value.cpp
@@ -64,11 +64,6 @@ int32_t FXJSE_Value_ToInteger(CFXJSE_Value* pValue) {
return pValue->ToInteger();
}
-CFXJSE_HostObject* FXJSE_Value_ToObject(CFXJSE_Value* pValue,
- CFXJSE_Class* pClass) {
- return pValue->ToObject(pClass);
-}
-
void FXJSE_Value_SetUndefined(CFXJSE_Value* pValue) {
pValue->SetUndefined();
}
@@ -198,7 +193,7 @@ void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Name,
pIsolate->ThrowException(hError);
}
-CFXJSE_HostObject* CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const {
+CFXJSE_HostObject* CFXJSE_Value::ToHostObject(CFXJSE_Class* lpClass) const {
ASSERT(!m_hValue.IsEmpty());
CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
diff --git a/xfa/fxjse/value.h b/xfa/fxjse/value.h
index 362cd64ace..84045d6d81 100644
--- a/xfa/fxjse/value.h
+++ b/xfa/fxjse/value.h
@@ -141,7 +141,7 @@ class CFXJSE_Value {
v8::String::Utf8Value hStringVal(hString);
szStrOutput = *hStringVal;
}
- CFXJSE_HostObject* ToObject(CFXJSE_Class* lpClass) const;
+ CFXJSE_HostObject* ToHostObject(CFXJSE_Class* lpClass) const;
V8_INLINE void SetUndefined() {
CFXJSE_ScopeUtil_IsolateHandle scope(m_pIsolate);