Oilpan: Remove guardRef and guardDeref from TreeScope.

Source/core/speech/SpeechInput.cpp

Index: Source/core/speech/SpeechInput.cpp
diff --git a/Source/core/speech/SpeechInput.cpp b/Source/core/speech/SpeechInput.cpp
index 03aeb1c2c5a3c61b104a20353418e3386a447ccc..ea7c449b276e4fa121579b717bf5cef04f6fdf0f 100644
--- a/Source/core/speech/SpeechInput.cpp
+++ b/Source/core/speech/SpeechInput.cpp
@@ -33,6 +33,7 @@
 
 #if ENABLE(INPUT_SPEECH)
 
+#include "core/html/shadow/TextControlInnerElements.h"
 #include "core/speech/SpeechInputClient.h"
 #include "wtf/PassOwnPtr.h"
 
@@ -55,11 +56,11 @@ 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
 
@@ -125,6 +126,20 @@ 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)