Unify Resource loading status tracking

third_party/WebKit/Source/core/frame/FrameSerializer.cpp

 /*
  * Copyright (C) 2011 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 394 matching lines @@
 {
     if (!image || !image->hasImage() || image->errorOccurred() || !shouldAddURL(url))
         return;
 
     RefPtr<SharedBuffer> data = image->getImage()->data();
     addToResources(image, data, url);
 }
 
 void FrameSerializer::addFontToResources(FontResource* font)
 {
-    if (!font || !font->isLoaded() || !font->resourceBuffer() || !shouldAddURL(font->url()))
+    if (!font || font->isLoading() || !font->resourceBuffer() || !shouldAddURL(font->url()))

[hiroshige, 2016/03/18 23:21:20]

What is the intention to this change?
I feel |!font->isLoaded()| looks good as-is.

[Nate Chapin, 2016/03/21 22:04:01]

This was a failed attempt at fixing some unit test failures, and isn't
necessary. Dropped.

         return;
 
     RefPtr<SharedBuffer> data(font->resourceBuffer());
 
     addToResources(font, data, font->url());
 }
 
 void FrameSerializer::retrieveResourcesForProperties(const StylePropertySet* styleDeclaration, Document& document)
 {
     if (!styleDeclaration)
@@ skipping 50 matching lines @@
             continue;
         }
         emitsMinus = ch == '-';
         builder.append(ch);
     }
     CString escapedUrl = builder.toString().ascii();
     return String::format("saved from url=(%04d)%s", static_cast<int>(escapedUrl.length()), escapedUrl.data());
 }
 
 } // namespace blink