From 40e9ff30b7f22b37c071dc9751f489d4cc22b0ee Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 30 Nov 2015 12:39:54 -0800
Subject: Tidy PDF_ENABLE_XFA #ifdefs in fpdfsdk.

-- label matching #endifs
-- prefer #ifdef over #ifndef
-- consolidate some blocks.

R=ochang@chromium.org

Review URL: https://codereview.chromium.org/1484843002 .
---
 fpdfsdk/src/javascript/JS_Context.cpp      | 2 +-
 fpdfsdk/src/javascript/JS_Runtime.cpp      | 9 +++++----
 fpdfsdk/src/javascript/JS_Runtime.h        | 3 +--
 fpdfsdk/src/javascript/JS_Runtime_Stub.cpp | 2 +-
 fpdfsdk/src/javascript/app.cpp             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'fpdfsdk/src/javascript')

diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp
index e59b1a77ed..d520c86942 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/src/javascript/JS_Context.cpp
@@ -37,7 +37,7 @@ FX_BOOL CJS_Context::RunScript(const CFX_WideString& script,
   v8::Isolate::Scope isolate_scope(m_pRuntime->GetIsolate());
 #ifdef PDF_ENABLE_XFA
   v8::Locker locker(m_pRuntime->GetIsolate());
-#endif
+#endif  // PDF_ENABLE_XFA
   v8::HandleScope handle_scope(m_pRuntime->GetIsolate());
   v8::Local<v8::Context> context = m_pRuntime->NewJSContext();
   v8::Context::Scope context_scope(context);
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 2d0d7f6e76..eaf2dda36c 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -6,10 +6,6 @@
 
 #include "JS_Runtime.h"
 
-#ifdef PDF_ENABLE_XFA
-#include "../../../xfa/src/fxjse/src/value.h"
-#include "../../include/fpdfxfa/fpdfxfa_app.h"
-#endif
 #include "Consts.h"
 #include "Document.h"
 #include "Field.h"
@@ -31,6 +27,11 @@
 #include "report.h"
 #include "util.h"
 
+#ifdef PDF_ENABLE_XFA
+#include "../../../xfa/src/fxjse/src/value.h"
+#include "../../include/fpdfxfa/fpdfxfa_app.h"
+#endif  // PDF_ENABLE_XFA
+
 // static
 void IJS_Runtime::Initialize(unsigned int slot, void* isolate) {
   FXJS_Initialize(slot, reinterpret_cast<v8::Isolate*>(isolate));
diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h
index 6de2b705a5..decc553974 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.h
+++ b/fpdfsdk/src/javascript/JS_Runtime.h
@@ -59,13 +59,12 @@ class CJS_Runtime : public IJS_Runtime {
   v8::Local<v8::Context> NewJSContext();
 
 #ifdef PDF_ENABLE_XFA
-  // IJS_Runtime:
   FX_BOOL GetHValueByName(const CFX_ByteStringC& utf8Name,
                           FXJSE_HVALUE hValue) override;
   FX_BOOL SetHValueByName(const CFX_ByteStringC& utf8Name,
                           FXJSE_HVALUE hValue) override;
+#endif  // PDF_ENABLE_XFA
 
-#endif
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
index b538066190..1d94976edf 100644
--- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
@@ -146,8 +146,8 @@ class CJS_RuntimeStub final : public IJS_Runtime {
                                   FXJSE_HVALUE) override {
     return FALSE;
   }
+#endif  // PDF_ENABLE_XFA
 
-#endif
   int Execute(IJS_Context* cc,
               const wchar_t* script,
               CFX_WideString* info) override {
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index d18e0322ab..009e03b002 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -49,7 +49,7 @@ CJS_Timer* TimerObj::GetTimer() const {
 #define JS_NUM_VIEWERVERSION 8
 #ifdef PDF_ENABLE_XFA
 #define JS_NUM_VIEWERVERSION_XFA 11
-#endif
+#endif  // PDF_ENABLE_XFA
 #define JS_NUM_FORMSVERSION 7
 
 BEGIN_JS_STATIC_CONST(CJS_App)
@@ -208,8 +208,8 @@ FX_BOOL app::viewerVersion(IJS_Context* cc,
     vp << JS_NUM_VIEWERVERSION_XFA;
     return TRUE;
   }
+#endif  // PDF_ENABLE_XFA
 
-#endif
   vp << JS_NUM_VIEWERVERSION;
   return TRUE;
 }
-- 
cgit v1.2.3