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

Side by Side Diff: Source/bindings/v8/custom/V8WorkerGlobalScopeCustom.cpp

Issue 169303003: CSP 1.1: Revert CSSOM changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. 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
« no previous file with comments | « Source/bindings/v8/custom/V8WindowCustom.cpp ('k') | Source/core/css/CSSGroupingRule.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) 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 v8::Handle<v8::Value> function = info[0]; 58 v8::Handle<v8::Value> function = info[0];
59 59
60 WorkerScriptController* script = workerGlobalScope->script(); 60 WorkerScriptController* script = workerGlobalScope->script();
61 if (!script) 61 if (!script)
62 return; 62 return;
63 63
64 OwnPtr<ScheduledAction> action; 64 OwnPtr<ScheduledAction> action;
65 v8::Handle<v8::Context> v8Context = script->context(); 65 v8::Handle<v8::Context> v8Context = script->context();
66 if (function->IsString()) { 66 if (function->IsString()) {
67 if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPo licy()) { 67 if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPo licy()) {
68 if (!policy->allowScriptEval()) { 68 if (!policy->allowEval()) {
69 v8SetReturnValue(info, 0); 69 v8SetReturnValue(info, 0);
70 return; 70 return;
71 } 71 }
72 } 72 }
73 action = adoptPtr(new ScheduledAction(v8Context, toCoreString(function.A s<v8::String>()), workerGlobalScope->url(), info.GetIsolate())); 73 action = adoptPtr(new ScheduledAction(v8Context, toCoreString(function.A s<v8::String>()), workerGlobalScope->url(), info.GetIsolate()));
74 } else if (function->IsFunction()) { 74 } else if (function->IsFunction()) {
75 size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0; 75 size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0;
76 OwnPtr<v8::Local<v8::Value>[]> params; 76 OwnPtr<v8::Local<v8::Value>[]> params;
77 if (paramCount > 0) { 77 if (paramCount > 0) {
78 params = adoptArrayPtr(new v8::Local<v8::Value>[paramCount]); 78 params = adoptArrayPtr(new v8::Local<v8::Value>[paramCount]);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 WorkerScriptController* script = impl->script(); 114 WorkerScriptController* script = impl->script();
115 if (!script) 115 if (!script)
116 return v8::Null(isolate); 116 return v8::Null(isolate);
117 117
118 v8::Handle<v8::Object> global = script->context()->Global(); 118 v8::Handle<v8::Object> global = script->context()->Global();
119 ASSERT(!global.IsEmpty()); 119 ASSERT(!global.IsEmpty());
120 return global; 120 return global;
121 } 121 }
122 122
123 } // namespace WebCore 123 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8WindowCustom.cpp ('k') | Source/core/css/CSSGroupingRule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698