Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: Source/core/inspector/JavaScriptCallFrame.cpp

Issue 326853002: Revert of Add an ASSERT about cross-world wrapper leakage into ScriptValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.h ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 return result; 163 return result;
164 } 164 }
165 165
166 v8::Handle<v8::Object> JavaScriptCallFrame::innerCallFrame() 166 v8::Handle<v8::Object> JavaScriptCallFrame::innerCallFrame()
167 { 167 {
168 return m_callFrame.newLocal(m_isolate); 168 return m_callFrame.newLocal(m_isolate);
169 } 169 }
170 170
171 ScriptValue JavaScriptCallFrame::setVariableValue(ScriptState* scriptState, int scopeNumber, const String& variableName, const ScriptValue& newValue) 171 ScriptValue JavaScriptCallFrame::setVariableValue(ScriptState* scriptState, int scopeNumber, const String& variableName, const ScriptValue& newValue)
172 { 172 {
173 ScriptState::Scope scriptScope(scriptState);
174 v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate); 173 v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
175 v8::Handle<v8::Function> setVariableValueFunction = v8::Handle<v8::Function> ::Cast(callFrame->Get(v8AtomicString(m_isolate, "setVariableValue"))); 174 v8::Handle<v8::Function> setVariableValueFunction = v8::Handle<v8::Function> ::Cast(callFrame->Get(v8AtomicString(m_isolate, "setVariableValue")));
176 v8::Handle<v8::Value> argv[] = { 175 v8::Handle<v8::Value> argv[] = {
177 v8::Handle<v8::Value>(v8::Integer::New(m_isolate, scopeNumber)), 176 v8::Handle<v8::Value>(v8::Integer::New(m_isolate, scopeNumber)),
178 v8String(m_isolate, variableName), 177 v8String(m_isolate, variableName),
179 newValue.v8Value() 178 newValue.v8Value()
180 }; 179 };
181 return ScriptValue(scriptState, setVariableValueFunction->Call(callFrame, WT F_ARRAY_LENGTH(argv), argv)); 180 return ScriptValue(scriptState, setVariableValueFunction->Call(callFrame, WT F_ARRAY_LENGTH(argv), argv));
182 } 181 }
183 182
184 } // namespace WebCore 183 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.h ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698