Oilpan: Remove guardRef and guardDeref from TreeScope.

Source/core/speech/SpeechInput.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/speech/SpeechInput.h"
 
 #if ENABLE(INPUT_SPEECH)
 
+#include "core/html/shadow/TextControlInnerElements.h"
 #include "core/speech/SpeechInputClient.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 SpeechInput::SpeechInput(PassOwnPtr<SpeechInputClient> client)
     : m_client(client)
     , m_nextListenerId(1)
 {
     m_client->setListener(this);
 }
 
 SpeechInput::~SpeechInput()
 {
     m_client->setListener(0);
 }
 
 PassOwnPtr<SpeechInput> SpeechInput::create(PassOwnPtr<SpeechInputClient> client)
 {
     return adoptPtr(new SpeechInput(client));
 }
 
-int SpeechInput::registerListener(SpeechInputListener* listener)
+int SpeechInput::registerListener(InputFieldSpeechButtonElement* listener)
 {
 #if defined(DEBUG)
     // Check if already present.
-    for (HashMap<int, SpeechInputListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+    for (HashMap<int, InputFieldSpeechButtonElement*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
         ASSERT(it->value != listener);
 #endif
 
     m_listeners.add(m_nextListenerId, listener);
     return m_nextListenerId++;
 }
 
 void SpeechInput::unregisterListener(int listenerId)
 {
     if (m_listeners.contains(listenerId))
@@ skipping 45 matching lines @@
 const char* SpeechInput::supplementName()
 {
     return "SpeechInput";
 }
 
 void provideSpeechInputTo(Page& page, PassOwnPtr<SpeechInputClient> client)
 {
     SpeechInput::provideTo(page, SpeechInput::supplementName(), SpeechInput::create(client));
 }
 
+void SpeechInput::clearWeakMembers(Visitor* visitor)
+{
+    Vector<int> deadListenerIds;
+    HashMap<int, InputFieldSpeechButtonElement*>::const_iterator end = m_listeners.end();
+    for (HashMap<int, InputFieldSpeechButtonElement*>::const_iterator it = m_listeners.begin(); it != end; ++it) {
+        if (!visitor->isAlive(it->value)) {
+            deadListenerIds.append(it->key);
+            m_client->cancelRecognition(it->key);

[haraken, 2014/04/24 04:18:43]

Don't you need to check if(m_state != Idle) before calling cancelRecognition? We
are doing the check in TextControlInnerElements.cpp in oilpan builds.

[Mads Ager (chromium), 2014/04/24 10:57:36]

I don't see anything in the code that requires that check and all tests pass.
Also, when we can move back to the right interface, that interface does not
support checking for anything like that.

+        }
+    }
+    for (unsigned i = 0; i < deadListenerIds.size(); ++i)
+        m_listeners.remove(deadListenerIds[i]);
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(INPUT_SPEECH)