More tweaks to <script nonce> hiding.

third_party/WebKit/Source/core/svg/SVGScriptElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 33 matching lines @@
   return new SVGScriptElement(document, inserted_by_parser, false);
 }
 
 void SVGScriptElement::ParseAttribute(
     const AttributeModificationParams& params) {
   if (params.name == HTMLNames::onerrorAttr) {
     SetAttributeEventListener(
         EventTypeNames::error,
         CreateAttributeEventListener(this, params.name, params.new_value,
                                      EventParameterName()));
-  } else if (params.name == HTMLNames::nonceAttr) {
-    if (params.new_value == ContentSecurityPolicy::GetNonceReplacementString())
-      return;
-    setNonce(params.new_value);
-    if (RuntimeEnabledFeatures::hideNonceContentAttributeEnabled()) {
-      setAttribute(HTMLNames::nonceAttr,
-                   ContentSecurityPolicy::GetNonceReplacementString());
-    }
   } else {
     SVGElement::ParseAttribute(params);
   }
 }
 
 void SVGScriptElement::SvgAttributeChanged(const QualifiedName& attr_name) {
   if (SVGURIReference::IsKnownAttribute(attr_name)) {
     SVGElement::InvalidationGuard invalidation_guard(this);
     loader_->HandleSourceAttribute(HrefString());
     return;
@@ skipping 59 matching lines @@
 }
 
 bool SVGScriptElement::IsConnected() const {
   return Node::isConnected();
 }
 
 bool SVGScriptElement::HasChildren() const {
   return Node::hasChildren();
 }
 
-bool SVGScriptElement::IsNonceableElement() const {
-  return ContentSecurityPolicy::IsNonceableElement(this);
+const AtomicString& SVGScriptElement::GetNonceForElement() const {
+  return ContentSecurityPolicy::IsNonceableElement(this) ? nonce()
+                                                         : g_null_atom;
 }
 
 bool SVGScriptElement::AllowInlineScriptForCSP(
     const AtomicString& nonce,
     const WTF::OrdinalNumber& context_line,
     const String& script_content) {
   return GetDocument().GetContentSecurityPolicy()->AllowInlineScript(
       this, GetDocument().Url(), nonce, context_line, script_content);
 }
 
@@ skipping 32 matching lines @@
 }
 #endif
 
 DEFINE_TRACE(SVGScriptElement) {
   SVGElement::Trace(visitor);
   SVGURIReference::Trace(visitor);
   ScriptElementBase::Trace(visitor);
 }
 
 }  // namespace blink