bluetooth: Subscribe to notifications

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

 // 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.
 
 #ifndef BluetoothSupplement_h
 #define BluetoothSupplement_h
 
 #include "core/frame/LocalFrame.h"
 
 namespace blink {
 
 class WebBluetooth;
 
 // This class is attached to a LocalFrame in WebLocalFrameImpl::setCoreFrame, to
 // pass WebFrameClient::bluetooth() (accessible by web/ only) to the Bluetooth
 // code in modules/.
 class BLINK_EXPORT BluetoothSupplement : public NoBaseWillBeGarbageCollected<BluetoothSupplement>, public WillBeHeapSupplement<LocalFrame> {
     WTF_MAKE_NONCOPYABLE(BluetoothSupplement);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(BluetoothSupplement);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(BluetoothSupplement);
 
 public:
     static const char* supplementName();
 
     static void provideTo(LocalFrame&, WebBluetooth*);
 
     // Returns the WebBluetooth attached to the ScriptState's frame if that exists;
     // otherwise the Platform's WebBluetooth.
     static WebBluetooth* from(ScriptState*);
-
+    static WebBluetooth* from(ExecutionContext*);
+    static WebBluetooth* from(LocalDOMWindow*);

[haraken, 2015/10/07 01:22:33]

This looks wrong. BluetoothSupplement is a supplement of LocalFrame, so it must
be extracted from LocalFrame (shouldn't be extracted from ExecutionContext,
LocalDOMWindow etc, which has a different lifetime than LocalFrame).

[ortuno, 2015/10/07 17:03:55]

In all three cases we end up getting the supplement from the frame:

scriptState->domWindow()->frame();
executionContext->executingWindow()->frame();
window->frame();

Should we do it differently? Is there another class we should implement to get
the local frame?

     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit BluetoothSupplement(WebBluetooth*);
 
     WebBluetooth* m_bluetooth;
 };
 
 } // namespace blink
 
 #endif // BluetoothRoutingId_h