bluetooth: Subscribe to notifications

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"
 
 namespace blink {
@@ skipping 15 matching lines @@
 };
 
 WebBluetooth* BluetoothSupplement::from(LocalFrame* frame)
 {
     BluetoothSupplement* supplement = static_cast<BluetoothSupplement*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName()));
     if (supplement && supplement->m_bluetooth)
         return supplement->m_bluetooth;
     return nullptr;
 }
 
-WebBluetooth* BluetoothSupplement::getFromScriptState(ScriptState* scriptState)
+static WebBluetooth* getFromLocalDOMWindow(LocalDOMWindow* window)
 {
-    LocalDOMWindow* window = scriptState->domWindow();
     if (window && window->frame()) {

[haraken, 2015/10/10 14:19:35]

As commented in the other CL, it is unsafe to use window->frame(). You need to
use toFrameIfNotDetached.

[ortuno, 2015/10/12 17:46:07]

Using executionContext now.

         return BluetoothSupplement::from(window->frame());
     }
     return nullptr;
 }
 
+WebBluetooth* BluetoothSupplement::getFromScriptState(ScriptState* scriptState)
+{
+    return getFromLocalDOMWindow(scriptState->domWindow());
+}
+
+WebBluetooth* BluetoothSupplement::getFromExecutionContext(ExecutionContext* executionContext)
+{
+    return getFromLocalDOMWindow(executionContext->executingWindow());

[haraken, 2015/10/10 14:19:35]

executionContext->executingWindow() may work but is doing a nasty thing...

My suggestion would be:

- Remove all the getFromXXX family except for getFromExecutionContext.

- Implement the getFromExecutionContext as follows:

if (!executionContext->isDocument())
  return nullptr;
return
BluetoothSupplement::from(static_cast<Document*>(executionContext)->frame());

[ortuno, 2015/10/12 17:46:07]

Done.

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