Refactor ThreadableLoaderOptions for readability

Source/core/loader/ThreadableLoader.h

 /*
  * Copyright (C) 2009 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 44 matching lines @@
         ConsiderPreflight,
         ForcePreflight,
         PreventPreflight
     };
 
     enum ContentSecurityPolicyEnforcement {
         EnforceConnectSrcDirective,
         DoNotEnforceContentSecurityPolicy,
     };
 
-    struct ThreadableLoaderOptions : public ResourceLoaderOptions {
+    struct ThreadableLoaderOptions {
         ThreadableLoaderOptions()
             : preflightPolicy(ConsiderPreflight)
             , crossOriginRequestPolicy(DenyCrossOriginRequests)
             , contentSecurityPolicyEnforcement(EnforceConnectSrcDirective)
             , timeoutMilliseconds(0) { }
 
         PreflightPolicy preflightPolicy; // If AccessControl is used, how to determine if a preflight is needed.
         CrossOriginRequestPolicy crossOriginRequestPolicy;
         AtomicString initiator;
         ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement;
         unsigned long timeoutMilliseconds;
     };
 
     // Useful for doing loader operations from any thread (not threadsafe,
     // just able to run on threads other than the main thread).
     class ThreadableLoader : public RefCounted<ThreadableLoader> {
         WTF_MAKE_NONCOPYABLE(ThreadableLoader);
     public:
-        static void loadResourceSynchronously(ExecutionContext&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
-        static PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&);
+        // ThreadableLoaderOptions argument configures this ThreadableLoader's
+        // behavior.
+        //
+        // ResourceLoaderOptions argument will be passed to the FetchRequest
+        // that this ThreadableLoader creates. It can be altered e.g. when
+        // redirect happens.
+        static void loadResourceSynchronously(ExecutionContext&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+        static PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
 
         virtual void cancel() = 0;
 
         virtual ~ThreadableLoader() { }
 
     protected:
         ThreadableLoader() { }
     };
 
 } // namespace WebCore
 
 #endif // ThreadableLoader_h