diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 23:44:05 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 23:44:05 +0000 |
| commit | 947960c2f6a85573c97c70dd6f8a7b79faeb56f3 (patch) | |
| tree | b291d3077debb299bf260b60b3e241dd71876d2c /webkit/plugins/ppapi/ppb_transport_impl.cc | |
| parent | c404564277fa3cd5713efa6966287c072b489a87 (diff) | |
| download | chromium_src-947960c2f6a85573c97c70dd6f8a7b79faeb56f3.zip chromium_src-947960c2f6a85573c97c70dd6f8a7b79faeb56f3.tar.gz chromium_src-947960c2f6a85573c97c70dd6f8a7b79faeb56f3.tar.bz2 | |
Revert 101189 - Use enum instead of string to specify transport type.
TEST=None
BUG=41776
Review URL: http://codereview.chromium.org/7891014
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/7901002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/ppb_transport_impl.cc')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_transport_impl.cc | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/webkit/plugins/ppapi/ppb_transport_impl.cc b/webkit/plugins/ppapi/ppb_transport_impl.cc index d097354..e7779aa 100644 --- a/webkit/plugins/ppapi/ppb_transport_impl.cc +++ b/webkit/plugins/ppapi/ppb_transport_impl.cc @@ -70,9 +70,9 @@ PPB_Transport_Impl::~PPB_Transport_Impl() { // static PP_Resource PPB_Transport_Impl::Create(PP_Instance instance, const char* name, - PP_TransportType type) { + const char* proto) { scoped_refptr<PPB_Transport_Impl> t(new PPB_Transport_Impl(instance)); - if (!t->Init(name, type)) + if (!t->Init(name, proto)) return 0; return t->GetReference(); } @@ -81,14 +81,17 @@ PPB_Transport_API* PPB_Transport_Impl::AsPPB_Transport_API() { return this; } -bool PPB_Transport_Impl::Init(const char* name, PP_TransportType type) { +bool PPB_Transport_Impl::Init(const char* name, const char* proto) { name_ = name; - if (type != PP_TRANSPORTTYPE_DATAGRAM && type != PP_TRANSPORTTYPE_STREAM) { - LOG(WARNING) << "Unknown transport type: " << type; + if (base::strcasecmp(proto, kUdpProtocolName) == 0) { + use_tcp_ = false; + } else if (base::strcasecmp(proto, kTcpProtocolName) == 0) { + use_tcp_ = true; + } else { + LOG(WARNING) << "Unknown protocol: " << proto; return false; } - type_ = type; PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this); if (!plugin_delegate) @@ -144,7 +147,7 @@ int32_t PPB_Transport_Impl::SetProperty(PP_TransportProperty property, } case PP_TRANSPORTPROPERTY_TCP_RECEIVE_WINDOW: { - if (type_ != PP_TRANSPORTTYPE_STREAM) + if (!use_tcp_) return PP_ERROR_BADARGUMENT; int32_t int_value = value.value.as_int; @@ -157,7 +160,7 @@ int32_t PPB_Transport_Impl::SetProperty(PP_TransportProperty property, } case PP_TRANSPORTPROPERTY_TCP_SEND_WINDOW: { - if (type_ != PP_TRANSPORTTYPE_STREAM) + if (!use_tcp_) return PP_ERROR_BADARGUMENT; int32_t int_value = value.value.as_int; @@ -170,7 +173,7 @@ int32_t PPB_Transport_Impl::SetProperty(PP_TransportProperty property, } case PP_TRANSPORTPROPERTY_TCP_NO_DELAY: { - if (type_ != PP_TRANSPORTTYPE_STREAM) + if (!use_tcp_) return PP_ERROR_BADARGUMENT; if (value.type != PP_VARTYPE_BOOL) @@ -180,7 +183,7 @@ int32_t PPB_Transport_Impl::SetProperty(PP_TransportProperty property, } case PP_TRANSPORTPROPERTY_TCP_ACK_DELAY: { - if (type_ != PP_TRANSPORTTYPE_STREAM) + if (!use_tcp_) return PP_ERROR_BADARGUMENT; int32_t int_value = value.value.as_int; @@ -207,7 +210,7 @@ int32_t PPB_Transport_Impl::Connect(PP_CompletionCallback callback) { if (started_) return PP_ERROR_INPROGRESS; - P2PTransport::Protocol protocol = (type_ == PP_TRANSPORTTYPE_STREAM) ? + P2PTransport::Protocol protocol = use_tcp_ ? P2PTransport::PROTOCOL_TCP : P2PTransport::PROTOCOL_UDP; if (!p2p_transport_->Init(name_, protocol, config_, this)) |