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

Source/modules/speech/SpeechRecognitionController.h

 /*
  * 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 16 matching lines @@
 #define SpeechRecognitionController_h
 
 #include "core/page/Page.h"
 #include "modules/speech/SpeechRecognitionClient.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class MediaStreamTrack;
 
-class SpeechRecognitionController final
-    : public NoBaseWillBeGarbageCollectedFinalized<SpeechRecognitionController>
-    , public WillBeHeapSupplement<LocalFrame> {
+class SpeechRecognitionController final : public NoBaseWillBeGarbageCollectedFinalized<SpeechRecognitionController>, public WillBeHeapSupplement<Page> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController);
 public:
     virtual ~SpeechRecognitionController();
 
     void start(SpeechRecognition* recognition, const SpeechGrammarList* grammars, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTrack* audioTrack)
     {
         m_client->start(recognition, grammars, lang, continuous, interimResults, maxAlternatives, audioTrack);
     }
 
     void stop(SpeechRecognition* recognition) { m_client->stop(recognition); }
     void abort(SpeechRecognition* recognition) { m_client->abort(recognition); }
 
+    static PassOwnPtrWillBeRawPtr<SpeechRecognitionController> create(PassOwnPtr<SpeechRecognitionClient>);
     static const char* supplementName();
-    static void provideTo(LocalFrame&, PassOwnPtr<SpeechRecognitionClient>);
-    static SpeechRecognitionController* from(LocalFrame&);
+    static SpeechRecognitionController* from(Page* page) { return static_cast<SpeechRecognitionController*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
 
-    void trace(Visitor*) override;
+    void trace(Visitor* visitor) override { WillBeHeapSupplement<Page>::trace(visitor); }
 
 private:
     explicit SpeechRecognitionController(PassOwnPtr<SpeechRecognitionClient>);
 
     OwnPtr<SpeechRecognitionClient> m_client;
 };
 
 } // namespace blink
 
 #endif // SpeechRecognitionController_h