Remove FX_DWORD from XFA.

xfa/fxgraphics/cfx_graphics.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxgraphics/include/cfx_graphics.h"
 
 #include <memory>
 
@@ skipping 941 matching lines @@
     return RenderDeviceShowText(point, text, matrix);
   return FX_ERR_Property_Invalid;
 }
 
 FX_ERR CFX_Graphics::CalcTextRect(CFX_RectF& rect,
                                   const CFX_WideString& text,
                                   FX_BOOL isMultiline,
                                   CFX_Matrix* matrix) {
   if (m_type == FX_CONTEXT_Device && m_renderDevice) {
     int32_t length = text.GetLength();
-    FX_DWORD* charCodes = FX_Alloc(FX_DWORD, length);
+    uint32_t* charCodes = FX_Alloc(uint32_t, length);
     FXTEXT_CHARPOS* charPos = FX_Alloc(FXTEXT_CHARPOS, length);
     CalcTextInfo(text, charCodes, charPos, rect);
     FX_Free(charPos);
     FX_Free(charCodes);
     return FX_ERR_Succeeded;
   }
   return FX_ERR_Property_Invalid;
 }
 
 FX_ERR CFX_Graphics::Transfer(CFX_Graphics* graphics,
@@ skipping 302 matching lines @@
                               FXSYS_round(r.top - top))) {
     return FX_ERR_Succeeded;
   }
   return FX_ERR_Indefinite;
 }
 
 FX_ERR CFX_Graphics::RenderDeviceShowText(const CFX_PointF& point,
                                           const CFX_WideString& text,
                                           CFX_Matrix* matrix) {
   int32_t length = text.GetLength();
-  FX_DWORD* charCodes = FX_Alloc(FX_DWORD, length);
+  uint32_t* charCodes = FX_Alloc(uint32_t, length);
   FXTEXT_CHARPOS* charPos = FX_Alloc(FXTEXT_CHARPOS, length);
   CFX_RectF rect;
   rect.Set(point.x, point.y, 0, 0);
   CalcTextInfo(text, charCodes, charPos, rect);
   CFX_Matrix m;
   m.Set(m_info.CTM.a, m_info.CTM.b, m_info.CTM.c, m_info.CTM.d, m_info.CTM.e,
         m_info.CTM.f);
   m.Translate(0, m_info.fontSize * m_info.fontHScale);
   if (matrix) {
     m.Concat(*matrix);
@@ skipping 75 matching lines @@
   bmp.Create(width, height, FXDIB_Argb);
   m_renderDevice->GetDIBits(&bmp, 0, 0);
   int32_t pitch = bmp.GetPitch();
   FX_BOOL result = FALSE;
   switch (m_info.fillColor->m_shading->m_type) {
     case FX_SHADING_Axial: {
       FX_FLOAT x_span = end_x - start_x;
       FX_FLOAT y_span = end_y - start_y;
       FX_FLOAT axis_len_square = (x_span * x_span) + (y_span * y_span);
       for (int32_t row = 0; row < height; row++) {
-        FX_DWORD* dib_buf = (FX_DWORD*)(bmp.GetBuffer() + row * pitch);
+        uint32_t* dib_buf = (uint32_t*)(bmp.GetBuffer() + row * pitch);
         for (int32_t column = 0; column < width; column++) {
           FX_FLOAT x = (FX_FLOAT)(column);
           FX_FLOAT y = (FX_FLOAT)(row);
           FX_FLOAT scale =
               (((x - start_x) * x_span) + ((y - start_y) * y_span)) /
               axis_len_square;
           if (scale < 0) {
             if (!m_info.fillColor->m_shading->m_isExtendedBegin) {
               continue;
             }
@@ skipping 11 matching lines @@
       result = TRUE;
       break;
     }
     case FX_SHADING_Radial: {
       FX_FLOAT start_r = m_info.fillColor->m_shading->m_beginRadius;
       FX_FLOAT end_r = m_info.fillColor->m_shading->m_endRadius;
       FX_FLOAT a = ((start_x - end_x) * (start_x - end_x)) +
                    ((start_y - end_y) * (start_y - end_y)) -
                    ((start_r - end_r) * (start_r - end_r));
       for (int32_t row = 0; row < height; row++) {
-        FX_DWORD* dib_buf = (FX_DWORD*)(bmp.GetBuffer() + row * pitch);
+        uint32_t* dib_buf = (uint32_t*)(bmp.GetBuffer() + row * pitch);
         for (int32_t column = 0; column < width; column++) {
           FX_FLOAT x = (FX_FLOAT)(column);
           FX_FLOAT y = (FX_FLOAT)(row);
           FX_FLOAT b = -2 * (((x - start_x) * (end_x - start_x)) +
                              ((y - start_y) * (end_y - start_y)) +
                              (start_r * (end_r - start_r)));
           FX_FLOAT c = ((x - start_x) * (x - start_x)) +
                        ((y - start_y) * (y - start_y)) - (start_r * start_r);
           FX_FLOAT s;
           if (a == 0) {
@@ skipping 64 matching lines @@
     int32_t left, top;
     std::unique_ptr<CFX_DIBitmap> bmp1(source->FlipImage(FALSE, TRUE));
     std::unique_ptr<CFX_DIBitmap> bmp2(
         bmp1->TransformTo((CFX_Matrix*)&m, left, top));
     m_renderDevice->SetDIBits(bmp2.get(), left, top);
   }
   return FX_ERR_Succeeded;
 }
 
 FX_ERR CFX_Graphics::CalcTextInfo(const CFX_WideString& text,
-                                  FX_DWORD* charCodes,
+                                  uint32_t* charCodes,
                                   FXTEXT_CHARPOS* charPos,
                                   CFX_RectF& rect) {
   std::unique_ptr<CFX_UnicodeEncoding> encoding(
       new CFX_UnicodeEncoding(m_info.font));
   int32_t length = text.GetLength();
   FX_FLOAT penX = (FX_FLOAT)rect.left;
   FX_FLOAT penY = (FX_FLOAT)rect.top;
   FX_FLOAT left = (FX_FLOAT)(0);
   FX_FLOAT top = (FX_FLOAT)(0);
   charCodes[0] = text.GetAt(0);
@@ skipping 50 matching lines @@
   CTM = other.CTM;
   isActOnDash = other.isActOnDash;
   strokeColor = other.strokeColor;
   fillColor = other.fillColor;
   font = other.font;
   fontSize = other.fontSize;
   fontHScale = other.fontHScale;
   fontSpacing = other.fontSpacing;
   return *this;
 }