Make ResourceLoadPriority calculation simpler

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

Index: third_party/WebKit/Source/core/fetch/FetchRequest.h
diff --git a/third_party/WebKit/Source/core/fetch/FetchRequest.h b/third_party/WebKit/Source/core/fetch/FetchRequest.h
index e6632cbadfab0f7e3451426ffe934436f2faf067..3d282f04dd352b333ab46778d995f2817a79fd1b 100644
--- a/third_party/WebKit/Source/core/fetch/FetchRequest.h
+++ b/third_party/WebKit/Source/core/fetch/FetchRequest.h
@@ -32,7 +32,6 @@
 #include "core/fetch/IntegrityMetadata.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "platform/CrossOriginAttributeValue.h"
-#include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceRequest.h"
 #include "wtf/Allocator.h"
 #include "wtf/text/AtomicString.h"
@@ -58,7 +57,7 @@ public:
         }
     };
 
-    explicit FetchRequest(const ResourceRequest&, const AtomicString& initiator, const String& charset = String(), ResourceLoadPriority = ResourceLoadPriorityUnresolved);
+    explicit FetchRequest(const ResourceRequest&, const AtomicString& initiator, const String& charset = String());

[kinuko, 2016/06/17 05:40:47]

nit: this probably no need to be explicit

[Nate Chapin, 2016/06/17 18:38:16]

Done.

     FetchRequest(const ResourceRequest&, const AtomicString& initiator, const ResourceLoaderOptions&);
     FetchRequest(const ResourceRequest&, const FetchInitiatorInfo&);
     ~FetchRequest();
@@ -71,10 +70,6 @@ public:
     void setCharset(const String& charset) { m_charset = charset; }
 
     const ResourceLoaderOptions& options() const { return m_options; }
-    void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
-
-    ResourceLoadPriority priority() const { return m_priority; }
-    void setPriority(ResourceLoadPriority priority) { m_priority = priority; }
 
     DeferOption defer() const { return m_defer; }
     void setDefer(DeferOption defer) { m_defer = defer; }
@@ -102,11 +97,12 @@ public:
     String contentSecurityPolicyNonce() const { return m_options.contentSecurityPolicyNonce; }
     void setContentSecurityPolicyNonce(const String& nonce) { m_options.contentSecurityPolicyNonce = nonce; }
 
+    void makeSynchronous();
+
 private:
     ResourceRequest m_resourceRequest;
     String m_charset;
     ResourceLoaderOptions m_options;
-    ResourceLoadPriority m_priority;
     bool m_forPreload;
     bool m_linkPreload;
     double m_preloadDiscoveryTime;