Follow up patch for document.currentScript

Source/core/dom/ScriptElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 259 matching lines @@
     if (m_cachedScript) {
         return true;
     }
 
     dispatchErrorEvent();
     return false;
 }
 
 bool isHTMLScriptElement(Element* element)
 {
-    return element->isHTMLElement() && element->hasTagName(HTMLNames::scriptTag);
+    return element->hasTagName(HTMLNames::scriptTag);
+}
+
+bool isSVGScriptElement(Element* element)
+{
+    return element->hasTagName(SVGNames::scriptTag);
+}
+
+HTMLScriptElement* toHTMLScriptElement(Element* element)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(element->hasTagName(HTMLNames::scriptTag));
+    return static_cast<HTMLScriptElement*>(element);
+}

[abarth-chromium, 2013/06/11 18:18:23]

We usually put these functions in the header that defines the return type.  That
way they can be called by other code easily.  Take a look at toHTMLInputElement
in HTMLInputElement.h

[arv (Not doing code reviews), 2013/06/11 18:44:01]

Thanks. I moved these to {HTML,SVG}ScriptElement.h

+
+SVGScriptElement* toSVGScriptElement(Element* element)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(element->hasTagName(SVGNames::scriptTag));
+    return static_cast<SVGScriptElement*>(element);
 }
 
 void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
 {
     ASSERT(m_alreadyStarted);
 
     if (sourceCode.isEmpty())
         return;
 
     RefPtr<Document> document = m_element->document();
     Frame* frame = document->frame();
 
     bool shouldBypassMainWorldContentSecurityPolicy = (frame && frame->script()->shouldBypassMainWorldContentSecurityPolicy()) || document->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr));
 
     if (!m_isExternalScript && (!shouldBypassMainWorldContentSecurityPolicy && !document->contentSecurityPolicy()->allowInlineScript(document->url(), m_startLineNumber)))
         return;
 
     if (m_isExternalScript && m_cachedScript && !m_cachedScript->mimeTypeAllowedByNosniff()) {
         document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Refused to execute script from '" + m_cachedScript->url().elidedString() + "' because its MIME type ('" + m_cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled.");
         return;
     }
 
     if (frame) {
         {
             IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_isExternalScript ? document.get() : 0);
 
             if (isHTMLScriptElement(m_element))
-                document->pushCurrentScript(static_cast<HTMLScriptElement*>(m_element));
+                document->pushCurrentScript(toHTMLScriptElement(m_element));
 
             // Create a script from the script element node, using the script
             // block's source and the script block's type.
             // Note: This is where the script is compiled and actually executed.
             frame->script()->executeScriptInMainWorld(sourceCode);
 
             if (isHTMLScriptElement(m_element)) {
                 ASSERT(document->currentScript() == m_element);
                 document->popCurrentScript();
             }
@@ skipping 99 matching lines @@
         firstTextNode->atomize();
         return firstTextNode->data();
     }
 
     return content.toString();
 }
 
 ScriptElement* toScriptElementIfPossible(Element* element)
 {
     if (isHTMLScriptElement(element))
-        return static_cast<HTMLScriptElement*>(element);
+        return toHTMLScriptElement(element);
 
-    if (element->isSVGElement() && element->hasTagName(SVGNames::scriptTag))
-        return static_cast<SVGScriptElement*>(element);
+    if (isSVGScriptElement(element))
+        return toSVGScriptElement(element);
 
     return 0;
 }
 
 }