Remove _FXBSTR* and calls to FX_BSTRC.

core/fpdfapi/fpdf_page/fpdf_page_parser.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/fpdfapi/fpdf_page/pageint.h"
 
 #include <vector>
 
@@ skipping 23 matching lines @@
 namespace {
 
 const char kPathOperatorSubpath = 'm';
 const char kPathOperatorLine = 'l';
 const char kPathOperatorCubicBezier1 = 'c';
 const char kPathOperatorCubicBezier2 = 'v';
 const char kPathOperatorCubicBezier3 = 'y';
 const char kPathOperatorClosePath = 'h';
 const char kPathOperatorRectangle[] = "re";
 
-struct _FX_BSTR {
+struct SimpleString {
   const FX_CHAR* m_Ptr;
-  int m_Size;
+  size_t m_Size;
 };
-#define _FX_BSTRC(str) \
-  { str, sizeof(str) - 1 }
+#define MakeSimpleString(str) \
+  { str, strlen(str) }
 
 struct PDF_AbbrPairs {

[Tom Sepez, 2016/04/01 21:45:53]

nit: singular (e.g AbbrPair).

[dsinclair, 2016/04/02 00:13:33]

Done.

-  _FX_BSTR full_name;
-  _FX_BSTR abbr;
+  SimpleString full_name;

[Tom Sepez, 2016/04/01 21:45:53]

Actually, its hard to justify this being anything other than 
struct PDf_AbbrPair {
  const FX_CHAR* full_name;
  const FX_CHAR* abbr;
};

[dsinclair, 2016/04/02 00:13:33]

Done.

+  SimpleString abbr;
 };
 
 const PDF_AbbrPairs PDF_InlineKeyAbbr[] = {
-    {_FX_BSTRC("BitsPerComponent"), _FX_BSTRC("BPC")},
-    {_FX_BSTRC("ColorSpace"), _FX_BSTRC("CS")},
-    {_FX_BSTRC("Decode"), _FX_BSTRC("D")},
-    {_FX_BSTRC("DecodeParms"), _FX_BSTRC("DP")},
-    {_FX_BSTRC("Filter"), _FX_BSTRC("F")},
-    {_FX_BSTRC("Height"), _FX_BSTRC("H")},
-    {_FX_BSTRC("ImageMask"), _FX_BSTRC("IM")},
-    {_FX_BSTRC("Interpolate"), _FX_BSTRC("I")},
-    {_FX_BSTRC("Width"), _FX_BSTRC("W")},
+    {MakeSimpleString("BitsPerComponent"), MakeSimpleString("BPC")},

[Tom Sepez, 2016/04/01 16:43:03]

This theoretically generates static initializers since technically strlen isn't
compile-time constant (as opposed to sizeof(), which is).

There's probably a way to use CFX_ByteStringC here, there should be form to give
us a compile time constant, and if not, we'll tweak it.

[dsinclair, 2016/04/01 20:18:34]

Ah, I failed to understand the comment in pdfium:151. I thought the compiler
would optimize the strlen("foo") to 3 at compile time. Will look into switching
to CFX_ByteStringC.

+    {MakeSimpleString("ColorSpace"), MakeSimpleString("CS")},
+    {MakeSimpleString("Decode"), MakeSimpleString("D")},
+    {MakeSimpleString("DecodeParms"), MakeSimpleString("DP")},
+    {MakeSimpleString("Filter"), MakeSimpleString("F")},
+    {MakeSimpleString("Height"), MakeSimpleString("H")},
+    {MakeSimpleString("ImageMask"), MakeSimpleString("IM")},
+    {MakeSimpleString("Interpolate"), MakeSimpleString("I")},
+    {MakeSimpleString("Width"), MakeSimpleString("W")},
 };
 
 const PDF_AbbrPairs PDF_InlineValueAbbr[] = {
-    {_FX_BSTRC("DeviceGray"), _FX_BSTRC("G")},
-    {_FX_BSTRC("DeviceRGB"), _FX_BSTRC("RGB")},
-    {_FX_BSTRC("DeviceCMYK"), _FX_BSTRC("CMYK")},
-    {_FX_BSTRC("Indexed"), _FX_BSTRC("I")},
-    {_FX_BSTRC("ASCIIHexDecode"), _FX_BSTRC("AHx")},
-    {_FX_BSTRC("ASCII85Decode"), _FX_BSTRC("A85")},
-    {_FX_BSTRC("LZWDecode"), _FX_BSTRC("LZW")},
-    {_FX_BSTRC("FlateDecode"), _FX_BSTRC("Fl")},
-    {_FX_BSTRC("RunLengthDecode"), _FX_BSTRC("RL")},
-    {_FX_BSTRC("CCITTFaxDecode"), _FX_BSTRC("CCF")},
-    {_FX_BSTRC("DCTDecode"), _FX_BSTRC("DCT")},
+    {MakeSimpleString("DeviceGray"), MakeSimpleString("G")},
+    {MakeSimpleString("DeviceRGB"), MakeSimpleString("RGB")},
+    {MakeSimpleString("DeviceCMYK"), MakeSimpleString("CMYK")},
+    {MakeSimpleString("Indexed"), MakeSimpleString("I")},
+    {MakeSimpleString("ASCIIHexDecode"), MakeSimpleString("AHx")},
+    {MakeSimpleString("ASCII85Decode"), MakeSimpleString("A85")},
+    {MakeSimpleString("LZWDecode"), MakeSimpleString("LZW")},
+    {MakeSimpleString("FlateDecode"), MakeSimpleString("Fl")},
+    {MakeSimpleString("RunLengthDecode"), MakeSimpleString("RL")},
+    {MakeSimpleString("CCITTFaxDecode"), MakeSimpleString("CCF")},
+    {MakeSimpleString("DCTDecode"), MakeSimpleString("DCT")},
 };
 
 struct AbbrReplacementOp {
   bool is_replace_key;
   CFX_ByteString key;
   CFX_ByteStringC replacement;
 };
 
 class CPDF_StreamParserAutoClearer {
  public:
   CPDF_StreamParserAutoClearer(CPDF_StreamParser** scoped_variable,
                                CPDF_StreamParser* new_parser)
       : scoped_variable_(scoped_variable) {
     *scoped_variable_ = new_parser;
   }
   ~CPDF_StreamParserAutoClearer() { *scoped_variable_ = NULL; }
 
  private:
   CPDF_StreamParser** scoped_variable_;
 };
 
 CFX_ByteStringC PDF_FindFullName(const PDF_AbbrPairs* table,
                                  size_t count,
                                  const CFX_ByteStringC& abbr) {
   for (size_t i = 0; i < count; ++i) {

[Tom Sepez, 2016/04/01 16:43:03]

std::find using cfx_ByteStringC's == operator should do here.

[dsinclair, 2016/04/02 00:13:33]

Acknowledged.

-    if (abbr.GetLength() != table[i].abbr.m_Size)
+    if (abbr.GetLength() < 0 ||
+        static_cast<size_t>(abbr.GetLength()) != table[i].abbr.m_Size)
       continue;
     if (memcmp(abbr.GetPtr(), table[i].abbr.m_Ptr, abbr.GetLength()))
       continue;
     return CFX_ByteStringC(table[i].full_name.m_Ptr, table[i].full_name.m_Size);
   }
   return CFX_ByteStringC();
 }
 
 }  // namespace
 
@@ skipping 1705 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }