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

Side by Side Diff: Source/WebKit/chromium/src/WebKit.cpp

Issue 17648006: Rename WorkerContext to WorkerGlobalScope (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 28 matching lines...) Expand all
39 #include "bindings/v8/V8RecursionScope.h" 39 #include "bindings/v8/V8RecursionScope.h"
40 #include "core/Init.h" 40 #include "core/Init.h"
41 #include "core/dom/Microtask.h" 41 #include "core/dom/Microtask.h"
42 #include "core/page/Frame.h" 42 #include "core/page/Frame.h"
43 #include "core/page/Page.h" 43 #include "core/page/Page.h"
44 #include "core/page/Settings.h" 44 #include "core/page/Settings.h"
45 #include "core/platform/LayoutTestSupport.h" 45 #include "core/platform/LayoutTestSupport.h"
46 #include "core/platform/Logging.h" 46 #include "core/platform/Logging.h"
47 #include "core/platform/graphics/MediaPlayer.h" 47 #include "core/platform/graphics/MediaPlayer.h"
48 #include "core/platform/graphics/chromium/ImageDecodingStore.h" 48 #include "core/platform/graphics/chromium/ImageDecodingStore.h"
49 #include "core/workers/WorkerContextProxy.h" 49 #include "core/workers/WorkerGlobalScopeProxy.h"
50 #include "wtf/Assertions.h" 50 #include "wtf/Assertions.h"
51 #include "wtf/CryptographicallyRandomNumber.h" 51 #include "wtf/CryptographicallyRandomNumber.h"
52 #include "wtf/CurrentTime.h" 52 #include "wtf/CurrentTime.h"
53 #include "wtf/MainThread.h" 53 #include "wtf/MainThread.h"
54 #include "wtf/Threading.h" 54 #include "wtf/Threading.h"
55 #include "wtf/UnusedParam.h" 55 #include "wtf/UnusedParam.h"
56 #include "wtf/text/AtomicString.h" 56 #include "wtf/text/AtomicString.h"
57 #include "wtf/text/TextEncoding.h" 57 #include "wtf/text/TextEncoding.h"
58 #include "public/platform/Platform.h" 58 #include "public/platform/Platform.h"
59 #include "public/platform/WebPrerenderingSupport.h" 59 #include "public/platform/WebPrerenderingSupport.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // they're set up. This is a problem because their set up routines assert 156 // they're set up. This is a problem because their set up routines assert
157 // they're running on the main WebKitThread. It might be possible to make 157 // they're running on the main WebKitThread. It might be possible to make
158 // the initialization thread-safe, but given that so many code paths use 158 // the initialization thread-safe, but given that so many code paths use
159 // this, initializing this lazily probably doesn't buy us much. 159 // this, initializing this lazily probably doesn't buy us much.
160 WTF::UTF8Encoding(); 160 WTF::UTF8Encoding();
161 161
162 WebCore::setIDBFactoryBackendInterfaceCreateFunction(WebKit::IDBFactoryBacke ndProxy::create); 162 WebCore::setIDBFactoryBackendInterfaceCreateFunction(WebKit::IDBFactoryBacke ndProxy::create);
163 163
164 WebCore::MediaPlayer::setMediaEngineCreateFunction(WebKit::WebMediaPlayerCli entImpl::create); 164 WebCore::MediaPlayer::setMediaEngineCreateFunction(WebKit::WebMediaPlayerCli entImpl::create);
165 165
166 WebCore::WorkerContextProxy::setCreateDelegate(WebWorkerClientImpl::createWo rkerContextProxy); 166 WebCore::WorkerGlobalScopeProxy::setCreateDelegate(WebWorkerClientImpl::crea teWorkerGlobalScopeProxy);
167 } 167 }
168 168
169 169
170 void shutdown() 170 void shutdown()
171 { 171 {
172 // WebKit might have been initialized without V8, so be careful not to invok e 172 // WebKit might have been initialized without V8, so be careful not to invok e
173 // V8 specific functions, if V8 was not properly initialized. 173 // V8 specific functions, if V8 was not properly initialized.
174 if (s_endOfTaskRunner) { 174 if (s_endOfTaskRunner) {
175 #ifndef NDEBUG 175 #ifndef NDEBUG
176 v8::V8::RemoveCallCompletedCallback(&assertV8RecursionScope); 176 v8::V8::RemoveCallCompletedCallback(&assertV8RecursionScope);
(...skipping 29 matching lines...) Expand all
206 UNUSED_PARAM(name); 206 UNUSED_PARAM(name);
207 #endif // !LOG_DISABLED 207 #endif // !LOG_DISABLED
208 } 208 }
209 209
210 void resetPluginCache(bool reloadPages) 210 void resetPluginCache(bool reloadPages)
211 { 211 {
212 WebCore::Page::refreshPlugins(reloadPages); 212 WebCore::Page::refreshPlugins(reloadPages);
213 } 213 }
214 214
215 } // namespace WebKit 215 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp ('k') | Source/WebKit/chromium/src/WebSharedWorkerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698