From e0518bf0a0e703b1e010081079c988f011834cb6 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Thu, 8 Feb 2018 21:44:59 +0000
Subject: Move cjs_v8.cpp to cfx_v8.cpp

The layering should be CJS => CFXJS => CFX_V8 with the CJS name
being higher up.

Change-Id: Ic130f248906e9c4df641dd508389b0555786b999
Reviewed-on: https://pdfium-review.googlesource.com/26051
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
---
 fxjs/xfa/cjx_layoutpseudomodel.cpp | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'fxjs/xfa/cjx_layoutpseudomodel.cpp')

diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
index ba17ed8b8b..fd8c8804f8 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -69,7 +69,7 @@ void CJX_LayoutPseudoModel::ready(CFXJSE_Value* pValue,
 }
 
 CJS_Return CJX_LayoutPseudoModel::HWXY(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params,
     XFA_LAYOUTMODEL_HWXY layoutModel) {
   if (params.empty() || params.size() > 3)
@@ -127,30 +127,30 @@ CJS_Return CJX_LayoutPseudoModel::HWXY(
 }
 
 CJS_Return CJX_LayoutPseudoModel::h(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return HWXY(runtime, params, XFA_LAYOUTMODEL_H);
 }
 
 CJS_Return CJX_LayoutPseudoModel::w(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return HWXY(runtime, params, XFA_LAYOUTMODEL_W);
 }
 
 CJS_Return CJX_LayoutPseudoModel::x(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return HWXY(runtime, params, XFA_LAYOUTMODEL_X);
 }
 
 CJS_Return CJX_LayoutPseudoModel::y(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return HWXY(runtime, params, XFA_LAYOUTMODEL_Y);
 }
 
-CJS_Return CJX_LayoutPseudoModel::NumberedPageCount(CJS_V8* runtime,
+CJS_Return CJX_LayoutPseudoModel::NumberedPageCount(CFX_V8* runtime,
                                                     bool bNumbered) {
   CXFA_LayoutProcessor* pDocLayout = GetDocument()->GetDocLayout();
   if (!pDocLayout)
@@ -175,13 +175,13 @@ CJS_Return CJX_LayoutPseudoModel::NumberedPageCount(CJS_V8* runtime,
 }
 
 CJS_Return CJX_LayoutPseudoModel::pageCount(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return NumberedPageCount(runtime, true);
 }
 
 CJS_Return CJX_LayoutPseudoModel::pageSpan(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (params.size() != 1)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -206,7 +206,7 @@ CJS_Return CJX_LayoutPseudoModel::pageSpan(
 }
 
 CJS_Return CJX_LayoutPseudoModel::page(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return PageInternals(runtime, params, false);
 }
@@ -346,7 +346,7 @@ std::vector<CXFA_Node*> CJX_LayoutPseudoModel::GetObjArray(
 }
 
 CJS_Return CJX_LayoutPseudoModel::pageContent(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (params.empty() || params.size() > 3)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -382,25 +382,25 @@ CJS_Return CJX_LayoutPseudoModel::pageContent(
 }
 
 CJS_Return CJX_LayoutPseudoModel::absPageCount(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return NumberedPageCount(runtime, false);
 }
 
 CJS_Return CJX_LayoutPseudoModel::absPageCountInBatch(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return CJS_Return(runtime->NewNumber(0));
 }
 
 CJS_Return CJX_LayoutPseudoModel::sheetCountInBatch(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return CJS_Return(runtime->NewNumber(0));
 }
 
 CJS_Return CJX_LayoutPseudoModel::relayout(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   CXFA_Node* pRootNode = GetDocument()->GetRoot();
   CXFA_Form* pFormRoot =
@@ -415,13 +415,13 @@ CJS_Return CJX_LayoutPseudoModel::relayout(
 }
 
 CJS_Return CJX_LayoutPseudoModel::absPageSpan(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return pageSpan(runtime, params);
 }
 
 CJS_Return CJX_LayoutPseudoModel::absPageInBatch(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (params.size() != 1)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -429,7 +429,7 @@ CJS_Return CJX_LayoutPseudoModel::absPageInBatch(
 }
 
 CJS_Return CJX_LayoutPseudoModel::sheetInBatch(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (params.size() != 1)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -437,31 +437,31 @@ CJS_Return CJX_LayoutPseudoModel::sheetInBatch(
 }
 
 CJS_Return CJX_LayoutPseudoModel::sheet(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return PageInternals(runtime, params, true);
 }
 
 CJS_Return CJX_LayoutPseudoModel::relayoutPageArea(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return CJS_Return(true);
 }
 
 CJS_Return CJX_LayoutPseudoModel::sheetCount(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return NumberedPageCount(runtime, false);
 }
 
 CJS_Return CJX_LayoutPseudoModel::absPage(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   return PageInternals(runtime, params, true);
 }
 
 CJS_Return CJX_LayoutPseudoModel::PageInternals(
-    CJS_V8* runtime,
+    CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params,
     bool bAbsPage) {
   if (params.size() != 1)
-- 
cgit v1.2.3