Use PaintOperation instead of bFillOrStroke in CPVT_GenerateAP.

core/fpdfdoc/cpvt_generateap.cpp

 // Copyright 2016 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/fpdfdoc/cpvt_generateap.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
@@ skipping 135 matching lines @@
     }
   }
   CPVT_Color crBorder, crBG;
   if (CPDF_Dictionary* pMKDict = pAnnotDict->GetDictBy("MK")) {
     if (CPDF_Array* pArray = pMKDict->GetArrayBy("BC"))
       crBorder = CPVT_Color::ParseColor(*pArray);
     if (CPDF_Array* pArray = pMKDict->GetArrayBy("BG"))
       crBG = CPVT_Color::ParseColor(*pArray);
   }
   CFX_ByteTextBuf sAppStream;
-  CFX_ByteString sBG = CPVT_GenerateAP::GenerateColorAP(crBG, TRUE);
+  CFX_ByteString sBG = CPVT_GenerateAP::GenerateColorAP(crBG, false);
   if (sBG.GetLength() > 0) {
     sAppStream << "q\n" << sBG << rcBBox.left << " " << rcBBox.bottom << " "
                << rcBBox.Width() << " " << rcBBox.Height() << " re f\n"
                << "Q\n";
   }
   CFX_ByteString sBorderStream = CPVT_GenerateAP::GenerateBorderAP(
       rcBBox, fBorderWidth, crBorder, crLeftTop, crRightBottom, nBorderStyle,
       dsBorder);
   if (sBorderStream.GetLength() > 0)
     sAppStream << "q\n" << sBorderStream << "Q\n";
