Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: Source/modules/serviceworkers/ServiceWorkerGlobalScope.h

Issue 399543002: [ServiceWorker] Make fetch() method better conformance with the spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated falken's comment Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 32
33 #include "core/workers/WorkerGlobalScope.h" 33 #include "core/workers/WorkerGlobalScope.h"
34 #include "platform/heap/Handle.h" 34 #include "platform/heap/Handle.h"
35 #include "wtf/Assertions.h" 35 #include "wtf/Assertions.h"
36 #include "wtf/PassRefPtr.h" 36 #include "wtf/PassRefPtr.h"
37 #include "wtf/RefCounted.h" 37 #include "wtf/RefCounted.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class CacheStorage; 41 class CacheStorage;
42 class Dictionary;
42 class FetchManager; 43 class FetchManager;
43 class Request; 44 class Request;
44 class ScriptPromise; 45 class ScriptPromise;
45 class ScriptState; 46 class ScriptState;
46 class ServiceWorkerThread; 47 class ServiceWorkerThread;
47 class ServiceWorkerClients; 48 class ServiceWorkerClients;
48 class WorkerThreadStartupData; 49 class WorkerThreadStartupData;
49 50
50 class ServiceWorkerGlobalScope FINAL : public WorkerGlobalScope { 51 class ServiceWorkerGlobalScope FINAL : public WorkerGlobalScope {
51 public: 52 public:
52 static PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> create(ServiceWorker Thread*, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>); 53 static PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> create(ServiceWorker Thread*, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
53 54
54 virtual ~ServiceWorkerGlobalScope(); 55 virtual ~ServiceWorkerGlobalScope();
55 virtual bool isServiceWorkerGlobalScope() const OVERRIDE { return true; } 56 virtual bool isServiceWorkerGlobalScope() const OVERRIDE { return true; }
56 virtual void stopFetch() OVERRIDE; 57 virtual void stopFetch() OVERRIDE;
57 58
58 // ServiceWorkerGlobalScope.idl 59 // ServiceWorkerGlobalScope.idl
59 PassRefPtrWillBeRawPtr<ServiceWorkerClients> clients(); 60 PassRefPtrWillBeRawPtr<ServiceWorkerClients> clients();
60 String scope(ExecutionContext*); 61 String scope(ExecutionContext*);
61 62
62 PassRefPtrWillBeRawPtr<CacheStorage> caches(ExecutionContext*); 63 PassRefPtrWillBeRawPtr<CacheStorage> caches(ExecutionContext*);
63 64
64 ScriptPromise fetch(ScriptState*, Request*); 65 ScriptPromise fetch(ScriptState*, Request*);
66 ScriptPromise fetch(ScriptState*, Request*, const Dictionary&);
65 ScriptPromise fetch(ScriptState*, const String&); 67 ScriptPromise fetch(ScriptState*, const String&);
68 ScriptPromise fetch(ScriptState*, const String&, const Dictionary&);
66 69
67 // EventTarget 70 // EventTarget
68 virtual const AtomicString& interfaceName() const OVERRIDE; 71 virtual const AtomicString& interfaceName() const OVERRIDE;
69 72
70 DEFINE_ATTRIBUTE_EVENT_LISTENER(install); 73 DEFINE_ATTRIBUTE_EVENT_LISTENER(install);
71 DEFINE_ATTRIBUTE_EVENT_LISTENER(activate); 74 DEFINE_ATTRIBUTE_EVENT_LISTENER(activate);
72 DEFINE_ATTRIBUTE_EVENT_LISTENER(fetch); 75 DEFINE_ATTRIBUTE_EVENT_LISTENER(fetch);
73 DEFINE_ATTRIBUTE_EVENT_LISTENER(message); 76 DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
74 DEFINE_ATTRIBUTE_EVENT_LISTENER(sync); 77 DEFINE_ATTRIBUTE_EVENT_LISTENER(sync);
75 78
76 virtual void trace(Visitor*) OVERRIDE; 79 virtual void trace(Visitor*) OVERRIDE;
77 80
78 private: 81 private:
79 ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorker Thread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>); 82 ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorker Thread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
80 virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallS tack>) OVERRIDE; 83 virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallS tack>) OVERRIDE;
81 84
82 RefPtrWillBeMember<ServiceWorkerClients> m_clients; 85 RefPtrWillBeMember<ServiceWorkerClients> m_clients;
83 OwnPtr<FetchManager> m_fetchManager; 86 OwnPtr<FetchManager> m_fetchManager;
84 RefPtrWillBeMember<CacheStorage> m_cacheStorage; 87 RefPtrWillBeMember<CacheStorage> m_cacheStorage;
85 }; 88 };
86 89
87 } // namespace blink 90 } // namespace blink
88 91
89 #endif // ServiceWorkerGlobalScope_h 92 #endif // ServiceWorkerGlobalScope_h
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/Response.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698