ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/core/loader/resource/FontResource.h

 /*
  * Copyright (C) 2007, 2008 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 93 matching lines @@
   LoadLimitState m_loadLimitState;
   bool m_corsFailed;
   Timer<FontResource> m_fontLoadShortLimitTimer;
   Timer<FontResource> m_fontLoadLongLimitTimer;
 
   friend class MemoryCache;
   FRIEND_TEST_ALL_PREFIXES(FontResourceTest, CacheAwareFontLoading);
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Font);
+/* DO NOT SUBMIT - Conflict resolution helper:
+ * Above we should have Font, not kFont */
 
 class FontResourceClient : public ResourceClient {
  public:
   ~FontResourceClient() override {}
   static bool isExpectedType(ResourceClient* client) {
     return client->getResourceClientType() == FontType;
   }
   ResourceClientType getResourceClientType() const final { return FontType; }
 
   // If cache-aware loading is activated, both callbacks will be blocked until
   // disk cache miss. Calls to addClient() and removeClient() in both callbacks
   // are prohibited to prevent race issues regarding current loading state.
   virtual void fontLoadShortLimitExceeded(FontResource*) {}
   virtual void fontLoadLongLimitExceeded(FontResource*) {}
 
   // Returns true if loading priority of remote font resources can be lowered.
   virtual bool isLowPriorityLoadingAllowedForRemoteFont() const {
     // Only the RemoteFontFaceSources clients can prevent lowering of loading
     // priority of the remote fonts.  Set the default to true to prevent
     // other clients from incorrectly returning false.
     return true;
   }
 };
 
 }  // namespace blink
 
 #endif