Index: chrome/renderer/extensions/dom_activity_logger.cc |
diff --git a/chrome/renderer/extensions/dom_activity_logger.cc b/chrome/renderer/extensions/dom_activity_logger.cc |
index 95d1c11b08f2aad195d2235aa3250776fe409e47..eda050debe7a5bf9b75fa84120127a77927b87ec 100644 |
--- a/chrome/renderer/extensions/dom_activity_logger.cc |
+++ b/chrome/renderer/extensions/dom_activity_logger.cc |
@@ -8,6 +8,7 @@ |
#include "chrome/common/extensions/dom_action_types.h" |
#include "chrome/common/extensions/extension_messages.h" |
#include "chrome/renderer/chrome_render_process_observer.h" |
+#include "chrome/renderer/extensions/activity_log_converter_strategy.h" |
#include "content/public/renderer/render_thread.h" |
#include "content/public/renderer/v8_value_converter.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
@@ -30,6 +31,11 @@ void DOMActivityLogger::log( |
const v8::Handle<v8::Value> argv[], |
const WebString& call_type) { |
scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create()); |
+ ActivityLogConverterStrategy strategy; |
+ // Do not set the converter's RegExpr to true via SetRegExpAllowed() as this |
pmarch
2013/08/08 00:53:07
killed comment as well
|
+ // will call JS toString() method which can be overwritten. |
+ converter->SetFunctionAllowed(true); |
+ converter->SetStrategy(&strategy); |
scoped_ptr<ListValue> argv_list_value(new ListValue()); |
for (int i =0; i < argc; i++) { |
argv_list_value->Set( |