Unify var tracking between webkit and the proxy.

ppapi/proxy/resource_creation_proxy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/resource_creation_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/proxy/host_resource.h"
 #include "ppapi/proxy/interface_id.h"
@@ skipping 18 matching lines @@
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 #include "ppapi/proxy/ppb_input_event_proxy.h"
 #include "ppapi/proxy/ppb_surface_3d_proxy.h"
 #include "ppapi/proxy/ppb_url_loader_proxy.h"
 #include "ppapi/proxy/ppb_url_request_info_proxy.h"
 #include "ppapi/proxy/ppb_video_capture_proxy.h"
 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
 #include "ppapi/shared_impl/font_impl.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/input_event_impl.h"
+#include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 
 using ppapi::InputEventData;
+using ppapi::StringVar;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace pp {
 namespace proxy {
 
 ResourceCreationProxy::ResourceCreationProxy(Dispatcher* dispatcher)
     : dispatcher_(dispatcher) {
 }
 
 ResourceCreationProxy::~ResourceCreationProxy() {
@@ skipping 146 matching lines @@
     PP_InputEvent_Type type,
     PP_TimeTicks time_stamp,
     uint32_t modifiers,
     uint32_t key_code,
     struct PP_Var character_text) {
   if (type != PP_INPUTEVENT_TYPE_RAWKEYDOWN &&
       type != PP_INPUTEVENT_TYPE_KEYDOWN &&
       type != PP_INPUTEVENT_TYPE_KEYUP &&
       type != PP_INPUTEVENT_TYPE_CHAR)
     return 0;
-  PluginVarTracker* tracker = PluginVarTracker::GetInstance();
-
   ppapi::InputEventData data;
   data.event_type = type;
   data.event_time_stamp = time_stamp;
   data.event_modifiers = modifiers;
   data.key_code = key_code;
-  if (character_text.type == PP_VARTYPE_STRING)
-    data.character_text = *tracker->GetExistingString(character_text);
+  if (character_text.type == PP_VARTYPE_STRING) {
+    scoped_refptr<StringVar> text_str(StringVar::FromPPVar(character_text));
+    if (!text_str)
+      return 0;
+    data.character_text = text_str->value();
+  }
 
   return PPB_InputEvent_Proxy::CreateProxyResource(instance, data);
 }
 
 PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
     PP_Instance instance,
     PP_InputEvent_Type type,
     PP_TimeTicks time_stamp,
     uint32_t modifiers,
     PP_InputEvent_MouseButton mouse_button,
@@ skipping 171 matching lines @@
       *result_image_handle = dispatcher_->ShareHandleWithRemote(ih, false);
 #else
       *result_image_handle = ImageData::HandleFromInt(handle);
 #endif
     }
   }
 }
 
 }  // namespace proxy
 }  // namespace pp