Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Side by Side Diff: fpdfsdk/fxedit/fxet_pageobjs.cpp

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/fxedit/fxet_list.cpp ('k') | fpdfsdk/include/fsdk_mgr.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" 7 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
8 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" 8 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
9 #include "core/fpdfapi/fpdf_page/include/cpdf_pathobject.h" 9 #include "core/fpdfapi/fpdf_page/include/cpdf_pathobject.h"
10 #include "core/fpdfapi/fpdf_page/include/cpdf_textobject.h" 10 #include "core/fpdfapi/fpdf_page/include/cpdf_textobject.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 IFX_Edit* pEdit, 146 IFX_Edit* pEdit,
147 FX_COLORREF crTextFill, 147 FX_COLORREF crTextFill,
148 FX_COLORREF crTextStroke, 148 FX_COLORREF crTextStroke,
149 const CFX_FloatRect& rcClip, 149 const CFX_FloatRect& rcClip,
150 const CFX_FloatPoint& ptOffset, 150 const CFX_FloatPoint& ptOffset,
151 const CPVT_WordRange* pRange, 151 const CPVT_WordRange* pRange,
152 IFX_SystemHandler* pSystemHandler, 152 IFX_SystemHandler* pSystemHandler,
153 void* pFFLData) { 153 void* pFFLData) {
154 const bool bContinuous = 154 const bool bContinuous =
155 pEdit->GetCharArray() == 0 && pEdit->GetCharSpace() <= 0.0f; 155 pEdit->GetCharArray() == 0 && pEdit->GetCharSpace() <= 0.0f;
156 FX_WORD SubWord = pEdit->GetPasswordChar(); 156 uint16_t SubWord = pEdit->GetPasswordChar();
157 FX_FLOAT fFontSize = pEdit->GetFontSize(); 157 FX_FLOAT fFontSize = pEdit->GetFontSize();
158 CPVT_WordRange wrSelect = pEdit->GetSelectWordRange(); 158 CPVT_WordRange wrSelect = pEdit->GetSelectWordRange();
159 int32_t nHorzScale = pEdit->GetHorzScale(); 159 int32_t nHorzScale = pEdit->GetHorzScale();
160 160
161 FX_COLORREF crCurFill = crTextFill; 161 FX_COLORREF crCurFill = crTextFill;
162 FX_COLORREF crOldFill = crCurFill; 162 FX_COLORREF crOldFill = crCurFill;
163 163
164 FX_BOOL bSelect = FALSE; 164 FX_BOOL bSelect = FALSE;
165 const FX_COLORREF crWhite = ArgbEncode(255, 255, 255, 255); 165 const FX_COLORREF crWhite = ArgbEncode(255, 255, 255, 255);
166 const FX_COLORREF crSelBK = ArgbEncode(255, 0, 51, 113); 166 const FX_COLORREF crSelBK = ArgbEncode(255, 0, 51, 113);
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 rcUnderline.left += ptOffset.x; 636 rcUnderline.left += ptOffset.x;
637 rcUnderline.right += ptOffset.x; 637 rcUnderline.right += ptOffset.x;
638 rcUnderline.top += ptOffset.y; 638 rcUnderline.top += ptOffset.y;
639 rcUnderline.bottom += ptOffset.y; 639 rcUnderline.bottom += ptOffset.y;
640 AddRectToPageObjects(pObjectHolder, color, rcUnderline); 640 AddRectToPageObjects(pObjectHolder, color, rcUnderline);
641 } 641 }
642 } 642 }
643 } 643 }
644 } 644 }
645 } 645 }
OLDNEW
« no previous file with comments | « fpdfsdk/fxedit/fxet_list.cpp ('k') | fpdfsdk/include/fsdk_mgr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698