Refactor the forPreload flag to mean speculative preload.

third_party/WebKit/Source/platform/loader/fetch/FetchRequest.h

 /*
  * Copyright (C) 2012 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:
  * 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 39 matching lines @@
     UseDefaultOriginRestrictionForType,
     RestrictToSameOrigin,
     NoOriginRestriction
   };
   enum PlaceholderImageRequestType {
     DisallowPlaceholder = 0,  // The requested image must not be a placeholder.
     AllowPlaceholder,         // The image is allowed to be a placeholder.
   };
   // TODO(toyoshim): Consider to define an enum for preload options, and use it
   // instead of bool in this class, FrameFetchContext, and so on. If it is
-  // reasonable, we try merging m_forPreload and m_linkPreload into one enum
+  // reasonable, we try merging m_speculativePreload and m_linkPreload into one
+  // enum
   // type. See https://crbug.com/675883.

[Charlie Harrison, 2017/02/05 18:39:11]

Move this to previous line.

[Yoav Weiss, 2017/02/06 09:58:35]

ok

 
   struct ResourceWidth {
     DISALLOW_NEW();
     float width;
     bool isSet;
 
     ResourceWidth() : width(0), isSet(false) {}
   };
 
   FetchRequest(const ResourceRequest&,
@@ skipping 17 matching lines @@
   DeferOption defer() const { return m_defer; }
   void setDefer(DeferOption defer) { m_defer = defer; }
 
   ResourceWidth getResourceWidth() const { return m_resourceWidth; }
   void setResourceWidth(ResourceWidth);
 
   ClientHintsPreferences& clientHintsPreferences() {
     return m_clientHintPreferences;
   }
 
-  bool forPreload() const { return m_forPreload; }
-  void setForPreload(bool forPreload, double discoveryTime = 0);
+  bool speculativePreload() const { return m_speculativePreload; }
+  void setSpeculativePreload(bool speculativePreload, double discoveryTime = 0);
 
   double preloadDiscoveryTime() { return m_preloadDiscoveryTime; }
 
-  bool isLinkPreload() { return m_linkPreload; }
+  bool isLinkPreload() const { return m_linkPreload; }
   void setLinkPreload(bool isLinkPreload) { m_linkPreload = isLinkPreload; }
 
   void setContentSecurityCheck(
       ContentSecurityPolicyDisposition contentSecurityPolicyOption) {
     m_options.contentSecurityPolicyOption = contentSecurityPolicyOption;
   }
   void setCrossOriginAccessControl(SecurityOrigin*, CrossOriginAttributeValue);
   OriginRestriction getOriginRestriction() const { return m_originRestriction; }
   void setOriginRestriction(OriginRestriction restriction) {
     m_originRestriction = restriction;
@@ skipping 30 matching lines @@
   // Configures the request to load an image placeholder if the request is
   // eligible (e.g. the url's protocol is HTTP, etc.). If this request is
   // non-eligible, this method doesn't modify the ResourceRequest. Calling this
   // method sets m_placeholderImageRequestType to the appropriate value.
   void setAllowImagePlaceholder();
 
  private:
   ResourceRequest m_resourceRequest;
   String m_charset;
   ResourceLoaderOptions m_options;
-  bool m_forPreload;
+  bool m_speculativePreload;
   bool m_linkPreload;
   double m_preloadDiscoveryTime;
   DeferOption m_defer;
   OriginRestriction m_originRestriction;
   ResourceWidth m_resourceWidth;
   ClientHintsPreferences m_clientHintPreferences;
   PlaceholderImageRequestType m_placeholderImageRequestType;
 };
 
 }  // namespace blink
 
 #endif