Experimental change: Remove DirectWrite 1750 font limit.

content/common/dwrite_font_platform_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/dwrite_font_platform_win.h"
 
 #include <dwrite.h>
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 66 matching lines @@
 // users, so we are putting arbitrary limit on cache file size. There are
 // multiple ways we can tune our working size, like mapping only required part
 // of section at any given time.
 const double kArbitraryCacheFileSizeLimit = (20 * 1024 * 1024);
 
 // We have chosen current font file length arbitrarily. In our logic
 // if we don't find file we are looking for in cache we end up loading
 // that file directly from system fonts folder.
 const unsigned int kMaxFontFileNameLength = 34;
 
-const DWORD kCacheFileVersion = 101;
+const DWORD kCacheFileVersion = 102;
 const DWORD kFileSignature = 0x4D4F5243; // CROM
 const DWORD kMagicCompletionSignature = 0x454E4F44; // DONE
 
 const DWORD kUndefinedDWORDS = 36;
 
 // Make sure that all structure sizes align with 8 byte boundary otherwise
 // dr. memory test may complain.
 #pragma pack(push, 8)
 // Cache file header, includes signature, completion bits and version.
 struct CacheFileHeader {
@@ skipping 923 matching lines @@
 IDWriteFontCollection* GetCustomFontCollection(IDWriteFactory* factory) {
   if (g_font_collection.Get() != NULL)
     return g_font_collection.Get();
 
   base::TimeTicks start_tick = base::TimeTicks::Now();
 
   FontCollectionLoader::Initialize(factory);
 
   bool cache_file_loaded = g_font_loader->LoadCacheFile();
 
-  // We try here to put arbitrary limit on max number of fonts that could
-  // be loaded, otherwise we fallback to restricted set of fonts.
-  const UINT32 kMaxFontThreshold = 1750;
   HRESULT hr = E_FAIL;
-  if (g_font_loader->GetFontMapSize() < kMaxFontThreshold) {
-    g_font_loader->EnableCollectionBuildingMode(true);
-    hr = factory->CreateCustomFontCollection(
-        g_font_loader.Get(), NULL, 0, g_font_collection.GetAddressOf());
-    g_font_loader->EnableCollectionBuildingMode(false);
-  }
+  g_font_loader->EnableCollectionBuildingMode(true);
+  hr = factory->CreateCustomFontCollection(
+      g_font_loader.Get(), NULL, 0, g_font_collection.GetAddressOf());
+  g_font_loader->EnableCollectionBuildingMode(false);
 
   bool loading_restricted = false;
   if (FAILED(hr) || !g_font_collection.Get()) {
     loading_restricted = true;
     // We will try here just one more time with restricted font set.
     g_font_loader->LoadRestrictedFontList();
     hr = factory->CreateCustomFontCollection(
         g_font_loader.Get(), NULL, 0, g_font_collection.GetAddressOf());
   }
 
@@ skipping 47 matching lines @@
           reinterpret_cast<IUnknown**>(factory.GetAddressOf()))));
 
   base::TimeTicks start_tick = base::TimeTicks::Now();
 
   FontCollectionLoader::Initialize(factory.Get());
 
   g_font_loader->EnterStaticCacheMode(file_name);
 
   mswr::ComPtr<IDWriteFontCollection> font_collection;
 
-  // We try here to put arbitrary limit on max number of fonts that could
-  // be loaded, otherwise we fallback to restricted set of fonts.

[cpu_(ooo_6.6-7.5), 2014/12/11 23:31:24]

we had the same constant twice?

[Shrikant Kelkar, 2014/12/11 23:43:50]

Acknowledged.

-  const UINT32 kMaxFontThreshold = 1750;
   HRESULT hr = E_FAIL;
-  if (g_font_loader->GetFontMapSize() < kMaxFontThreshold) {
-    g_font_loader->EnableCollectionBuildingMode(true);
-    hr = factory->CreateCustomFontCollection(
-        g_font_loader.Get(), NULL, 0, font_collection.GetAddressOf());
-    g_font_loader->EnableCollectionBuildingMode(false);
-  }
+  g_font_loader->EnableCollectionBuildingMode(true);

[cpu_(ooo_6.6-7.5), 2014/12/11 23:31:24]

can it handle 20K fonts? is so go ahead. lgtm.

[Shrikant Kelkar, 2014/12/11 23:43:50]

It may not.. but in this experiment let's see to what level hangs/crashes come
back.

+  hr = factory->CreateCustomFontCollection(
+      g_font_loader.Get(), NULL, 0, font_collection.GetAddressOf());
+  g_font_loader->EnableCollectionBuildingMode(false);
 
   bool loading_restricted = false;
   if (FAILED(hr) || !font_collection.Get()) {
     loading_restricted = true;
     // We will try here just one more time with restricted font set.
     g_font_loader->LoadRestrictedFontList();
     hr = factory->CreateCustomFontCollection(
         g_font_loader.Get(), NULL, 0, font_collection.GetAddressOf());
   }
 
@@ skipping 56 matching lines @@
   g_shared_font_cache.Set(mapping);
 
   return true;
 }
 
 bool BuildFontCache(const base::FilePath& file) {
   return BuildFontCacheInternal(file.value().c_str());
 }
 
 }  // namespace content