reflow comments in platform/fonts

third_party/WebKit/Source/platform/fonts/FontDataCache.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
   if (!platformData->typeface()) {
     DLOG(ERROR)
         << "Empty typeface() in FontPlatformData when accessing FontDataCache.";
     return nullptr;
   }
 
   Cache::iterator result = m_cache.find(platformData);
   if (result == m_cache.end()) {
     std::pair<RefPtr<SimpleFontData>, unsigned> newValue(
         SimpleFontData::create(*platformData), shouldRetain == Retain ? 1 : 0);
-    // The new SimpleFontData takes a copy of the incoming FontPlatformData object. The incoming key may be
-    // temporary. So, for cache storage, take the address of the newly created FontPlatformData that is copied an
-    // owned by SimpleFontData.
+    // The new SimpleFontData takes a copy of the incoming FontPlatformData
+    // object. The incoming key may be temporary. So, for cache storage, take
+    // the address of the newly created FontPlatformData that is copied an owned
+    // by SimpleFontData.
     m_cache.set(&newValue.first->platformData(), newValue);
     if (shouldRetain == DoNotRetain)
       m_inactiveFontData.add(newValue.first);
     return newValue.first.release();
   }
 
   if (!result.get()->value.second) {
     ASSERT(m_inactiveFontData.contains(result.get()->value.first));
     m_inactiveFontData.remove(result.get()->value.first);
   }
 
   if (shouldRetain == Retain) {
     result.get()->value.second++;
   } else if (!result.get()->value.second) {
-    // If shouldRetain is DoNotRetain and count is 0, we want to remove the fontData from
-    // m_inactiveFontData (above) and re-add here to update LRU position.
+    // If shouldRetain is DoNotRetain and count is 0, we want to remove the
+    // fontData from m_inactiveFontData (above) and re-add here to update LRU
+    // position.
     m_inactiveFontData.add(result.get()->value.first);
   }
 
   return result.get()->value.first;
 }
 
 bool FontDataCache::contains(const FontPlatformData* fontPlatformData) const {
   return m_cache.contains(fontPlatformData);
 }
 
@@ skipping 26 matching lines @@
     return purgeLeastRecentlyUsed(INT_MAX);
 
   if (m_inactiveFontData.size() > cMaxInactiveFontData)
     return purgeLeastRecentlyUsed(m_inactiveFontData.size() -
                                   cTargetInactiveFontData);
 
   return false;
 }
 
 bool FontDataCache::purgeLeastRecentlyUsed(int count) {
-  static bool
-      isPurging;  // Guard against reentry when e.g. a deleted FontData releases its small caps FontData.
+  static bool isPurging;  // Guard against reentry when e.g. a deleted FontData
+                          // releases its small caps FontData.

[dcheng, 2016/10/03 20:41:17]

Nit: I think this would be slightly more readable on its own line, since this
isn't defining a member.

[Nico, 2016/10/03 20:46:56]

Done.

   if (isPurging)
     return false;
 
   isPurging = true;
 
   Vector<RefPtr<SimpleFontData>, 20> fontDataToDelete;
   ListHashSet<RefPtr<SimpleFontData>>::iterator end = m_inactiveFontData.end();
   ListHashSet<RefPtr<SimpleFontData>>::iterator it = m_inactiveFontData.begin();
   for (int i = 0; i < count && it != end; ++it, ++i) {
     RefPtr<SimpleFontData>& fontData = *it.get();
     m_cache.remove(&(fontData->platformData()));
-    // We should not delete SimpleFontData here because deletion can modify m_inactiveFontData. See http://trac.webkit.org/changeset/44011
+    // We should not delete SimpleFontData here because deletion can modify
+    // m_inactiveFontData. See http://trac.webkit.org/changeset/44011
     fontDataToDelete.append(fontData);
   }
 
   if (it == end) {
     // Removed everything
     m_inactiveFontData.clear();
   } else {
     for (int i = 0; i < count; ++i)
       m_inactiveFontData.remove(m_inactiveFontData.begin());
   }
 
   bool didWork = fontDataToDelete.size();
 
   fontDataToDelete.clear();
 
   isPurging = false;
 
   return didWork;
 }
 
 }  // namespace blink