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

Side by Side Diff: third_party/WebKit/Source/core/workers/WorkerGlobalScope.h

Issue 2124693002: Worker: Fix broken GC logic on Dedicated Worker while DOMTimer is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: annotate WorkerGlobalScope interface with 'ActiveScriptWrappable' and make tests stricter Created 4 years, 4 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) 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 * 24 *
25 */ 25 */
26 26
27 #ifndef WorkerGlobalScope_h 27 #ifndef WorkerGlobalScope_h
28 #define WorkerGlobalScope_h 28 #define WorkerGlobalScope_h
29 29
30 #include "bindings/core/v8/ActiveScriptWrappable.h"
30 #include "bindings/core/v8/V8CacheOptions.h" 31 #include "bindings/core/v8/V8CacheOptions.h"
31 #include "bindings/core/v8/WorkerOrWorkletScriptController.h" 32 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
32 #include "core/CoreExport.h" 33 #include "core/CoreExport.h"
33 #include "core/dom/ExecutionContext.h" 34 #include "core/dom/ExecutionContext.h"
34 #include "core/events/EventListener.h" 35 #include "core/events/EventListener.h"
35 #include "core/events/EventTarget.h" 36 #include "core/events/EventTarget.h"
36 #include "core/fetch/CachedMetadataHandler.h" 37 #include "core/fetch/CachedMetadataHandler.h"
37 #include "core/frame/DOMTimerCoordinator.h" 38 #include "core/frame/DOMTimerCoordinator.h"
38 #include "core/frame/DOMWindowBase64.h" 39 #include "core/frame/DOMWindowBase64.h"
39 #include "core/frame/UseCounter.h" 40 #include "core/frame/UseCounter.h"
40 #include "core/frame/csp/ContentSecurityPolicy.h" 41 #include "core/frame/csp/ContentSecurityPolicy.h"
41 #include "core/workers/WorkerEventQueue.h" 42 #include "core/workers/WorkerEventQueue.h"
42 #include "core/workers/WorkerOrWorkletGlobalScope.h" 43 #include "core/workers/WorkerOrWorkletGlobalScope.h"
43 #include "core/workers/WorkerSettings.h" 44 #include "core/workers/WorkerSettings.h"
44 #include "platform/heap/Handle.h" 45 #include "platform/heap/Handle.h"
45 #include "wtf/ListHashSet.h" 46 #include "wtf/ListHashSet.h"
46 #include <memory> 47 #include <memory>
47 48
48 namespace blink { 49 namespace blink {
49 50
50 class ConsoleMessage; 51 class ConsoleMessage;
51 class ConsoleMessageStorage; 52 class ConsoleMessageStorage;
52 class ExceptionState; 53 class ExceptionState;
53 class V8AbstractEventListener; 54 class V8AbstractEventListener;
54 class WorkerClients; 55 class WorkerClients;
55 class WorkerLocation; 56 class WorkerLocation;
56 class WorkerNavigator; 57 class WorkerNavigator;
57 class WorkerThread; 58 class WorkerThread;
58 59
59 class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public S ecurityContext, public WorkerOrWorkletGlobalScope, public Supplementable<WorkerG lobalScope>, public DOMWindowBase64 { 60 class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public A ctiveScriptWrappable, public SecurityContext, public WorkerOrWorkletGlobalScope, public Supplementable<WorkerGlobalScope>, public DOMWindowBase64 {
60 DEFINE_WRAPPERTYPEINFO(); 61 DEFINE_WRAPPERTYPEINFO();
61 USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope); 62 USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
62 public: 63 public:
63 using SecurityContext::getSecurityOrigin; 64 using SecurityContext::getSecurityOrigin;
64 using SecurityContext::contentSecurityPolicy; 65 using SecurityContext::contentSecurityPolicy;
65 66
66 ~WorkerGlobalScope() override; 67 ~WorkerGlobalScope() override;
67 68
68 virtual void scriptLoaded(size_t scriptSize, size_t cachedMetadataSize) {} 69 virtual void scriptLoaded(size_t scriptSize, size_t cachedMetadataSize) {}
69 virtual void didEvaluateWorkerScript() {} 70 virtual void didEvaluateWorkerScript() {}
(...skipping 20 matching lines...) Expand all
90 DEFINE_ATTRIBUTE_EVENT_LISTENER(rejectionhandled); 91 DEFINE_ATTRIBUTE_EVENT_LISTENER(rejectionhandled);
91 DEFINE_ATTRIBUTE_EVENT_LISTENER(unhandledrejection); 92 DEFINE_ATTRIBUTE_EVENT_LISTENER(unhandledrejection);
92 93
93 // WorkerUtils 94 // WorkerUtils
94 virtual void importScripts(const Vector<String>& urls, ExceptionState&); 95 virtual void importScripts(const Vector<String>& urls, ExceptionState&);
95 96
96 // ScriptWrappable 97 // ScriptWrappable
97 v8::Local<v8::Object> wrap(v8::Isolate*, v8::Local<v8::Object> creationConte xt) final; 98 v8::Local<v8::Object> wrap(v8::Isolate*, v8::Local<v8::Object> creationConte xt) final;
98 v8::Local<v8::Object> associateWithWrapper(v8::Isolate*, const WrapperTypeIn fo*, v8::Local<v8::Object> wrapper) final; 99 v8::Local<v8::Object> associateWithWrapper(v8::Isolate*, const WrapperTypeIn fo*, v8::Local<v8::Object> wrapper) final;
99 100
101 // ActiveScriptWrappable
102 bool hasPendingActivity() const override;
103
100 // ExecutionContext 104 // ExecutionContext
101 bool isWorkerGlobalScope() const final { return true; } 105 bool isWorkerGlobalScope() const final { return true; }
102 bool isJSExecutionForbidden() const final; 106 bool isJSExecutionForbidden() const final;
103 bool isContextThread() const final; 107 bool isContextThread() const final;
104 void disableEval(const String& errorMessage) final; 108 void disableEval(const String& errorMessage) final;
105 String userAgent() const final { return m_userAgent; } 109 String userAgent() const final { return m_userAgent; }
106 void postTask(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask> , const String& taskNameForInstrumentation) final; 110 void postTask(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask> , const String& taskNameForInstrumentation) final;
107 DOMTimerCoordinator* timers() final { return &m_timers; } 111 DOMTimerCoordinator* timers() final { return &m_timers; }
108 SecurityContext& securityContext() final { return *this; } 112 SecurityContext& securityContext() final { return *this; }
109 void addConsoleMessage(ConsoleMessage*) final; 113 void addConsoleMessage(ConsoleMessage*) final;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 182
179 HeapHashMap<int, Member<ErrorEvent>> m_pendingErrorEvents; 183 HeapHashMap<int, Member<ErrorEvent>> m_pendingErrorEvents;
180 int m_lastPendingErrorEventId; 184 int m_lastPendingErrorEventId;
181 }; 185 };
182 186
183 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope()); 187 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope());
184 188
185 } // namespace blink 189 } // namespace blink
186 190
187 #endif // WorkerGlobalScope_h 191 #endif // WorkerGlobalScope_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698