[ServiceWorker] Make fetch() method better conformance with the spec.

Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

 /*
  * Copyright (C) 2013 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 18 matching lines @@
  */
 #ifndef ServiceWorkerGlobalScope_h
 #define ServiceWorkerGlobalScope_h
 
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Assertions.h"
 
 namespace WebCore {
 
+class Dictionary;
 class FetchManager;
 class Request;
 class ScriptPromise;
 class ScriptState;
 class ServiceWorkerThread;
 class ServiceWorkerClients;
 class WorkerThreadStartupData;
 
 class ServiceWorkerGlobalScope FINAL : public WorkerGlobalScope {
 public:
     static PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> create(ServiceWorkerThread*, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
 
     virtual ~ServiceWorkerGlobalScope();
     virtual bool isServiceWorkerGlobalScope() const OVERRIDE { return true; }
     virtual void stopFetch() OVERRIDE;
 
     // ServiceWorkerGlobalScope.idl
     PassRefPtrWillBeRawPtr<ServiceWorkerClients> clients();
     String scope(ExecutionContext*);
     ScriptPromise fetch(ScriptState*, Request*);
+    ScriptPromise fetch(ScriptState*, Request*, const Dictionary&);
     ScriptPromise fetch(ScriptState*, const String&);
+    ScriptPromise fetch(ScriptState*, const String&, const Dictionary&);
 
     // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(install);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(activate);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(fetch);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(sync);
 
     virtual void trace(Visitor*) OVERRIDE;
 
 private:
     ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorkerThread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
     virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE;
+    ScriptPromise fetch(ScriptState*, PassRefPtr<Request>);

[yhirano, 2014/07/16 13:12:27]

Can you rename this function to another name (e.g. fetchInternal)?
Having fetch(ScriptState*, Request*) and fetch(ScriptState*,
PassRefPtr<Request>) is very error-prone.

[horo, 2014/07/18 09:12:18]

It should be deleted.
I deleted it.

 
     RefPtrWillBeMember<ServiceWorkerClients> m_clients;
     OwnPtr<FetchManager> m_fetchManager;
 };
 
 } // namespace WebCore
 
 #endif // ServiceWorkerGlobalScope_h