Clean up misc nits found while fixing bugs.

core/src/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 "pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
 
 #define REQUIRE_PARAMS(count)  \

[Tom Sepez, 2016/01/07 17:27:02]

nit: bleh on hiding an early return.

[Lei Zhang, 2016/01/08 02:54:30]

Gone.

   if (m_ParamCount != count) { \
     return;                    \
   }
 
 CPDF_StreamContentParser::CPDF_StreamContentParser(
     CPDF_Document* pDocument,
     CPDF_Dictionary* pPageResources,
     CPDF_Dictionary* pParentResources,
     CFX_Matrix* pmtContentToUser,
     CPDF_PageObjects* pObjList,
@@ skipping 400 matching lines @@
     m_CurContentMark.GetModify()->AddMark(tag, pDict, bDirect);
   }
 }
 void CPDF_StreamContentParser::Handle_BeginMarkedContent() {
   if (!m_Options.m_bMarkedContent) {
     return;
   }
   CFX_ByteString tag = GetString(0);
   m_CurContentMark.GetModify()->AddMark(tag, NULL, FALSE);
 }
 struct _FX_BSTR {

[Tom Sepez, 2016/01/07 17:27:02]

Down the road. I've thought that the real CFX_ByteStringC with all its methods
should inherit from a POD type like this, to allow this sort of thing. Thoughts?

[Lei Zhang, 2016/01/08 02:54:30]

Sounds ok to me. Or maybe Blink's String class will take over in Chromium some
day and we'll switch to that too.

   const FX_CHAR* m_Ptr;
   int m_Size;
 };
 #define _FX_BSTRC(str) \
   { str, sizeof(str) - 1 }
 const _FX_BSTR _PDF_InlineKeyAbbr[] = {
     _FX_BSTRC("BitsPerComponent"),
     _FX_BSTRC("BPC"),
     _FX_BSTRC("ColorSpace"),
     _FX_BSTRC("CS"),
@@ skipping 23 matching lines @@
     _FX_BSTRC("FlateDecode"),     _FX_BSTRC("Fl"),
     _FX_BSTRC("RunLengthDecode"), _FX_BSTRC("RL"),
     _FX_BSTRC("CCITTFaxDecode"),  _FX_BSTRC("CCF"),
     _FX_BSTRC("DCTDecode"),       _FX_BSTRC("DCT"),
 };
 static CFX_ByteStringC _PDF_FindFullName(const _FX_BSTR* table,
                                          int count,
                                          const CFX_ByteStringC& abbr) {
   int i = 0;
   while (i < count) {
     if (abbr.GetLength() == table[i + 1].m_Size &&

[Tom Sepez, 2016/01/07 17:27:02]

Is it too much to ask to make a struct containing a pair of values rather than
the [n] [n+1] trick used here? 

[Lei Zhang, 2016/01/08 02:54:30]

Done.

         FXSYS_memcmp(abbr.GetPtr(), table[i + 1].m_Ptr, abbr.GetLength()) ==
             0) {
       return CFX_ByteStringC(table[i].m_Ptr, table[i].m_Size);
     }
     i += 2;
   }
   return CFX_ByteStringC();
 }
-void _PDF_ReplaceAbbr(CPDF_Object* pObj) {
+
+void PDF_ReplaceAbbr(CPDF_Object* pObj) {
   switch (pObj->GetType()) {
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pDict = pObj->AsDictionary();
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key;
         CPDF_Object* value = pDict->GetNextElement(pos, key);
         CFX_ByteStringC fullname = _PDF_FindFullName(
             _PDF_InlineKeyAbbr, sizeof _PDF_InlineKeyAbbr / sizeof(_FX_BSTR),
             key);
         if (!fullname.IsEmpty()) {
           pDict->ReplaceKey(key, fullname);
           key = fullname;
         }
 
         if (value->IsName()) {
           CFX_ByteString name = value->GetString();
           fullname = _PDF_FindFullName(
               _PDF_InlineValueAbbr,
               sizeof _PDF_InlineValueAbbr / sizeof(_FX_BSTR), name);
           if (!fullname.IsEmpty()) {
             pDict->SetAtName(key, fullname);
           }
         } else {
-          _PDF_ReplaceAbbr(value);
+          PDF_ReplaceAbbr(value);
         }
       }
       break;
     }
     case PDFOBJ_ARRAY: {
       CPDF_Array* pArray = pObj->AsArray();
       for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
         CPDF_Object* pElement = pArray->GetElement(i);
         if (pElement->IsName()) {
           CFX_ByteString name = pElement->GetString();
           CFX_ByteStringC fullname = _PDF_FindFullName(
               _PDF_InlineValueAbbr,
               sizeof _PDF_InlineValueAbbr / sizeof(_FX_BSTR), name);
           if (!fullname.IsEmpty()) {
             pArray->SetAt(i, new CPDF_Name(fullname));
           }
         } else {
-          _PDF_ReplaceAbbr(pElement);
+          PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
   }
 }
+
 static CFX_ByteStringC _PDF_FindAbbrName(const _FX_BSTR* table,
                                          int count,
                                          const CFX_ByteStringC& fullName) {
   int i = 0;
   while (i < count) {
     if (fullName.GetLength() == table[i].m_Size &&
         FXSYS_memcmp(fullName.GetPtr(), table[i].m_Ptr, fullName.GetLength()) ==
             0) {
       return CFX_ByteStringC(table[i + 1].m_Ptr, table[i + 1].m_Size);
     }
@@ skipping 973 matching lines @@
     m_pObjectList->m_ObjectList.AddTail(pPathObj);
   }
   if (PathClipType) {
     if (!matrix.IsIdentity()) {
       Path.Transform(&matrix);
       matrix.SetIdentity();
     }
     m_pCurStates->m_ClipPath.AppendPath(Path, PathClipType, TRUE);
   }
 }