browser-plugin: Send a JSON string for the detail data with the events.

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright (c) 2012 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 "content/renderer/browser_plugin/browser_plugin.h"
 
+#include "base/json/json_string_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/browser_plugin/browser_plugin_bindings.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/render_process_impl.h"
@@ skipping 295 matching lines @@
 float BrowserPlugin::GetDeviceScaleFactor() const {
   if (!render_view_)
     return 1.0f;
   return render_view_->GetWebView()->deviceScaleFactor();
 }
 
 void BrowserPlugin::TriggerEvent(const std::string& event_name,
                                  std::map<std::string, base::Value*>* props) {
   if (!container())
     return;
-  WebKit::WebFrame* frame = container()->element().document().frame();
   v8::HandleScope handle_scope;
-  v8::Local<v8::Context> context = frame->mainWorldScriptContext();
-  v8::Context::Scope context_scope(context);
-  v8::Local<v8::Object> detail = v8::Object::New();
-
+  std::string json_string;
   if (props) {
-    V8ValueConverterImpl converter;
+    base::DictionaryValue dict;
     for (std::map<std::string, base::Value*>::iterator iter = props->begin(),
         end = props->end(); iter != end; ++iter) {
-      detail->Set(v8::String::New(iter->first.data(), iter->first.size()),
-          converter.ToV8Value(iter->second, context),
-          v8::ReadOnly);
+      dict.Set(iter->first, iter->second);
     }
-    STLDeleteValues(props);
+
+    JSONStringValueSerializer serializer(&json_string);
+    if (!serializer.Serialize(dict))
+      return;
   }
 
   // Setting properties on the |detail| object may have triggered JS code that
   // destroyed the plugin, or done other things that caused the plugin or the
   // frame to be destroyed. So do a check here for these.
   if (!container() || !container()->element().document().frame())
     return;
+  WebKit::WebFrame* frame = container()->element().document().frame();
   WebKit::WebDOMEvent dom_event = frame->document().createEvent("CustomEvent");
   WebKit::WebDOMCustomEvent event = dom_event.to<WebKit::WebDOMCustomEvent>();
   std::string obfuscated_name = base::StringPrintf("-internal-%s",
                                                    event_name.c_str());
   event.initCustomEvent(
       WebKit::WebString::fromUTF8(obfuscated_name.c_str()),
       false, false,
-      WebKit::WebSerializedScriptValue::serialize(detail));
+      WebKit::WebSerializedScriptValue::serialize(
+          v8::String::New(json_string.c_str())));
   container()->element().dispatchEvent(event);
 }
 
 void BrowserPlugin::Back() {
   if (!navigate_src_sent_)
     return;
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_Go(render_view_routing_id_,
                                   instance_id_, -1));
 }
@@ skipping 475 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content