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

Side by Side Diff: Source/core/workers/WorkerGlobalScope.cpp

Issue 1228833004: Oilpan: Move CachedMetadataHandler to Oilpan heap on Oilpan-enabled world. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move #if directives. Created 5 years, 5 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/core/workers/WorkerGlobalScope.h ('k') | Source/core/workers/WorkerThread.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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved. 3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 if (scriptLoader.failed()) { 249 if (scriptLoader.failed()) {
250 exceptionState.throwDOMException(NetworkError, "The script at '" + c ompleteURL.elidedString() + "' failed to load."); 250 exceptionState.throwDOMException(NetworkError, "The script at '" + c ompleteURL.elidedString() + "' failed to load.");
251 return; 251 return;
252 } 252 }
253 253
254 InspectorInstrumentation::scriptImported(&executionContext, scriptLoader .identifier(), scriptLoader.script()); 254 InspectorInstrumentation::scriptImported(&executionContext, scriptLoader .identifier(), scriptLoader.script());
255 scriptLoaded(scriptLoader.script().length(), scriptLoader.cachedMetadata () ? scriptLoader.cachedMetadata()->size() : 0); 255 scriptLoaded(scriptLoader.script().length(), scriptLoader.cachedMetadata () ? scriptLoader.cachedMetadata()->size() : 0);
256 256
257 RefPtrWillBeRawPtr<ErrorEvent> errorEvent = nullptr; 257 RefPtrWillBeRawPtr<ErrorEvent> errorEvent = nullptr;
258 OwnPtr<Vector<char>> cachedMetaData(scriptLoader.releaseCachedMetadata() ); 258 OwnPtr<Vector<char>> cachedMetaData(scriptLoader.releaseCachedMetadata() );
259 OwnPtr<CachedMetadataHandler> handler(createWorkerScriptCachedMetadataHa ndler(completeURL, cachedMetaData.get())); 259 OwnPtrWillBeRawPtr<CachedMetadataHandler> handler(createWorkerScriptCach edMetadataHandler(completeURL, cachedMetaData.get()));
260 m_script->evaluate(ScriptSourceCode(scriptLoader.script(), scriptLoader. responseURL()), &errorEvent, handler.get(), m_v8CacheOptions); 260 m_script->evaluate(ScriptSourceCode(scriptLoader.script(), scriptLoader. responseURL()), &errorEvent, handler.get(), m_v8CacheOptions);
261 if (errorEvent) { 261 if (errorEvent) {
262 m_script->rethrowExceptionFromImportedScript(errorEvent.release(), e xceptionState); 262 m_script->rethrowExceptionFromImportedScript(errorEvent.release(), e xceptionState);
263 return; 263 return;
264 } 264 }
265 } 265 }
266 } 266 }
267 267
268 EventTarget* WorkerGlobalScope::errorEventTarget() 268 EventTarget* WorkerGlobalScope::errorEventTarget()
269 { 269 {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 visitor->trace(m_timers); 396 visitor->trace(m_timers);
397 visitor->trace(m_messageStorage); 397 visitor->trace(m_messageStorage);
398 visitor->trace(m_pendingMessages); 398 visitor->trace(m_pendingMessages);
399 HeapSupplementable<WorkerGlobalScope>::trace(visitor); 399 HeapSupplementable<WorkerGlobalScope>::trace(visitor);
400 #endif 400 #endif
401 ExecutionContext::trace(visitor); 401 ExecutionContext::trace(visitor);
402 EventTargetWithInlineData::trace(visitor); 402 EventTargetWithInlineData::trace(visitor);
403 } 403 }
404 404
405 } // namespace blink 405 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.h ('k') | Source/core/workers/WorkerThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698