Make ResourceLoadPriority calculation simpler

third_party/WebKit/Source/core/fetch/FetchRequest.cpp

 /*
  * 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 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/fetch/FetchRequest.h"
 
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "core/fetch/ResourceFetcher.h"
 
 namespace blink {
 
-FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicString& initiator, const String& charset, ResourceLoadPriority priority)
+FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicString& initiator, const String& charset)
     : m_resourceRequest(resourceRequest)
     , m_charset(charset)
     , m_options(ResourceFetcher::defaultResourceOptions())
-    , m_priority(priority)
     , m_forPreload(false)
     , m_linkPreload(false)
     , m_preloadDiscoveryTime(0.0)
     , m_defer(NoDefer)
     , m_originRestriction(UseDefaultOriginRestrictionForType)
 {
     m_options.initiatorInfo.name = initiator;
 }
 
 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicString& initiator, const ResourceLoaderOptions& options)
     : m_resourceRequest(resourceRequest)
     , m_options(options)
-    , m_priority(ResourceLoadPriorityUnresolved)
     , m_forPreload(false)
     , m_linkPreload(false)
     , m_preloadDiscoveryTime(0.0)
     , m_defer(NoDefer)
     , m_originRestriction(UseDefaultOriginRestrictionForType)
 {
     m_options.initiatorInfo.name = initiator;
 }
 
 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const FetchInitiatorInfo& initiator)
     : m_resourceRequest(resourceRequest)
     , m_options(ResourceFetcher::defaultResourceOptions())
-    , m_priority(ResourceLoadPriorityUnresolved)
     , m_forPreload(false)
     , m_linkPreload(false)
     , m_preloadDiscoveryTime(0.0)
     , m_defer(NoDefer)
     , m_originRestriction(UseDefaultOriginRestrictionForType)
 {
     m_options.initiatorInfo = initiator;
 }
 
 FetchRequest::~FetchRequest()
@@ skipping 26 matching lines @@
         m_resourceWidth.isSet = true;
     }
 }
 
 void FetchRequest::setForPreload(bool forPreload, double discoveryTime)
 {
     m_forPreload = forPreload;
     m_preloadDiscoveryTime = discoveryTime;
 }
 
+void FetchRequest::makeSynchronous()
+{
+    // Synchronous requests should always be max priority, lest they hang the renderer.
+    m_resourceRequest.setPriority(ResourceLoadPriorityHighest);
+    m_resourceRequest.setTimeoutInterval(10);
+    m_options.synchronousPolicy = RequestSynchronously;
+}
+
 } // namespace blink