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

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Rebased again Created 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
index bc94706eea5a10e2a511980bd1a7e6a3c9850285..37597d1993031b99e8f357875287c04d27a55863 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -53,7 +53,7 @@ using ppapi::TCPSocketVersion;
namespace {
-size_t g_num_instances = 0;
+size_t g_num_filter_instances = 0;
} // namespace
@@ -88,7 +88,8 @@ PepperTCPSocketMessageFilter::PepperTCPSocketMessageFilter(
DCHECK(host);
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- ++g_num_instances;
+ ++g_num_filter_instances;
+
host_->AddInstanceObserver(instance_, this);
if (!host->GetRenderFrameIDsForInstance(
instance, &render_process_id_, &render_frame_id_)) {
@@ -126,7 +127,7 @@ PepperTCPSocketMessageFilter::PepperTCPSocketMessageFilter(
DCHECK_NE(version, ppapi::TCP_SOCKET_VERSION_1_0);
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- ++g_num_instances;
+ ++g_num_filter_instances;
host_->AddInstanceObserver(instance_, this);
if (!host->GetRenderFrameIDsForInstance(
instance, &render_process_id_, &render_frame_id_)) {
@@ -142,12 +143,12 @@ PepperTCPSocketMessageFilter::~PepperTCPSocketMessageFilter() {
socket_->Close();
if (ssl_socket_)
ssl_socket_->Disconnect();
- --g_num_instances;
+ --g_num_filter_instances;
}
// static
size_t PepperTCPSocketMessageFilter::GetNumInstances() {
- return g_num_instances;
+ return g_num_filter_instances;
}
scoped_refptr<base::TaskRunner>

Powered by Google App Engine
This is Rietveld 408576698