More tweaks to <script nonce> hiding.

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
  * All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
@@ skipping 412 matching lines @@
   SynchronizeAttribute(name);
   if (const Attribute* attribute = GetElementData()->Attributes().Find(name))
     return attribute->Value();
   return g_null_atom;
 }
 
 bool Element::ShouldIgnoreAttributeCase() const {
   return IsHTMLElement() && GetDocument().IsHTMLDocument();
 }
 
+const AtomicString& Element::nonce() const {
+  return HasRareData() ? GetElementRareData()->GetNonce() : g_empty_atom;
+}
+
+void Element::setNonce(const AtomicString& nonce) {
+  EnsureElementRareData().SetNonce(nonce);
+}
+
 void Element::scrollIntoView(bool align_to_top) {
   GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
   if (!GetLayoutObject())
     return;
 
   bool make_visible_in_visual_viewport =
       !GetDocument().GetPage()->GetSettings().GetInertVisualViewport();
 
   LayoutRect bounds = BoundingBox();
@@ skipping 1207 matching lines @@
   if (!id_value.IsNull())
     UpdateId(scope, g_null_atom, id_value);
 
   const AtomicString& name_value = GetNameAttribute();
   if (!name_value.IsNull())
     UpdateName(g_null_atom, name_value);
 
   if (parentElement() && parentElement()->IsInCanvasSubtree())
     SetIsInCanvasSubtree(true);
 
+  if (hasAttribute(nonceAttr) && getAttribute(nonceAttr) != g_empty_atom) {
+    setNonce(getAttribute(nonceAttr));
+    if (RuntimeEnabledFeatures::hideNonceContentAttributeEnabled())
+      setAttribute(nonceAttr, g_empty_atom);
+  }
+
   return kInsertionDone;
 }
 
 void Element::RemovedFrom(ContainerNode* insertion_point) {
   bool was_in_document = insertion_point->isConnected();
 
   DCHECK(!HasRareData() || !GetElementRareData()->HasPseudoElements());
 
   if (Fullscreen::IsCurrentFullScreenElement(*this)) {
     SetContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
@@ skipping 2322 matching lines @@
                                         GetDocument()))
     element_data_ = other.element_data_;
   else
     element_data_ = other.element_data_->MakeUniqueCopy();
 
   AttributeCollection attributes = element_data_->Attributes();
   for (const Attribute& attr : attributes) {
     AttributeChangedFromParserOrByCloning(
         attr.GetName(), attr.Value(), AttributeModificationReason::kByCloning);
   }
+
+  if (other.nonce() != g_null_atom)
+    setNonce(other.nonce());
 }
 
 void Element::CloneDataFromElement(const Element& other) {
   CloneAttributesFromElement(other);
   CopyNonAttributePropertiesFromElement(other);
 }
 
 void Element::CreateUniqueElementData() {
   if (!element_data_) {
     element_data_ = UniqueElementData::Create();
@@ skipping 331 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (HasRareData()) {
     visitor->TraceWrappers(GetElementRareData());
   }
   ContainerNode::TraceWrappers(visitor);
 }
 
 }  // namespace blink