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

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

Issue 2423213002: Remove a bunch of pointless null checks in FrameLoaderClientImpl.
Patch Set: Fix formatting. Created 4 years, 2 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 RefPtr<WorkerScriptLoader> m_mainScriptLoader; 123 RefPtr<WorkerScriptLoader> m_mainScriptLoader;
124 124
125 Persistent<ParentFrameTaskRunners> m_mainThreadTaskRunners; 125 Persistent<ParentFrameTaskRunners> m_mainThreadTaskRunners;
126 126
127 std::unique_ptr<WorkerThread> m_workerThread; 127 std::unique_ptr<WorkerThread> m_workerThread;
128 RefPtr<WorkerLoaderProxy> m_loaderProxy; 128 RefPtr<WorkerLoaderProxy> m_loaderProxy;
129 Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy; 129 Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy;
130 Persistent<WorkerInspectorProxy> m_workerInspectorProxy; 130 Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
131 131
132 // 'shadow page' - created to proxy loading requests from the worker. 132 // 'shadow page' - created to proxy loading requests from the worker.
133 // Both WebView and WebFrame objects are close()'ed (where they're 133 // WebView is guarantee to be exist while this object exists, as close() is
134 // deref'ed) when this EmbeddedWorkerImpl is destructed, therefore they 134 // called in the destructor.
135 // are guaranteed to exist while this object is around.
136 WebView* m_webView; 135 WebView* m_webView;
137 Persistent<WebLocalFrameImpl> m_mainFrame; 136 Persistent<WebLocalFrameImpl> m_mainFrame;
138 137
139 bool m_loadingShadowPage; 138 bool m_loadingShadowPage;
140 bool m_askedToTerminate; 139 bool m_askedToTerminate;
141 140
142 enum WaitingForDebuggerState { WaitingForDebugger, NotWaitingForDebugger }; 141 enum WaitingForDebuggerState { WaitingForDebugger, NotWaitingForDebugger };
143 142
144 enum { 143 enum {
145 DontPauseAfterDownload, 144 DontPauseAfterDownload,
146 DoPauseAfterDownload, 145 DoPauseAfterDownload,
147 IsPausedAfterDownload 146 IsPausedAfterDownload
148 } m_pauseAfterDownloadState; 147 } m_pauseAfterDownloadState;
149 148
150 WaitingForDebuggerState m_waitingForDebuggerState; 149 WaitingForDebuggerState m_waitingForDebuggerState;
151 }; 150 };
152 151
153 } // namespace blink 152 } // namespace blink
154 153
155 #endif // WebEmbeddedWorkerImpl_h 154 #endif // WebEmbeddedWorkerImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698