bluetooth: Change BluetoothSupplement::from(ScriptState*) to from(LocalFrame*)

third_party/WebKit/Source/modules/bluetooth/BluetoothSupplement.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/bluetooth/BluetoothSupplement.h"
 
-#include "core/frame/LocalDOMWindow.h"
-#include "public/platform/Platform.h"
+#include "core/dom/Document.h"
 
 namespace blink {
 
 const char* BluetoothSupplement::supplementName()
 {
     return "BluetoothSupplement";
 }
 
 BluetoothSupplement::BluetoothSupplement(WebBluetooth* bluetooth)
     : m_bluetooth(bluetooth)
 {
 }
 
 void BluetoothSupplement::provideTo(LocalFrame& frame, WebBluetooth* bluetooth)
 {
     OwnPtrWillBeRawPtr<BluetoothSupplement> bluetoothSupplement = adoptPtrWillBeNoop(new BluetoothSupplement(bluetooth));
     WillBeHeapSupplement<LocalFrame>::provideTo(frame, supplementName(), bluetoothSupplement.release());
 };
 
-WebBluetooth* BluetoothSupplement::from(ScriptState* scriptState)
+WebBluetooth* BluetoothSupplement::from(LocalFrame* frame)
 {
-    LocalDOMWindow* window = scriptState->domWindow();
-    if (window && window->frame()) {
-        BluetoothSupplement* supplement = static_cast<BluetoothSupplement*>(WillBeHeapSupplement<LocalFrame>::from(window->frame(), supplementName()));
-        if (supplement && supplement->m_bluetooth)
-            return supplement->m_bluetooth;
+    BluetoothSupplement* supplement = static_cast<BluetoothSupplement*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName()));
+
+    ASSERT(supplement);
+    ASSERT(supplement->m_bluetooth);
+
+    return supplement->m_bluetooth;
+}
+
+WebBluetooth* BluetoothSupplement::fromScriptState(ScriptState* scriptState)
+{
+    if (!scriptState->executionContext()->isDocument()) {
+        return nullptr;
     }
-    return Platform::current()->bluetooth();
+    return BluetoothSupplement::from(static_cast<Document*>(scriptState->executionContext())->frame());

[haraken, 2015/10/13 02:05:09]

After landing the other CL, you should replace the implementation with
fromExecutionContext(scriptState->executionContext()).

With that change, LGTM.

[ortuno, 2015/10/13 15:40:29]

This CL is meant to land first. The other CL changes the implementation to what
you suggested.

 }
 
 DEFINE_TRACE(BluetoothSupplement)
 {
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
 }; // blink