Fix some misc nits.

core/fpdfdoc/cpdf_variabletext.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/include/cpdf_variabletext.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfdoc/cpvt_wordinfo.h"
@@ skipping 1094 matching lines @@
   }
   return rcRet;
 }
 
 int32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex,
                                         uint16_t Word,
                                         uint16_t SubWord,
                                         int32_t nWordStyle) {
   if (!m_pVTProvider)
     return 0;
-  if (SubWord > 0)
-    return m_pVTProvider->GetCharWidth(nFontIndex, SubWord, nWordStyle);
-  return m_pVTProvider->GetCharWidth(nFontIndex, Word, nWordStyle);
+  uint16_t word = SubWord ? SubWord : Word;

[Wei Li, 2016/05/12 21:11:59]

SubWord > 0 ? SubWord : Word

[Lei Zhang, 2016/05/12 22:11:31]

|SubWord| is unsigned, so it doesn't matter?

+  return m_pVTProvider->GetCharWidth(nFontIndex, word, nWordStyle);
 }
 
 int32_t CPDF_VariableText::GetTypeAscent(int32_t nFontIndex) {
   return m_pVTProvider ? m_pVTProvider->GetTypeAscent(nFontIndex) : 0;
 }
 
 int32_t CPDF_VariableText::GetTypeDescent(int32_t nFontIndex) {
   return m_pVTProvider ? m_pVTProvider->GetTypeDescent(nFontIndex) : 0;
 }
 
@@ skipping 15 matching lines @@
 
 CPDF_VariableText::Iterator* CPDF_VariableText::GetIterator() {
   if (!m_pVTIterator)
     m_pVTIterator.reset(new CPDF_VariableText::Iterator(this));
   return m_pVTIterator.get();
 }
 
 void CPDF_VariableText::SetProvider(CPDF_VariableText::Provider* pProvider) {
   m_pVTProvider = pProvider;
 }