diff options
| author | dcarney@chromium.org <dcarney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 04:36:59 +0000 |
|---|---|---|
| committer | dcarney@chromium.org <dcarney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 04:36:59 +0000 |
| commit | 392b99e300bc61ccf0b22c3f1d3f849af17db9b1 (patch) | |
| tree | 46049ac996e5c47cdbcdd489462a6becfac92daf | |
| parent | 6e3cabd71371330273c7fe096924e559ccaa477e (diff) | |
| download | chromium_src-392b99e300bc61ccf0b22c3f1d3f849af17db9b1.zip chromium_src-392b99e300bc61ccf0b22c3f1d3f849af17db9b1.tar.gz chromium_src-392b99e300bc61ccf0b22c3f1d3f849af17db9b1.tar.bz2 | |
Add handle scopes around executeScriptAndReturnValue callsites
webkit
R=jochen@chromium.org
TBR=jam@chromium.org
BUG=https://bugs.webkit.org/show_bug.cgi?id=110206
Review URL: https://chromiumcodereview.appspot.com/12335006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184024 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/searchbox/searchbox_extension.cc | 2 | ||||
| -rw-r--r-- | content/public/test/render_view_test.cc | 1 | ||||
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin_browsertest.cc | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index 8233bda..501168f 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -871,7 +871,7 @@ v8::Extension* SearchBoxExtension::Get() { // static bool SearchBoxExtension::PageSupportsInstant(WebKit::WebFrame* frame) { if (!frame) return false; - + v8::HandleScope handle_scope; v8::Handle<v8::Value> v = frame->executeScriptAndReturnValue( WebKit::WebScriptSource(kSupportsInstantScript)); return !v.IsEmpty() && v->BooleanValue(); diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index c896057..e0fb125 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -90,6 +90,7 @@ void RenderViewTest::ExecuteJavaScript(const char* js) { bool RenderViewTest::ExecuteJavaScriptAndReturnIntValue( const string16& script, int* int_result) { + v8::HandleScope handle_scope; v8::Handle<v8::Value> result = GetMainFrame()->executeScriptAndReturnValue(WebScriptSource(script)); if (result.IsEmpty() || !result->IsInt32()) diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc index 35b4a36..5fe4d13 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc @@ -99,6 +99,7 @@ void BrowserPluginTest::TearDown() { std::string BrowserPluginTest::ExecuteScriptAndReturnString( const std::string& script) { + v8::HandleScope handle_scope; v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue( WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str()))); if (value.IsEmpty() || !value->IsString()) @@ -113,6 +114,7 @@ std::string BrowserPluginTest::ExecuteScriptAndReturnString( int BrowserPluginTest::ExecuteScriptAndReturnInt( const std::string& script) { + v8::HandleScope handle_scope; v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue( WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str()))); if (value.IsEmpty() || !value->IsInt32()) @@ -125,6 +127,7 @@ int BrowserPluginTest::ExecuteScriptAndReturnInt( // of the script is stored in |result| bool BrowserPluginTest::ExecuteScriptAndReturnBool( const std::string& script, bool* result) { + v8::HandleScope handle_scope; v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue( WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str()))); if (value.IsEmpty() || !value->IsBoolean()) |