diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-08 12:03:00 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-08 12:03:00 -0700 |
| commit | ba038bc14bfeb4d011d57f388871f7f14c4c3c22 (patch) | |
| tree | 2786d0c3d7c56492c09f9c01e4eae090023c4040 /fpdfsdk/src/javascript/color.cpp | |
| parent | 4d4a442aa413cdf5e114c4e432ae930bc9d9e0f1 (diff) | |
| download | pdfium-ba038bc14bfeb4d011d57f388871f7f14c4c3c22.tar.xz | |
Merge to XFA: Rename IFXJS_Runtime and IFXJS_Context to IJS_.
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 .
Diffstat (limited to 'fpdfsdk/src/javascript/color.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/color.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp index da6fc60076..791785a626 100644 --- a/fpdfsdk/src/javascript/color.cpp +++ b/fpdfsdk/src/javascript/color.cpp @@ -14,7 +14,7 @@ #include "JS_Context.h" #include "JS_Runtime.h" -static v8::Isolate* GetIsolate(IFXJS_Context* cc) { +static v8::Isolate* GetIsolate(IJS_Context* cc) { CJS_Context* pContext = (CJS_Context*)cc; ASSERT(pContext != NULL); @@ -140,7 +140,7 @@ void color::ConvertArrayToPWLColor(CJS_Array& array, CPWL_Color& color) { } #define JS_IMPLEMENT_COLORPROP(prop, var) \ - FX_BOOL color::prop(IFXJS_Context* cc, CJS_PropValue& vp, \ + FX_BOOL color::prop(IJS_Context* cc, CJS_PropValue& vp, \ CFX_WideString& sError) { \ CJS_Context* pContext = (CJS_Context*)cc; \ v8::Isolate* isolate = pContext->GetJSRuntime()->GetIsolate(); \ @@ -170,7 +170,7 @@ JS_IMPLEMENT_COLORPROP(dkGray, m_crDKGray) JS_IMPLEMENT_COLORPROP(gray, m_crGray) JS_IMPLEMENT_COLORPROP(ltGray, m_crLTGray) -FX_BOOL color::convert(IFXJS_Context* cc, +FX_BOOL color::convert(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { @@ -207,7 +207,7 @@ FX_BOOL color::convert(IFXJS_Context* cc, return TRUE; } -FX_BOOL color::equal(IFXJS_Context* cc, +FX_BOOL color::equal(IJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) { |