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

Unified Diff: content/child/websocket_bridge.cc

Issue 897563002: Unify the three places that patch font loading for PDFium on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/child/websocket_bridge.cc
diff --git a/content/child/websocket_bridge.cc b/content/child/websocket_bridge.cc
index 5b327024313893d60d5789cdedf465720a96f66e..e091023c4ce2469630e65c5017ffead072d77f85 100644
--- a/content/child/websocket_bridge.cc
+++ b/content/child/websocket_bridge.cc
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
-#include "content/child/child_thread.h"
+#include "content/child/child_thread_impl.h"
#include "content/child/websocket_dispatcher.h"
#include "content/common/websocket.h"
#include "content/common/websocket_messages.h"
@@ -52,7 +52,7 @@ WebSocketBridge::~WebSocketBridge() {
if (channel_id_ != kInvalidChannelId) {
// The connection is abruptly disconnected by the renderer without
// closing handshake.
- ChildThread::current()->Send(
+ ChildThreadImpl::current()->Send(
new WebSocketMsg_DropChannel(channel_id_,
false,
kAbnormalShutdownOpCode,
@@ -214,7 +214,7 @@ void WebSocketBridge::connect(
WebSocketHandleClient* client) {
DCHECK_EQ(kInvalidChannelId, channel_id_);
WebSocketDispatcher* dispatcher =
- ChildThread::current()->websocket_dispatcher();
+ ChildThreadImpl::current()->websocket_dispatcher();
channel_id_ = dispatcher->AddBridge(this);
client_ = client;
@@ -227,7 +227,7 @@ void WebSocketBridge::connect(
<< JoinString(protocols_to_pass, ", ") << "), "
<< origin_to_pass.string() << ")";
- ChildThread::current()->Send(new WebSocketHostMsg_AddChannelRequest(
+ ChildThreadImpl::current()->Send(new WebSocketHostMsg_AddChannelRequest(
channel_id_, url, protocols_to_pass, origin_to_pass, render_frame_id_));
}
@@ -255,7 +255,7 @@ void WebSocketBridge::send(bool fin,
<< fin << ", " << type_to_pass << ", "
<< "(data size = " << size << "))";
- ChildThread::current()->Send(
+ ChildThreadImpl::current()->Send(
new WebSocketMsg_SendFrame(channel_id_,
fin,
type_to_pass,
@@ -268,7 +268,7 @@ void WebSocketBridge::flowControl(int64_t quota) {
DVLOG(1) << "Bridge #" << channel_id_ << " FlowControl(" << quota << ")";
- ChildThread::current()->Send(
+ ChildThreadImpl::current()->Send(
new WebSocketMsg_FlowControl(channel_id_, quota));
}
@@ -281,7 +281,7 @@ void WebSocketBridge::close(unsigned short code,
DVLOG(1) << "Bridge #" << channel_id_ << " Close("
<< code << ", " << reason_to_pass << ")";
// This method is for closing handshake and hence |was_clean| shall be true.
- ChildThread::current()->Send(
+ ChildThreadImpl::current()->Send(
new WebSocketMsg_DropChannel(channel_id_, true, code, reason_to_pass));
}
@@ -289,7 +289,7 @@ void WebSocketBridge::Disconnect() {
if (channel_id_ == kInvalidChannelId)
return;
WebSocketDispatcher* dispatcher =
- ChildThread::current()->websocket_dispatcher();
+ ChildThreadImpl::current()->websocket_dispatcher();
dispatcher->RemoveBridge(channel_id_);
channel_id_ = kInvalidChannelId;

Powered by Google App Engine
This is Rietveld 408576698