| Index: third_party/WebKit/Source/modules/netinfo/NetworkInformation.cpp
|
| diff --git a/third_party/WebKit/Source/modules/netinfo/NetworkInformation.cpp b/third_party/WebKit/Source/modules/netinfo/NetworkInformation.cpp
|
| index 1fc9a0d2ab4a551d154e80b852c6241a96327522..0e661db47e66c2655987ecc8db8b6cba85ad9654 100644
|
| --- a/third_party/WebKit/Source/modules/netinfo/NetworkInformation.cpp
|
| +++ b/third_party/WebKit/Source/modules/netinfo/NetworkInformation.cpp
|
| @@ -78,7 +78,7 @@ double NetworkInformation::downlinkMax() const
|
|
|
| void NetworkInformation::connectionChange(WebConnectionType type, double downlinkMaxMbps)
|
| {
|
| - ASSERT(executionContext()->isContextThread());
|
| + ASSERT(getExecutionContext()->isContextThread());
|
|
|
| // This can happen if the observer removes and then adds itself again
|
| // during notification.
|
| @@ -98,9 +98,9 @@ const AtomicString& NetworkInformation::interfaceName() const
|
| return EventTargetNames::NetworkInformation;
|
| }
|
|
|
| -ExecutionContext* NetworkInformation::executionContext() const
|
| +ExecutionContext* NetworkInformation::getExecutionContext() const
|
| {
|
| - return ActiveDOMObject::executionContext();
|
| + return ActiveDOMObject::getExecutionContext();
|
| }
|
|
|
| bool NetworkInformation::addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener> listener, const EventListenerOptions& options)
|
| @@ -145,7 +145,7 @@ void NetworkInformation::startObserving()
|
| {
|
| if (!m_observing && !m_contextStopped) {
|
| m_type = networkStateNotifier().connectionType();
|
| - networkStateNotifier().addObserver(this, executionContext());
|
| + networkStateNotifier().addObserver(this, getExecutionContext());
|
| m_observing = true;
|
| }
|
| }
|
| @@ -153,7 +153,7 @@ void NetworkInformation::startObserving()
|
| void NetworkInformation::stopObserving()
|
| {
|
| if (m_observing) {
|
| - networkStateNotifier().removeObserver(this, executionContext());
|
| + networkStateNotifier().removeObserver(this, getExecutionContext());
|
| m_observing = false;
|
| }
|
| }
|
|
|