Merge 51605 - 20091202 Yusuke Sato <yusukes@chromium.org>...

WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp

 /*
  * Copyright (C) 2008, 2009 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 417 matching lines @@
 HANDLE renameAndActivateFont(SharedBuffer* fontData, const String& fontName)
 {
     Vector<char> rewrittenFontData;
     size_t nameTableSize = renameFontInternal(fontData, fontName, rewrittenFontData);
     if (!nameTableSize)
         return 0;
 
     DWORD numFonts = 0;
     HANDLE fontHandle = AddFontMemResourceEx(rewrittenFontData.data(), fontData->size() + nameTableSize, 0, &numFonts);
 
-    if (fontHandle && numFonts != 1) {
+    if (fontHandle && numFonts < 1) {
         RemoveFontMemResourceEx(fontHandle);
         return 0;
     }
 
     return fontHandle;
 }
 #endif
 
 }