@@ skipping 89 matching lines @@
           &map, vt.GetIterator(), ptOffset, !bCharArray, subWord);
       if (sBody.GetLength() > 0) {
         sAppStream << "/Tx BMC\n"
                    << "q\n";
         if (rcContent.Width() > rcBody.Width() ||
             rcContent.Height() > rcBody.Height()) {
           sAppStream << rcBody.left << " " << rcBody.bottom << " "
                      << rcBody.Width() << " " << rcBody.Height()
                      << " re\nW\nn\n";
         }
-        sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
-                   << sBody << "ET\n"
+        sAppStream << "BT\n"
+                   << CPVT_GenerateAP::GenerateColorAP(crText, false) << sBody
+                   << "ET\n"
                    << "Q\nEMC\n";
       }
     } break;
     case 1: {
       CFX_WideString swValue =
           FPDF_GetFieldAttr(pAnnotDict, "V")
               ? FPDF_GetFieldAttr(pAnnotDict, "V")->GetUnicodeText()
               : CFX_WideString();
       CPVT_FontMap map(
           pDoc, pStreamDict ? pStreamDict->GetDictBy("Resources") : nullptr,
@@ skipping 19 matching lines @@
       CFX_FloatRect rcContent = vt.GetContentRect();
       CFX_FloatPoint ptOffset =
           CFX_FloatPoint(0.0f, (rcContent.Height() - rcEdit.Height()) / 2.0f);
       CFX_ByteString sEdit = CPVT_GenerateAP::GenerateEditAP(
           &map, vt.GetIterator(), ptOffset, TRUE, 0);
       if (sEdit.GetLength() > 0) {
         sAppStream << "/Tx BMC\n"
                    << "q\n";
         sAppStream << rcEdit.left << " " << rcEdit.bottom << " "
                    << rcEdit.Width() << " " << rcEdit.Height() << " re\nW\nn\n";
-        sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
-                   << sEdit << "ET\n"
+        sAppStream << "BT\n"
+                   << CPVT_GenerateAP::GenerateColorAP(crText, false) << sEdit
+                   << "ET\n"
                    << "Q\nEMC\n";
       }
       CFX_ByteString sButton = CPVT_GenerateAP::GenerateColorAP(
           CPVT_Color(CPVT_Color::kRGB, 220.0f / 255.0f, 220.0f / 255.0f,
                      220.0f / 255.0f),
-          TRUE);
+          false);
       if (sButton.GetLength() > 0 && !rcButton.IsEmpty()) {
         sAppStream << "q\n" << sButton;
         sAppStream << rcButton.left << " " << rcButton.bottom << " "
                    << rcButton.Width() << " " << rcButton.Height() << " re f\n";
         sAppStream << "Q\n";
         CFX_ByteString sButtonBorder = CPVT_GenerateAP::GenerateBorderAP(
             rcButton, 2, CPVT_Color(CPVT_Color::kGray, 0),
             CPVT_Color(CPVT_Color::kGray, 1),
             CPVT_Color(CPVT_Color::kGray, 0.5), BorderStyle::BEVELED,
             CPVT_Dash(3, 0, 0));
@@ skipping 54 matching lines @@
                 CFX_FloatRect(rcBody.left, 0.0f, rcBody.right, 0.0f));
             vt.SetFontSize(IsFloatZero(fFontSize) ? 12.0f : fFontSize);
 
             vt.Initialize();
             vt.SetText(swItem.c_str());
             vt.RearrangeAll();
             FX_FLOAT fItemHeight = vt.GetContentRect().Height();
             if (bSelected) {
               CFX_FloatRect rcItem = CFX_FloatRect(
                   rcBody.left, fy - fItemHeight, rcBody.right, fy);
-              sBody << "q\n" << CPVT_GenerateAP::GenerateColorAP(
-                                    CPVT_Color(CPVT_Color::kRGB, 0,
-                                               51.0f / 255.0f, 113.0f / 255.0f),
-                                    TRUE)
+              sBody << "q\n"
+                    << CPVT_GenerateAP::GenerateColorAP(
+                           CPVT_Color(CPVT_Color::kRGB, 0, 51.0f / 255.0f,
+                                      113.0f / 255.0f),
+                           false)
                     << rcItem.left << " " << rcItem.bottom << " "
                     << rcItem.Width() << " " << rcItem.Height() << " re f\n"
                     << "Q\n";
-              sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(
-                                     CPVT_Color(CPVT_Color::kGray, 1), TRUE)
+              sBody << "BT\n"
+                    << CPVT_GenerateAP::GenerateColorAP(
+                           CPVT_Color(CPVT_Color::kGray, 1), false)
                     << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(),
                                                        CFX_FloatPoint(0.0f, fy),
                                                        TRUE, 0)
                     << "ET\n";
             } else {
-              sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
+              sBody << "BT\n"
+                    << CPVT_GenerateAP::GenerateColorAP(crText, false)
                     << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(),
                                                        CFX_FloatPoint(0.0f, fy),
                                                        TRUE, 0)
                     << "ET\n";
             }
             fy -= fItemHeight;
           }
         }
       }
       if (sBody.GetSize() > 0) {
@@ skipping 85 matching lines @@
   // existing AP dictionary.
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
   CFX_ByteTextBuf sAppStream;
   sAppStream << "/GS gs ";
 
   if (pAnnotDict->KeyExist("C")) {
     CPDF_Array* pColor = pAnnotDict->GetArrayBy("C");
     CPVT_Color color = CPVT_Color::ParseColor(*pColor);
-    sAppStream << CPVT_GenerateAP::GenerateColorAP(color, TRUE);
+    sAppStream << CPVT_GenerateAP::GenerateColorAP(color, false);
   } else {
     // Defaults to 0xFFFF00 color for highlight.
     sAppStream << "1 1 0 rg \n";
   }
 
   CFX_FloatRect rect = pAnnotDict->GetRectBy("Rect");
   rect.Normalize();
 
   sAppStream << rect.left << " " << rect.top << " m " << rect.right << " "
              << rect.top << " l " << rect.right << " " << rect.bottom << " l "
@@ skipping 131 matching lines @@
   CFX_ByteString sColor;
   FX_FLOAT fLeft = rect.left;
   FX_FLOAT fRight = rect.right;
   FX_FLOAT fTop = rect.top;
   FX_FLOAT fBottom = rect.bottom;
   if (fWidth > 0.0f) {
     FX_FLOAT fHalfWidth = fWidth / 2.0f;
     switch (nStyle) {
       default:
       case BorderStyle::SOLID:
-        sColor = GenerateColorAP(color, TRUE);
+        sColor = GenerateColorAP(color, false);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
                      << fTop - fBottom << " re\n";
           sAppStream << fLeft + fWidth << " " << fBottom + fWidth << " "
                      << fRight - fLeft - fWidth * 2 << " "
                      << fTop - fBottom - fWidth * 2 << " re\n";
           sAppStream << "f*\n";
         }
         break;
       case BorderStyle::DASH:
-        sColor = GenerateColorAP(color, FALSE);
+        sColor = GenerateColorAP(color, true);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fWidth << " w"
                      << " [" << dash.nDash << " " << dash.nGap << "] "
                      << dash.nPhase << " d\n";
           sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
                      << " m\n";
           sAppStream << fLeft + fWidth / 2 << " " << fTop - fWidth / 2
                      << " l\n";
           sAppStream << fRight - fWidth / 2 << " " << fTop - fWidth / 2
                      << " l\n";
           sAppStream << fRight - fWidth / 2 << " " << fBottom + fWidth / 2
                      << " l\n";
           sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
                      << " l S\n";
         }
         break;
       case BorderStyle::BEVELED:
       case BorderStyle::INSET:
-        sColor = GenerateColorAP(crLeftTop, TRUE);
+        sColor = GenerateColorAP(crLeftTop, false);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth
                      << " m\n";
           sAppStream << fLeft + fHalfWidth << " " << fTop - fHalfWidth
                      << " l\n";
           sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth
                      << " l\n";
           sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
                      << " l\n";
           sAppStream << fLeft + fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
                      << " l\n";
           sAppStream << fLeft + fHalfWidth * 2 << " "
                      << fBottom + fHalfWidth * 2 << " l f\n";
         }
-        sColor = GenerateColorAP(crRightBottom, TRUE);
+        sColor = GenerateColorAP(crRightBottom, false);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth
                      << " m\n";
           sAppStream << fRight - fHalfWidth << " " << fBottom + fHalfWidth
                      << " l\n";
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth
                      << " l\n";
           sAppStream << fLeft + fHalfWidth * 2 << " "
                      << fBottom + fHalfWidth * 2 << " l\n";
           sAppStream << fRight - fHalfWidth * 2 << " "
                      << fBottom + fHalfWidth * 2 << " l\n";
           sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
                      << " l f\n";
         }
-        sColor = GenerateColorAP(color, TRUE);
+        sColor = GenerateColorAP(color, false);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
                      << fTop - fBottom << " re\n";
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth << " "
                      << fRight - fLeft - fHalfWidth * 2 << " "
                      << fTop - fBottom - fHalfWidth * 2 << " re f*\n";
         }
         break;
       case BorderStyle::UNDERLINE:
-        sColor = GenerateColorAP(color, FALSE);
+        sColor = GenerateColorAP(color, true);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fWidth << " w\n";
           sAppStream << fLeft << " " << fBottom + fWidth / 2 << " m\n";
           sAppStream << fRight << " " << fBottom + fWidth / 2 << " l S\n";
         }
         break;
     }
   }
   return sAppStream.MakeString();
 }
 
 // Static.
 CFX_ByteString CPVT_GenerateAP::GenerateColorAP(const CPVT_Color& color,
-                                                const FX_BOOL& bFillOrStroke) {
+                                                bool bIsStroke) {

[Lei Zhang, 2016/08/01 19:33:48]

Consider making this an enum, then you can write:

GenerateColorAP(color, kFill);
GenerateColorAP(color, kStroke);

and that's more readable than GenerateColorAP(color, true);  // what does true
mean again?

[jaepark, 2016/08/02 18:15:47]

Done.

   CFX_ByteTextBuf sColorStream;
   switch (color.nColorType) {
     case CPVT_Color::kRGB:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
-                   << color.fColor3 << " " << (bFillOrStroke ? "rg" : "RG")
-                   << "\n";
+                   << color.fColor3 << " " << (bIsStroke ? "RG" : "rg") << "\n";
       break;
     case CPVT_Color::kGray:
-      sColorStream << color.fColor1 << " " << (bFillOrStroke ? "g" : "G")
-                   << "\n";
+      sColorStream << color.fColor1 << " " << (bIsStroke ? "G" : "g") << "\n";
       break;
     case CPVT_Color::kCMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
-                   << (bFillOrStroke ? "k" : "K") << "\n";
+                   << (bIsStroke ? "K" : "k") << "\n";
       break;
     case CPVT_Color::kTransparent:
       break;
   }
   return sColorStream.MakeString();
 }
 
 // Static.
 CFX_ByteString CPVT_GenerateAP::GetPDFWordString(IPVT_FontMap* pFontMap,
                                                  int32_t nFontIndex,
@@ skipping 34 matching lines @@
                                                  int32_t nFontIndex,
                                                  FX_FLOAT fFontSize) {
   CFX_ByteTextBuf sRet;
   if (pFontMap) {
     CFX_ByteString sFontAlias = pFontMap->GetPDFFontAlias(nFontIndex);
     if (sFontAlias.GetLength() > 0 && fFontSize > 0)
       sRet << "/" << sFontAlias << " " << fFontSize << " Tf\n";
   }
   return sRet.MakeString();
 }