Set currentScript for SVGScriptElements.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 178 matching lines @@
 #include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/scrolling/RootScroller.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/svg/SVGDocumentExtensions.h"
+#include "core/svg/SVGScriptElement.h"
 #include "core/svg/SVGTitleElement.h"
 #include "core/svg/SVGUseElement.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "core/workers/SharedWorkerRepositoryClient.h"
 #include "core/xml/parser/XMLDocumentParser.h"
 #include "platform/DateComponents.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/Histogram.h"
 #include "platform/Language.h"
@@ skipping 4366 matching lines @@
         if (!equalIgnoringCase(linkElement->type(), openSearchMIMEType) || !equalIgnoringCase(linkElement->rel(), openSearchRelation))
             continue;
         if (linkElement->href().isEmpty())
             continue;
         return linkElement->href();
     }
 
     return KURL();
 }
 
-HTMLScriptElement* Document::currentScriptForBinding() const
+void Document::currentScriptForBinding(ScriptElement& scriptElement) const
 {
-    if (HTMLScriptElement* script = currentScript())
-        return script->isInV1ShadowTree() ? nullptr : script;
-    return nullptr;
+    if (Element* script = currentScript()) {
+        if (script->isInV1ShadowTree())
+            return;
+        if (isHTMLScriptElement(script))
+            scriptElement.setHTMLScriptElement(toHTMLScriptElement(script));
+        else if (isSVGScriptElement(script))
+            scriptElement.setSVGScriptElement(toSVGScriptElement(script));
+    }

[fs, 2016/05/03 10:56:00]

NOTREACHED()?

[ramya.v, 2016/05/04 04:18:41]

Below test cases are failing if we put ASSERT_NOT_REACHED at this point.
https://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/...

[fs, 2016/05/04 08:42:54]

Well, the placement in PS3 is definitely wrong - currentScript() being null is a
valid case, but non-null that are not SVGScriptElement or HTMLScriptElement
would not be. So the NOTREACHED() would need to go in a final 'else' branch of
the inner if. I'm fine with just a DCHECK in pushCurrentScript though - it
should serve the same purpose/verify the same contract.

[ramya.v, 2016/05/04 09:35:51]

Got your point. Thanks.
Done.

 }
 
-void Document::pushCurrentScript(HTMLScriptElement* newCurrentScript)
+void Document::pushCurrentScript(const ScriptElement& newCurrentScript)
 {
-    DCHECK(newCurrentScript);
-    m_currentScriptStack.append(newCurrentScript);
+    DCHECK(!newCurrentScript.isNull());
+    Element* scriptToPush;
+    if (newCurrentScript.isHTMLScriptElement())
+        scriptToPush = newCurrentScript.getAsHTMLScriptElement();
+    else
+        scriptToPush = newCurrentScript.getAsSVGScriptElement();
+    m_currentScriptStack.append(scriptToPush);
 }
 
 void Document::popCurrentScript()
 {
     DCHECK(!m_currentScriptStack.isEmpty());
     m_currentScriptStack.removeLast();
 }
 
 void Document::setTransformSource(PassOwnPtr<TransformSource> source)
 {
@@ skipping 1367 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().getString().utf8().data());
 }
 #endif