Merge to XFA: Cleanup: Fix some unneeded semi-colons and bad spacing.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1284193005 .

(cherry picked from commit 632b807b386878afdb42322f0037f8998306f4a9)

Review URL: https://codereview.chromium.org/1301453002 .

6 files changed, 7 insertions, 7 deletions

diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index a716bc2ccb..995d32219e 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -128,7 +128,7 @@ class CJS_Context : public IFXJS_Context {
 
   FX_BOOL DoJob(int nMode, const CFX_WideString& script, CFX_WideString& info);
 
-  CJS_EventHandler* GetEventHandler() { return m_pEventHandler; };
+  CJS_EventHandler* GetEventHandler() { return m_pEventHandler; }
   CPDFSDK_Document* GetReaderDocument();
 
  private:
diff --git a/fpdfsdk/include/javascript/JS_EventHandler.h b/fpdfsdk/include/javascript/JS_EventHandler.h
index 5e4982c1df..e03904897d 100644
--- a/fpdfsdk/include/javascript/JS_EventHandler.h
+++ b/fpdfsdk/include/javascript/JS_EventHandler.h
@@ -185,7 +185,7 @@ class CJS_EventHandler {
   FX_BOOL WillCommit();
   CFX_WideString TargetName();
 
-  JS_EVENT_T EventType() { return m_eEventType; };
+  JS_EVENT_T EventType() { return m_eEventType; }
 
  public:
   CJS_Context* m_pJSContext;
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index 2e397ea1ef..d512484230 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -55,7 +55,7 @@ class CJS_Runtime : public IFXJS_Runtime {
   FX_BOOL IsBlocking() { return m_bBlocking; }
 
   operator IJS_Runtime*() { return (IJS_Runtime*)m_isolate; }
-  v8::Isolate* GetIsolate() { return m_isolate; };
+  v8::Isolate* GetIsolate() { return m_isolate; }
   void SetIsolate(v8::Isolate* isolate) { m_isolate = isolate; }
 
   v8::Local<v8::Context> NewJSContext();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 95157cad1f..827741106b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -38,7 +38,7 @@ class CPWL_Icon : public CPWL_Image {
   CPWL_Icon();
   ~CPWL_Icon() override;
 
-  virtual CPDF_IconFit* GetIconFit() { return m_pIconFit; };
+  virtual CPDF_IconFit* GetIconFit() { return m_pIconFit; }
 
   // CPWL_Image
   void GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) override;
@@ -49,7 +49,7 @@ class CPWL_Icon : public CPWL_Image {
   void GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom);
   FX_BOOL GetFittingBounds();
 
-  void SetIconFit(CPDF_IconFit* pIconFit) { m_pIconFit = pIconFit; };
+  void SetIconFit(CPDF_IconFit* pIconFit) { m_pIconFit = pIconFit; }
 
  private:
   CPDF_IconFit* m_pIconFit;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
index ec1b78ed5e..b91d467daa 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
@@ -111,7 +111,7 @@ class CPWL_ScrollBar : public CPWL_Wnd {
   void TimerProc() override;
 
   FX_FLOAT GetScrollBarWidth() const;
-  PWL_SCROLLBAR_TYPE GetScrollBarType() const { return m_sbType; };
+  PWL_SCROLLBAR_TYPE GetScrollBarType() const { return m_sbType; }
 
   void SetNotifyForever(FX_BOOL bForever) { m_bNotifyForever = bForever; }
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 37af083835..e8340c34ad 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -422,7 +422,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
   virtual void OnEnabled();
   virtual void OnDisabled();
 
-  void SetNotifyFlag(FX_BOOL bNotifying = TRUE) { m_bNotifying = bNotifying; };
+  void SetNotifyFlag(FX_BOOL bNotifying = TRUE) { m_bNotifying = bNotifying; }
 
   FX_BOOL IsValid() const;
   PWL_CREATEPARAM GetCreationParam() const;