Re-enable MSVC warning 4800 for compiling with chromium_code

core/src/fxge/ge/fx_ge_fontmap.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 <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 369 matching lines @@
       break;
   }
   return 0;
 }
 
 int32_t GetSimilarValue(int weight,
                         FX_BOOL bItalic,
                         int pitch_family,
                         FX_DWORD style) {
   int32_t iSimilarValue = 0;
-  if ((style & FXFONT_BOLD) == (weight > 400)) {
+  if (((style & FXFONT_BOLD) != 0) == (weight > 400)) {

[Tom Sepez, 2016/03/11 00:30:29]

again, !!

[Wei Li, 2016/03/11 04:11:36]

Done.

     iSimilarValue += 16;
   }
-  if ((style & FXFONT_ITALIC) == bItalic) {
+  if (((style & FXFONT_ITALIC) != 0) == bItalic) {
     iSimilarValue += 16;
   }
-  if ((style & FXFONT_SERIF) == (pitch_family & FXFONT_FF_ROMAN)) {
+  if (((style & FXFONT_SERIF) != 0) ==
+      ((pitch_family & FXFONT_FF_ROMAN) != 0)) {

[Tom Sepez, 2016/03/11 00:30:29]

Ooops. FXFONT_FF_ROMAN  is (1 << 4), and FXFONT_SERIF is 0x02, so this
expression can never be true as originally written.  Hmmm.

[Wei Li, 2016/03/11 04:11:36]

Acknowledged.

     iSimilarValue += 16;
   }
-  if ((style & FXFONT_SCRIPT) == (pitch_family & FXFONT_FF_SCRIPT)) {
+  if (((style & FXFONT_SCRIPT) != 0) ==

[Tom Sepez, 2016/03/11 00:30:29]

FXFONT_SCRIPT is 8, FXFONT_FF_SCRIPT is (4 << 4).  Ugh.

[Wei Li, 2016/03/11 04:11:36]

Acknowledged.

+      ((pitch_family & FXFONT_FF_SCRIPT) != 0)) {
     iSimilarValue += 8;
   }
-  if ((style & FXFONT_FIXED_PITCH) == (pitch_family & FXFONT_FF_FIXEDPITCH)) {
+  if (((style & FXFONT_FIXED_PITCH) != 0) ==

[Tom Sepez, 2016/03/11 00:30:29]

check this too.

Anyway, I think your changes more accurately express their intent.

[Wei Li, 2016/03/11 04:11:36]

Acknowledged.

+      ((pitch_family & FXFONT_FF_FIXEDPITCH) != 0)) {
     iSimilarValue += 8;
   }
   return iSimilarValue;
 }
 
 }  // namespace
 
 CFX_SubstFont::CFX_SubstFont() {
   m_ExtHandle = NULL;
   m_Charset = 0;
@@ skipping 1200 matching lines @@
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), CompareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }