OLD | NEW |
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 25 matching lines...) Expand all Loading... |
36 #include "core/workers/WorkerThread.h" | 36 #include "core/workers/WorkerThread.h" |
37 #include "platform/network/ContentSecurityPolicyParsers.h" | 37 #include "platform/network/ContentSecurityPolicyParsers.h" |
38 #include "platform/weborigin/KURL.h" | 38 #include "platform/weborigin/KURL.h" |
39 #include "wtf/Forward.h" | 39 #include "wtf/Forward.h" |
40 #include "wtf/Noncopyable.h" | 40 #include "wtf/Noncopyable.h" |
41 | 41 |
42 namespace WebCore { | 42 namespace WebCore { |
43 | 43 |
44 class WorkerClients; | 44 class WorkerClients; |
45 | 45 |
46 struct WorkerThreadStartupData { | 46 class WorkerThreadStartupData : public NoBaseWillBeGarbageCollectedFinalized<Wor
kerThreadStartupData> { |
47 WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData); WTF_MAKE_FAST_ALLOCATED; | 47 WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData); |
| 48 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
48 public: | 49 public: |
49 static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, con
st String& userAgent, const String& sourceCode, WorkerThreadStartMode startMode,
const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSec
urityPolicyType, PassOwnPtr<WorkerClients> workerClients) | 50 static PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> create(const KURL& sc
riptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMod
e startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderTyp
e contentSecurityPolicyType, PassOwnPtr<WorkerClients> workerClients) |
50 { | 51 { |
51 return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, source
Code, startMode, contentSecurityPolicy, contentSecurityPolicyType, workerClients
)); | 52 return adoptPtrWillBeNoop(new WorkerThreadStartupData(scriptURL, userAge
nt, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, wor
kerClients)); |
52 } | 53 } |
53 | 54 |
54 ~WorkerThreadStartupData(); | 55 ~WorkerThreadStartupData(); |
55 | 56 |
56 KURL m_scriptURL; | 57 KURL m_scriptURL; |
57 String m_userAgent; | 58 String m_userAgent; |
58 String m_sourceCode; | 59 String m_sourceCode; |
59 WorkerThreadStartMode m_startMode; | 60 WorkerThreadStartMode m_startMode; |
60 String m_contentSecurityPolicy; | 61 String m_contentSecurityPolicy; |
61 ContentSecurityPolicyHeaderType m_contentSecurityPolicyType; | 62 ContentSecurityPolicyHeaderType m_contentSecurityPolicyType; |
62 OwnPtr<WorkerClients> m_workerClients; | 63 OwnPtr<WorkerClients> m_workerClients; |
63 | 64 |
| 65 void trace(Visitor*) { } |
| 66 |
64 private: | 67 private: |
65 WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, cons
t String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy
, ContentSecurityPolicyHeaderType contentSecurityPolicyType, PassOwnPtr<WorkerCl
ients>); | 68 WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, cons
t String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy
, ContentSecurityPolicyHeaderType contentSecurityPolicyType, PassOwnPtr<WorkerCl
ients>); |
66 }; | 69 }; |
67 | 70 |
68 } // namespace WebCore | 71 } // namespace WebCore |
69 | 72 |
70 #endif // WorkerThreadStartupData_h | 73 #endif // WorkerThreadStartupData_h |
OLD | NEW |