Simplify: remove PendingScript::releaseElementAndClear

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

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 34 matching lines @@
       m_parserBlockingLoadStartTime(0),
       m_client(nullptr) {
   setScriptResource(resource);
   ThreadState::current()->registerPreFinalizer(this);
   MemoryCoordinator::instance().registerClient(this);
 }
 
 PendingScript::~PendingScript() {}
 
 void PendingScript::dispose() {
-  if (!m_client)
-    return;
-  stopWatchingForLoad();
-  releaseElementAndClear();
+  if (m_client)

[sof, 2016/11/28 16:17:59]

stopWatchingForLoad() already checks for not being in a watching-a-load state,
just call it unconditionally?

[kouhei (in TOK), 2016/11/29 00:49:05]

Done.

+    stopWatchingForLoad();
+
+  DCHECK(!m_client);
+  setScriptResource(nullptr);
+  m_watchingForLoad = false;

[sof, 2016/11/28 16:17:59]

This ought to be redundant now.

[kouhei (in TOK), 2016/11/29 00:49:04]

Done.

+  m_startingPosition = TextPosition::belowRangePosition();
+  m_integrityFailure = false;
+  m_parserBlockingLoadStartTime = 0;
+  if (m_streamer)
+    m_streamer->cancel();
+  m_streamer = nullptr;
+  m_element = nullptr;
 }
 
 void PendingScript::watchForLoad(ScriptResourceClient* client) {
   DCHECK(!m_watchingForLoad);
   // addClient() will call streamingFinished() if the load is complete. Callers
   // who do not expect to be re-entered from this call should not call
   // watchForLoad for a PendingScript which isReady. We also need to set
   // m_watchingForLoad early, since addClient() can result in calling
   // notifyFinished and further stopWatchingForLoad().
   m_watchingForLoad = true;
@@ skipping 15 matching lines @@
 void PendingScript::streamingFinished() {
   DCHECK(resource());
   if (m_client)
     m_client->notifyFinished(resource());
 }
 
 void PendingScript::setElement(Element* element) {
   m_element = element;
 }
 
-Element* PendingScript::releaseElementAndClear() {
-  setScriptResource(0);
-  m_watchingForLoad = false;
-  m_startingPosition = TextPosition::belowRangePosition();
-  m_integrityFailure = false;
-  m_parserBlockingLoadStartTime = 0;
-  if (m_streamer)
-    m_streamer->cancel();
-  m_streamer.release();
-  return m_element.release();
-}
-
 void PendingScript::setScriptResource(ScriptResource* resource) {
   setResource(resource);
 }
 
 void PendingScript::markParserBlockingLoadStartTime() {
   DCHECK_EQ(m_parserBlockingLoadStartTime, 0.0);
   m_parserBlockingLoadStartTime = monotonicallyIncreasingTime();
 }
 
 void PendingScript::notifyFinished(Resource* resource) {
@@ skipping 107 matching lines @@
 
 void PendingScript::onMemoryStateChange(MemoryState state) {
   if (state != MemoryState::SUSPENDED)
     return;
   if (!m_streamer)
     return;
   m_streamer->cancel();
 }
 
 }  // namespace blink