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

Side by Side Diff: Source/core/dom/ScriptLoader.cpp

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 6 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 bool shouldBypassMainWorldCSP = (frame && frame->script().shouldBypassMainWo rldCSP()) 307 bool shouldBypassMainWorldCSP = (frame && frame->script().shouldBypassMainWo rldCSP())
308 || csp->allowScriptWithNonce(m_element->fastGetAttribute(HTMLNames::nonc eAttr)) 308 || csp->allowScriptWithNonce(m_element->fastGetAttribute(HTMLNames::nonc eAttr))
309 || csp->allowScriptWithHash(sourceCode.source()); 309 || csp->allowScriptWithHash(sourceCode.source());
310 310
311 if (!m_isExternalScript && (!shouldBypassMainWorldCSP && !csp->allowInlineSc ript(elementDocument->url(), m_startLineNumber))) 311 if (!m_isExternalScript && (!shouldBypassMainWorldCSP && !csp->allowInlineSc ript(elementDocument->url(), m_startLineNumber)))
312 return; 312 return;
313 313
314 if (m_isExternalScript) { 314 if (m_isExternalScript) {
315 ScriptResource* resource = m_resource ? m_resource.get() : sourceCode.re source(); 315 ScriptResource* resource = m_resource ? m_resource.get() : sourceCode.re source();
316 if (resource && !resource->mimeTypeAllowedByNosniff()) { 316 if (resource && !resource->mimeTypeAllowedByNosniff()) {
317 contextDocument->addConsoleMessage(SecurityMessageSource, ErrorMessa geLevel, "Refused to execute script from '" + resource->url().elidedString() + " ' because its MIME type ('" + resource->mimeType() + "') is not executable, and strict MIME type checking is enabled."); 317 contextDocument->addConsoleMessage(ConsoleMessage::create(SecurityMe ssageSource, ErrorMessageLevel, "Refused to execute script from '" + resource->u rl().elidedString() + "' because its MIME type ('" + resource->mimeType() + "') is not executable, and strict MIME type checking is enabled."));
318 return; 318 return;
319 } 319 }
320 } 320 }
321 321
322 // FIXME: Can this be moved earlier in the function? 322 // FIXME: Can this be moved earlier in the function?
323 // Why are we ever attempting to execute scripts without a frame? 323 // Why are we ever attempting to execute scripts without a frame?
324 if (!frame) 324 if (!frame)
325 return; 325 return;
326 326
327 const bool isImportedScript = contextDocument != elementDocument; 327 const bool isImportedScript = contextDocument != elementDocument;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 if (isHTMLScriptLoader(element)) 441 if (isHTMLScriptLoader(element))
442 return toHTMLScriptElement(element)->loader(); 442 return toHTMLScriptElement(element)->loader();
443 443
444 if (isSVGScriptLoader(element)) 444 if (isSVGScriptLoader(element))
445 return toSVGScriptElement(element)->loader(); 445 return toSVGScriptElement(element)->loader();
446 446
447 return 0; 447 return 0;
448 } 448 }
449 449
450 } 450 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698