Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/modules/bluetooth/BluetoothSupplement.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/bluetooth/BluetoothSupplement.h" 5 #include "modules/bluetooth/BluetoothSupplement.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 8
9 namespace blink { 9 namespace blink {
10 10
(...skipping 18 matching lines...)
29 BluetoothSupplement* supplement = static_cast<BluetoothSupplement*>(WillBeHe apSupplement<LocalFrame>::from(frame, supplementName())); 29 BluetoothSupplement* supplement = static_cast<BluetoothSupplement*>(WillBeHe apSupplement<LocalFrame>::from(frame, supplementName()));
30 30
31 ASSERT(supplement); 31 ASSERT(supplement);
32 ASSERT(supplement->m_bluetooth); 32 ASSERT(supplement->m_bluetooth);
33 33
34 return supplement->m_bluetooth; 34 return supplement->m_bluetooth;
35 } 35 }
36 36
37 WebBluetooth* BluetoothSupplement::fromScriptState(ScriptState* scriptState) 37 WebBluetooth* BluetoothSupplement::fromScriptState(ScriptState* scriptState)
38 { 38 {
39 return fromExecutionContext(scriptState->executionContext()); 39 return fromExecutionContext(scriptState->getExecutionContext());
40 } 40 }
41 41
42 WebBluetooth* BluetoothSupplement::fromExecutionContext(ExecutionContext* execut ionContext) 42 WebBluetooth* BluetoothSupplement::fromExecutionContext(ExecutionContext* execut ionContext)
43 { 43 {
44 if (!executionContext->isDocument()) { 44 if (!executionContext->isDocument()) {
45 return nullptr; 45 return nullptr;
46 } 46 }
47 return BluetoothSupplement::from(static_cast<Document*>(executionContext)->f rame()); 47 return BluetoothSupplement::from(static_cast<Document*>(executionContext)->f rame());
48 } 48 }
49 49
50 DEFINE_TRACE(BluetoothSupplement) 50 DEFINE_TRACE(BluetoothSupplement)
51 { 51 {
52 WillBeHeapSupplement<LocalFrame>::trace(visitor); 52 WillBeHeapSupplement<LocalFrame>::trace(visitor);
53 } 53 }
54 54
55 } // namespace blink 55 } // namespace blink
OLDNEW

Powered by Google App Engine