From 98963398054a20287cf6b354932ef56ddb4da48c Mon Sep 17 00:00:00 2001
From: weili <weili@chromium.org>
Date: Tue, 7 Jun 2016 11:28:31 -0700
Subject: Fix more code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.

Review-Url: https://codereview.chromium.org/2034253003
---
 fpdfsdk/javascript/Consts.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'fpdfsdk/javascript/Consts.cpp')

diff --git a/fpdfsdk/javascript/Consts.cpp b/fpdfsdk/javascript/Consts.cpp
index 8aeb0b9239..b71d0a34b3 100644
--- a/fpdfsdk/javascript/Consts.cpp
+++ b/fpdfsdk/javascript/Consts.cpp
@@ -137,21 +137,21 @@ void CJS_GlobalConsts::DefineJSObjects(CJS_Runtime* pRuntime) {
   GLOBAL_STRING(pRuntime, L"IDS_STARTUP_CONSOLE_MSG", L"** ^ _ ^ **");
 }
 
-#define GLOBAL_ARRAY(rt, name, ...)                                   \
-  {                                                                   \
-    const FX_WCHAR* values[] = {__VA_ARGS__};                         \
-    v8::Local<v8::Array> array = FXJS_NewArray((rt)->GetIsolate());   \
-    for (size_t i = 0; i < FX_ArraySize(values); ++i)                 \
-      array->Set(i, FXJS_NewString((rt)->GetIsolate(), values[i]));   \
-    rt->SetConstArray(name, array);                                   \
-    FXJS_DefineGlobalConst(                                           \
-        (rt)->GetIsolate(), (name),                                   \
-        [](const v8::FunctionCallbackInfo<v8::Value>& info) {         \
-          CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>(          \
-              FXJS_GetRuntimeFromIsolate(info.GetIsolate()));         \
-          if (pRuntime)                                               \
-            info.GetReturnValue().Set(pRuntime->GetConstArray(name)); \
-        });                                                           \
+#define GLOBAL_ARRAY(rt, name, ...)                                        \
+  {                                                                        \
+    const FX_WCHAR* values[] = {__VA_ARGS__};                              \
+    v8::Local<v8::Array> array = FXJS_NewArray((rt)->GetIsolate());        \
+    for (size_t i = 0; i < FX_ArraySize(values); ++i)                      \
+      array->Set(i, FXJS_NewString((rt)->GetIsolate(), values[i]));        \
+    rt->SetConstArray(name, array);                                        \
+    FXJS_DefineGlobalConst(                                                \
+        (rt)->GetIsolate(), (name),                                        \
+        [](const v8::FunctionCallbackInfo<v8::Value>& info) {              \
+          CJS_Runtime* pLocalRuntime = static_cast<CJS_Runtime*>(          \
+              FXJS_GetRuntimeFromIsolate(info.GetIsolate()));              \
+          if (pLocalRuntime)                                               \
+            info.GetReturnValue().Set(pLocalRuntime->GetConstArray(name)); \
+        });                                                                \
   }
 
 void CJS_GlobalArrays::DefineJSObjects(CJS_Runtime* pRuntime) {
-- 
cgit v1.2.3