Merge to XFA: Remove header files that only have includes.

fpdfsdk/src/fxedit/fxet_pageobjs.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 "core/include/fpdfapi/fpdf_pageobj.h"
+#include "core/include/fpdfapi/fpdf_render.h"
+#include "fpdfsdk/include/fx_systemhandler.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
 #include "fpdfsdk/include/fxedit/fxet_edit.h"
-#include "fpdfsdk/include/fxedit/fxet_stub.h"
 
 #define FX_EDIT_UNDERLINEHALFWIDTH 0.5f
 #define FX_EDIT_CROSSOUTHALFWIDTH 0.5f
 
 CPDF_Rect GetUnderLineRect(const CPVT_Word& word) {
   return CPDF_Rect(word.ptWord.x, word.ptWord.y + word.fDescent * 0.5f,
                    word.ptWord.x + word.fWidth,
                    word.ptWord.y + word.fDescent * 0.25f);
 }
 
@@ skipping 30 matching lines @@
         CPDF_Point pt1(0, 0), pt2(1, 0);
         pUser2Device->Transform(pt1.x, pt1.y);
         pUser2Device->Transform(pt2.x, pt2.y);
         CFX_GraphStateData gsd;
         gsd.m_LineWidth =
             (FX_FLOAT)FXSYS_fabs((pt2.x + pt2.y) - (pt1.x + pt1.y));
 
         CPDF_TextRenderer::DrawTextString(pDevice, x, y, pFont, fFontSize, &mt,
                                           str, crTextFill, crTextStroke, &gsd,
                                           &ro);
-      } else
+      } else {
         CPDF_TextRenderer::DrawTextString(pDevice, x, y, pFont, fFontSize, &mt,
                                           str, crTextFill, 0, NULL, &ro);
+      }
     } else {
       CPDF_RenderOptions ro;
       ro.m_Flags = RENDER_CLEARTYPE;
       ro.m_ColorMode = RENDER_COLOR_NORMAL;
 
       if (crTextStroke != 0) {
         CPDF_Point pt1(0, 0), pt2(1, 0);
         pUser2Device->Transform(pt1.x, pt1.y);
         pUser2Device->Transform(pt2.x, pt2.y);
         CFX_GraphStateData gsd;
         gsd.m_LineWidth =
             (FX_FLOAT)FXSYS_fabs((pt2.x + pt2.y) - (pt1.x + pt1.y));
 
         CPDF_TextRenderer::DrawTextString(pDevice, x, y, pFont, fFontSize,
                                           pUser2Device, str, crTextFill,
                                           crTextStroke, &gsd, &ro);
-      } else
+      } else {
         CPDF_TextRenderer::DrawTextString(pDevice, x, y, pFont, fFontSize,
                                           pUser2Device, str, crTextFill, 0,
                                           NULL, &ro);
+      }
     }
   }
 }
 
 void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice,
                              CFX_Matrix* pUser2Device,
                              IFX_Edit* pEdit,
                              FX_COLORREF color,
                              const CPDF_Rect& rcClip,
                              const CPDF_Point& ptOffset,
@@ skipping 118 matching lines @@
         if (pIterator->GetWord(word)) {
           if (bSelect) {
             CPVT_Line line;
             pIterator->GetLine(line);
 
             if (pSystemHandler && pSystemHandler->IsSelectionImplemented()) {
               CPDF_Rect rc(word.ptWord.x, line.ptLine.y + line.fLineDescent,
                            word.ptWord.x + word.fWidth,
                            line.ptLine.y + line.fLineAscent);
               rc.Intersect(rcClip);
-              // CFX_Edit* pEt = (CFX_Edit*)pEdit;
-              // CPDF_Rect rcEdit = pEt->VTToEdit(rc);
               pSystemHandler->OutputSelectedRect(pFFLData, rc);
             } else {
               CFX_PathData pathSelBK;
               pathSelBK.AppendRect(word.ptWord.x,
                                    line.ptLine.y + line.fLineDescent,
                                    word.ptWord.x + word.fWidth,
                                    line.ptLine.y + line.fLineAscent);
 
               pDevice->DrawPath(&pathSelBK, pUser2Device, NULL, crSelBK, 0,
                                 FXFILL_WINDING);
@@ skipping 42 matching lines @@
 
   pDevice->RestoreState();
 }
 
 void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
                             IFX_Edit* pEdit,
                             const CPDF_Rect& rcClip,
                             const CPDF_Point& ptOffset,
                             const CPVT_WordRange* pRange) {
-  // FX_FLOAT fFontSize = pEdit->GetFontSize();
   CPVT_WordRange wrSelect = pEdit->GetSelectWordRange();
 
   FX_COLORREF crCurText = ArgbEncode(255, 0, 0, 0);
   FX_COLORREF crOld = crCurText;
   FX_BOOL bSelect = FALSE;
   const FX_COLORREF crWhite = ArgbEncode(255, 255, 255, 255);
   const FX_COLORREF crSelBK = ArgbEncode(255, 0, 51, 113);
 
   CFX_ByteTextBuf sTextBuf;
   CPVT_WordProps wp;
@@ skipping 285 matching lines @@
             }
 
             wp = word.WordProps;
             ptBT = word.ptWord;
             crOld = crCurText;
           }
 
           sTextBuf << GetPDFWordString(pFontMap, word.WordProps.nFontIndex,
                                        word.Word, 0);
 
-          if (word.WordProps.nWordStyle &
-              PVTWORD_STYLE_UNDERLINE) { /*
-                                                AddLineToPageObjects(pPageObjects,
-                                            crCurText,
-                                                        CPDF_Point(word.ptWord.x,
-                                            word.ptWord.y + word.fDescent *
-                                            0.4f),
-                                                        CPDF_Point(word.ptWord.x
-                                            + word.fWidth, word.ptWord.y +
-                                            word.fDescent * 0.4f));
-*/
+          if (word.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) {
             CPDF_Rect rcUnderline = GetUnderLineRect(word);
             rcUnderline.left += ptOffset.x;
             rcUnderline.right += ptOffset.x;
             rcUnderline.top += ptOffset.y;
             rcUnderline.bottom += ptOffset.y;
 
             AddRectToPageObjects(pPageObjects, crCurText, rcUnderline);
           }
 
           if (word.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) {
@@ skipping 46 matching lines @@
           rcUnderline.left += ptOffset.x;
           rcUnderline.right += ptOffset.x;
           rcUnderline.top += ptOffset.y;
           rcUnderline.bottom += ptOffset.y;
           AddRectToPageObjects(pPageObjects, color, rcUnderline);
         }
       }
     }
   }
 }