Remove ContextClient from DOMWindowSpeechSynthesis

third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.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
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 "modules/speech/DOMWindowSpeechSynthesis.h"
 
+#include "bindings/core/v8/ScriptState.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(LocalDOMWindow& window)
-    : ContextClient(window.frame()) {}
+    : Supplement<LocalDOMWindow>(window) {}
 
 const char* DOMWindowSpeechSynthesis::supplementName() {
   return "DOMWindowSpeechSynthesis";
 }
 
 // static
 DOMWindowSpeechSynthesis& DOMWindowSpeechSynthesis::from(
     LocalDOMWindow& window) {
   DOMWindowSpeechSynthesis* supplement = static_cast<DOMWindowSpeechSynthesis*>(
       Supplement<LocalDOMWindow>::from(window, supplementName()));
   if (!supplement) {
     supplement = new DOMWindowSpeechSynthesis(window);
     provideTo(window, supplementName(), supplement);
   }
   return *supplement;
 }
 
 // static
-SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow& window) {
+SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(
+    ScriptState* scriptState,
+    DOMWindow& window) {
   return DOMWindowSpeechSynthesis::from(toLocalDOMWindow(window))
-      .speechSynthesis();
+      .speechSynthesis(scriptState);
 }
 
-SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis() {
-  if (!m_speechSynthesis && frame())
+SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(
+    ScriptState* scriptState) {
+  if (!m_speechSynthesis) {
     m_speechSynthesis =
-        SpeechSynthesis::create(frame()->domWindow()->getExecutionContext());
+        SpeechSynthesis::create(scriptState->getExecutionContext());
+  }
   return m_speechSynthesis;
 }
 
 DEFINE_TRACE(DOMWindowSpeechSynthesis) {
   visitor->trace(m_speechSynthesis);
   Supplement<LocalDOMWindow>::trace(visitor);
-  ContextClient::trace(visitor);
 }
 
 }  // namespace blink