Index: webkit/plugins/ppapi/ppb_websocket_impl.cc |
diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.cc b/webkit/plugins/ppapi/ppb_websocket_impl.cc |
index f460aea11cd33f2eba2b9a4119aa929730330830..41944be283a6b081e63bbc944f43117890586be9 100644 |
--- a/webkit/plugins/ppapi/ppb_websocket_impl.cc |
+++ b/webkit/plugins/ppapi/ppb_websocket_impl.cc |
@@ -344,8 +344,8 @@ uint16_t PPB_WebSocket_Impl::GetCloseCode() { |
PP_Var PPB_WebSocket_Impl::GetCloseReason() { |
if (!close_reason_) |
- return empty_string_->GetPPVar(); |
- return close_reason_->GetPPVar(); |
+ return ReturnVar(empty_string_->GetPPVar()); |
+ return ReturnVar(close_reason_->GetPPVar()); |
} |
PP_Bool PPB_WebSocket_Impl::GetCloseWasClean() { |
@@ -356,14 +356,14 @@ PP_Var PPB_WebSocket_Impl::GetExtensions() { |
// TODO(toyoshim): For now, always returns empty string because WebKit side |
// doesn't support it yet. |
if (!extensions_) |
- return empty_string_->GetPPVar(); |
- return extensions_->GetPPVar(); |
+ return ReturnVar(empty_string_->GetPPVar()); |
+ return ReturnVar(extensions_->GetPPVar()); |
} |
PP_Var PPB_WebSocket_Impl::GetProtocol() { |
// Check mandatory interfaces. |
if (!websocket_.get()) |
- return empty_string_->GetPPVar(); |
+ return ReturnVar(empty_string_->GetPPVar()); |
std::string protocol = websocket_->subprotocol().utf8(); |
return StringVar::StringToPPVar(protocol); |
@@ -375,8 +375,8 @@ PP_WebSocketReadyState_Dev PPB_WebSocket_Impl::GetReadyState() { |
PP_Var PPB_WebSocket_Impl::GetURL() { |
if (!url_) |
- return empty_string_->GetPPVar(); |
- return url_->GetPPVar(); |
+ return ReturnVar(empty_string_->GetPPVar()); |
+ return ReturnVar(url_->GetPPVar()); |
dmichael (off chromium)
2011/12/09 23:05:26
It looks like this got polluted from that other CL
|
} |
void PPB_WebSocket_Impl::didConnect() { |
@@ -492,5 +492,11 @@ int32_t PPB_WebSocket_Impl::DoReceive() { |
return PP_OK; |
} |
+PP_Var PPB_WebSocket_Impl::ReturnVar(PP_Var var) { |
+ VarTracker* var_tracker = PpapiGlobals::Get()->GetVarTracker(); |
+ var_tracker->AddRefVar(var); |
+ return var; |
+} |
+ |
} // namespace ppapi |
} // namespace webkit |