Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Side by Side Diff: third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp

Issue 2132973002: Replace a WTF::Function conversion operator to be a function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/broadcastchannel/BroadcastChannel.h" 5 #include "modules/broadcastchannel/BroadcastChannel.h"
6 6
7 #include "bindings/core/v8/SerializedScriptValue.h" 7 #include "bindings/core/v8/SerializedScriptValue.h"
8 #include "core/dom/ExceptionCode.h" 8 #include "core/dom/ExceptionCode.h"
9 #include "core/events/EventQueue.h" 9 #include "core/events/EventQueue.h"
10 #include "core/events/MessageEvent.h" 10 #include "core/events/MessageEvent.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 , ContextLifecycleObserver(executionContext) 116 , ContextLifecycleObserver(executionContext)
117 , m_origin(executionContext->getSecurityOrigin()) 117 , m_origin(executionContext->getSecurityOrigin())
118 , m_name(name) 118 , m_name(name)
119 , m_binding(this) 119 , m_binding(this)
120 { 120 {
121 webmessaging::mojom::blink::BroadcastChannelProviderPtr& provider = getThrea dSpecificProvider(); 121 webmessaging::mojom::blink::BroadcastChannelProviderPtr& provider = getThrea dSpecificProvider();
122 122
123 // Local BroadcastChannelClient for messages send from the browser to this c hannel. 123 // Local BroadcastChannelClient for messages send from the browser to this c hannel.
124 webmessaging::mojom::blink::BroadcastChannelClientAssociatedPtrInfo localCli entInfo; 124 webmessaging::mojom::blink::BroadcastChannelClientAssociatedPtrInfo localCli entInfo;
125 m_binding.Bind(&localClientInfo, provider.associated_group()); 125 m_binding.Bind(&localClientInfo, provider.associated_group());
126 m_binding.set_connection_error_handler(createBaseCallback(WTF::bind(&Broadca stChannel::onError, wrapWeakPersistent(this)))); 126 m_binding.set_connection_error_handler(convertToBaseCallback(WTF::bind(&Broa dcastChannel::onError, wrapWeakPersistent(this))));
127 127
128 // Remote BroadcastChannelClient for messages send from this channel to the browser. 128 // Remote BroadcastChannelClient for messages send from this channel to the browser.
129 webmessaging::mojom::blink::BroadcastChannelClientAssociatedPtrInfo remoteCl ientInfo; 129 webmessaging::mojom::blink::BroadcastChannelClientAssociatedPtrInfo remoteCl ientInfo;
130 mojo::AssociatedInterfaceRequest<webmessaging::mojom::blink::BroadcastChanne lClient> remoteCientRequest; 130 mojo::AssociatedInterfaceRequest<webmessaging::mojom::blink::BroadcastChanne lClient> remoteCientRequest;
131 provider.associated_group()->CreateAssociatedInterface(mojo::AssociatedGroup ::WILL_PASS_REQUEST, &remoteClientInfo, &remoteCientRequest); 131 provider.associated_group()->CreateAssociatedInterface(mojo::AssociatedGroup ::WILL_PASS_REQUEST, &remoteClientInfo, &remoteCientRequest);
132 m_remoteClient.Bind(std::move(remoteClientInfo)); 132 m_remoteClient.Bind(std::move(remoteClientInfo));
133 m_remoteClient.set_connection_error_handler(createBaseCallback(WTF::bind(&Br oadcastChannel::onError, wrapWeakPersistent(this)))); 133 m_remoteClient.set_connection_error_handler(convertToBaseCallback(WTF::bind( &BroadcastChannel::onError, wrapWeakPersistent(this))));
134 134
135 provider->ConnectToChannel(m_origin, m_name, std::move(localClientInfo), std ::move(remoteCientRequest)); 135 provider->ConnectToChannel(m_origin, m_name, std::move(localClientInfo), std ::move(remoteCientRequest));
136 } 136 }
137 137
138 } // namespace blink 138 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698