commit 7f55a5410f665cfdbb5796d6d9a5387a5f6fa2eb
author Dan Sinclair <dsinclair@chromium.org> Thu Jul 13 14:17:10 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Thu Jul 13 19:08:45 2017 +0000
tree 7211973789a60892f27db6e2810f805ff0bd8f37
parent fe75997a8a8d7fc555d91c3aad595112a46ad7a2

Rename CPWL_Color to CFX_Color

This CL moves fpdfsdk/pdfwindow/cpwl_color to core/fxge/cfx_color.

Change-Id: Ia95b7fba2c76a1b9a438014d3598c7aa55bbb2ab
Reviewed-on: https://pdfium-review.googlesource.com/7753
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

fpdfsdk/javascript/Field.h

diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h
index 688c5de..1c8d6be 100644
--- a/fpdfsdk/javascript/Field.h
+++ b/fpdfsdk/javascript/Field.h
@@ -11,9 +11,9 @@
 #include <vector>
 
 #include "core/fxcrt/cfx_observable.h"
+#include "core/fxge/cfx_color.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"  // For CPWL_Color.
 
 class CPDFSDK_Widget;
 class Document;
@@ -67,7 +67,7 @@
   CFX_ByteString string;
   CFX_WideString widestring;
   CFX_FloatRect rect;
-  CPWL_Color color;
+  CFX_Color color;
   std::vector<uint32_t> wordarray;
   std::vector<CFX_WideString> widestringarray;
 };
@@ -385,7 +385,7 @@
   static void SetFillColor(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                            const CFX_WideString& swFieldName,
                            int nControlIndex,
-                           const CPWL_Color& color);
+                           const CFX_Color& color);
   static void SetHidden(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                         const CFX_WideString& swFieldName,
                         int nControlIndex,
@@ -421,7 +421,7 @@
   static void SetStrokeColor(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                              const CFX_WideString& swFieldName,
                              int nControlIndex,
-                             const CPWL_Color& color);
+                             const CFX_Color& color);
   static void SetStyle(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                        const CFX_WideString& swFieldName,
                        int nControlIndex,
@@ -429,7 +429,7 @@
   static void SetTextColor(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                            const CFX_WideString& swFieldName,
                            int nControlIndex,
-                           const CPWL_Color& color);
+                           const CFX_Color& color);
   static void SetTextFont(CPDFSDK_FormFillEnvironment* pFormFillEnv,
                           const CFX_WideString& swFieldName,
                           int nControlIndex,
@@ -490,7 +490,7 @@
   void AddDelay_String(FIELD_PROP prop, const CFX_ByteString& string);
   void AddDelay_WideString(FIELD_PROP prop, const CFX_WideString& string);
   void AddDelay_Rect(FIELD_PROP prop, const CFX_FloatRect& rect);
-  void AddDelay_Color(FIELD_PROP prop, const CPWL_Color& color);
+  void AddDelay_Color(FIELD_PROP prop, const CFX_Color& color);
   void AddDelay_WordArray(FIELD_PROP prop, const std::vector<uint32_t>& array);
   void AddDelay_WideStringArray(FIELD_PROP prop,
                                 const std::vector<CFX_WideString>& array);