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

Side by Side Diff: Source/web/WebEmbeddedWorkerImpl.h

Issue 973103003: Revert of Rename WorkerPermissionClient and friends to WorkerContentSettingsClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/web/LocalFileSystemClient.cpp ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 class WorkerInspectorProxy; 47 class WorkerInspectorProxy;
48 class WorkerThread; 48 class WorkerThread;
49 49
50 class WebEmbeddedWorkerImpl final 50 class WebEmbeddedWorkerImpl final
51 : public WebEmbeddedWorker 51 : public WebEmbeddedWorker
52 , public WebFrameClient 52 , public WebFrameClient
53 , public WebDevToolsAgentClient 53 , public WebDevToolsAgentClient
54 , private WorkerLoaderProxyProvider { 54 , private WorkerLoaderProxyProvider {
55 WTF_MAKE_NONCOPYABLE(WebEmbeddedWorkerImpl); 55 WTF_MAKE_NONCOPYABLE(WebEmbeddedWorkerImpl);
56 public: 56 public:
57 WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient>, PassOwnPtr< WebWorkerContentSettingsClientProxy>); 57 WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient>, PassOwnPtr< WebWorkerPermissionClientProxy>);
58 virtual ~WebEmbeddedWorkerImpl(); 58 virtual ~WebEmbeddedWorkerImpl();
59 59
60 // Terminate all WebEmbeddedWorkerImpl for testing purposes. 60 // Terminate all WebEmbeddedWorkerImpl for testing purposes.
61 // Note that this only schedules termination and 61 // Note that this only schedules termination and
62 // does not synchronously wait for it to complete. 62 // does not synchronously wait for it to complete.
63 static void terminateAll(); 63 static void terminateAll();
64 64
65 // WebEmbeddedWorker overrides. 65 // WebEmbeddedWorker overrides.
66 virtual void startWorkerContext(const WebEmbeddedWorkerStartData&) override; 66 virtual void startWorkerContext(const WebEmbeddedWorkerStartData&) override;
67 virtual void resumeAfterDownload() override; 67 virtual void resumeAfterDownload() override;
(...skipping 27 matching lines...) Expand all
95 // WorkerLoaderProxyProvider 95 // WorkerLoaderProxyProvider
96 virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override; 96 virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
97 virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) o verride; 97 virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) o verride;
98 98
99 WebEmbeddedWorkerStartData m_workerStartData; 99 WebEmbeddedWorkerStartData m_workerStartData;
100 100
101 OwnPtr<WebServiceWorkerContextClient> m_workerContextClient; 101 OwnPtr<WebServiceWorkerContextClient> m_workerContextClient;
102 102
103 // This is kept until startWorkerContext is called, and then passed on 103 // This is kept until startWorkerContext is called, and then passed on
104 // to WorkerContext. 104 // to WorkerContext.
105 OwnPtr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient; 105 OwnPtr<WebWorkerPermissionClientProxy> m_permissionClient;
106 106
107 // We retain ownership of this one which is for use on the 107 // We retain ownership of this one which is for use on the
108 // main thread only. 108 // main thread only.
109 OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider; 109 OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider;
110 110
111 // Kept around only while main script loading is ongoing. 111 // Kept around only while main script loading is ongoing.
112 OwnPtr<Loader> m_mainScriptLoader; 112 OwnPtr<Loader> m_mainScriptLoader;
113 113
114 RefPtr<WorkerThread> m_workerThread; 114 RefPtr<WorkerThread> m_workerThread;
115 RefPtr<WorkerLoaderProxy> m_loaderProxy; 115 RefPtr<WorkerLoaderProxy> m_loaderProxy;
(...skipping 20 matching lines...) Expand all
136 DoPauseAfterDownload, 136 DoPauseAfterDownload,
137 IsPausedAfterDownload 137 IsPausedAfterDownload
138 } m_pauseAfterDownloadState; 138 } m_pauseAfterDownloadState;
139 139
140 WaitingForDebuggerState m_waitingForDebuggerState; 140 WaitingForDebuggerState m_waitingForDebuggerState;
141 }; 141 };
142 142
143 } // namespace blink 143 } // namespace blink
144 144
145 #endif // WebEmbeddedWorkerImpl_h 145 #endif // WebEmbeddedWorkerImpl_h
OLDNEW
« no previous file with comments | « Source/web/LocalFileSystemClient.cpp ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698