Merge 188868 "Revert of Make SpeechRecognitionController per fra..."

Source/modules/speech/SpeechRecognitionController.cpp

 /*
  * Copyright (C) 2012 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 copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * 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 "modules/speech/SpeechRecognitionController.h"
 
 namespace blink {
 
-void SpeechRecognitionController::provideTo(LocalFrame& frame, PassOwnPtr<SpeechRecognitionClient> client)
-{
-    SpeechRecognitionController* controller = new SpeechRecognitionController(client);
-    WillBeHeapSupplement<LocalFrame>::provideTo(frame, SpeechRecognitionController::supplementName(), adoptPtrWillBeNoop(controller));
-}
-
-SpeechRecognitionController* SpeechRecognitionController::from(LocalFrame& frame)
-{
-    return static_cast<SpeechRecognitionController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName()));
-}
-
 const char* SpeechRecognitionController::supplementName()
 {
     return "SpeechRecognitionController";
 }
 
 SpeechRecognitionController::SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient> client)
     : m_client(client)
 {
 }
 
 SpeechRecognitionController::~SpeechRecognitionController()
 {
     // FIXME: Call m_client->pageDestroyed(); once we have implemented a client.
 }
 
-void SpeechRecognitionController::trace(Visitor* visitor)
+PassOwnPtrWillBeRawPtr<SpeechRecognitionController> SpeechRecognitionController::create(PassOwnPtr<SpeechRecognitionClient> client)
 {
-    WillBeHeapSupplement<LocalFrame>::trace(visitor);
+    return adoptPtrWillBeNoop(new SpeechRecognitionController(client));
+}
+
+void provideSpeechRecognitionTo(Page& page, PassOwnPtr<SpeechRecognitionClient> client)
+{
+    SpeechRecognitionController::provideTo(page, SpeechRecognitionController::supplementName(), SpeechRecognitionController::create(client));
 }
 
 } // namespace blink