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

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

Issue 177073004: Oilpan: move core/workers to oilpan's heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 21 matching lines...) Expand all
32 #include "core/workers/AbstractWorker.h" 32 #include "core/workers/AbstractWorker.h"
33 33
34 #include "bindings/v8/ExceptionState.h" 34 #include "bindings/v8/ExceptionState.h"
35 #include "core/dom/ExceptionCode.h" 35 #include "core/dom/ExceptionCode.h"
36 #include "core/dom/ExecutionContext.h" 36 #include "core/dom/ExecutionContext.h"
37 #include "core/frame/ContentSecurityPolicy.h" 37 #include "core/frame/ContentSecurityPolicy.h"
38 #include "platform/weborigin/SecurityOrigin.h" 38 #include "platform/weborigin/SecurityOrigin.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 DEFINE_GC_INFO(AbstractWorker);
43
42 AbstractWorker::AbstractWorker(ExecutionContext* context) 44 AbstractWorker::AbstractWorker(ExecutionContext* context)
43 : ActiveDOMObject(context) 45 : ActiveDOMObject(context)
44 { 46 {
45 } 47 }
46 48
47 AbstractWorker::~AbstractWorker() 49 AbstractWorker::~AbstractWorker()
48 { 50 {
49 } 51 }
50 52
51 KURL AbstractWorker::resolveURL(const String& url, ExceptionState& exceptionStat e) 53 KURL AbstractWorker::resolveURL(const String& url, ExceptionState& exceptionStat e)
(...skipping 13 matching lines...) Expand all
65 67
66 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont entSecurityPolicy()->allowWorkerContextFromSource(scriptURL)) { 68 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont entSecurityPolicy()->allowWorkerContextFromSource(scriptURL)) {
67 exceptionState.throwSecurityError("Access to the script at '" + scriptUR L.elidedString() + "' is denied by the document's Content Security Policy."); 69 exceptionState.throwSecurityError("Access to the script at '" + scriptUR L.elidedString() + "' is denied by the document's Content Security Policy.");
68 return KURL(); 70 return KURL();
69 } 71 }
70 72
71 return scriptURL; 73 return scriptURL;
72 } 74 }
73 75
74 } // namespace WebCore 76 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698