X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fbrowser%2Frenderer_host%2Fpepper%2Fpepper_host_resolver_message_filter.cc;h=6b05531ad305d8bad28315240373347ecf745dd1;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=897fc4d4da9713adbfdafe3f7a02fda825e7fff4;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc b/src/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc index 897fc4d..6b05531 100644 --- a/src/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc +++ b/src/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc @@ -67,9 +67,8 @@ void CreateNetAddressListFromAddressList( PP_NetAddress_Private address; for (size_t i = 0; i < list.size(); ++i) { - if (!ppapi::NetAddressPrivateImpl::IPEndPointToNetAddress(list[i].address(), - list[i].port(), - &address)) { + if (!ppapi::NetAddressPrivateImpl::IPEndPointToNetAddress( + list[i].address(), list[i].port(), &address)) { net_address_list->clear(); return; } @@ -90,15 +89,12 @@ PepperHostResolverMessageFilter::PepperHostResolverMessageFilter( DCHECK(host); if (!host->GetRenderFrameIDsForInstance( - instance, - &render_process_id_, - &render_frame_id_)) { + instance, &render_process_id_, &render_frame_id_)) { NOTREACHED(); } } -PepperHostResolverMessageFilter::~PepperHostResolverMessageFilter() { -} +PepperHostResolverMessageFilter::~PepperHostResolverMessageFilter() {} scoped_refptr PepperHostResolverMessageFilter::OverrideTaskRunnerForMessage( @@ -112,8 +108,8 @@ int32_t PepperHostResolverMessageFilter::OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) { IPC_BEGIN_MESSAGE_MAP(PepperHostResolverMessageFilter, msg) - PPAPI_DISPATCH_HOST_RESOURCE_CALL( - PpapiHostMsg_HostResolver_Resolve, OnMsgResolve) + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_HostResolver_Resolve, + OnMsgResolve) IPC_END_MESSAGE_MAP() return PP_ERROR_FAILED; } @@ -122,7 +118,7 @@ int32_t PepperHostResolverMessageFilter::OnMsgResolve( const ppapi::host::HostMessageContext* context, const ppapi::HostPortPair& host_port, const PP_HostResolver_Private_Hint& hint) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Check plugin permissions. SocketPermissionRequest request( @@ -144,8 +140,10 @@ int32_t PepperHostResolverMessageFilter::OnMsgResolve( return PP_ERROR_FAILED; BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::Bind(&PepperHostResolverMessageFilter::DoResolve, this, + BrowserThread::IO, + FROM_HERE, + base::Bind(&PepperHostResolverMessageFilter::DoResolve, + this, context->MakeReplyMessageContext(), host_port, hint, @@ -158,7 +156,7 @@ void PepperHostResolverMessageFilter::DoResolve( const ppapi::HostPortPair& host_port, const PP_HostResolver_Private_Hint& hint, ResourceContext* resource_context) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK_CURRENTLY_ON(BrowserThread::IO); net::HostResolver* host_resolver = resource_context->GetHostResolver(); if (!host_resolver) { @@ -208,8 +206,8 @@ void PepperHostResolverMessageFilter::SendResolveReply( ReplyMessageContext reply_context = context; reply_context.params.set_result(result); SendReply(reply_context, - PpapiPluginMsg_HostResolver_ResolveReply( - canonical_name, net_address_list)); + PpapiPluginMsg_HostResolver_ResolveReply(canonical_name, + net_address_list)); } void PepperHostResolverMessageFilter::SendResolveError(