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

Unified Diff: Source/WebCore/bindings/v8/ScriptState.h

Issue 12560005: Merge 139854 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/WebCore/bindings/v8/SerializedScriptValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/bindings/v8/ScriptState.h
===================================================================
--- Source/WebCore/bindings/v8/ScriptState.h (revision 145017)
+++ Source/WebCore/bindings/v8/ScriptState.h (working copy)
@@ -63,6 +63,13 @@
return v8::Local<v8::Context>::New(m_context.get());
}
+ v8::Isolate* isolate()
+ {
+ if (!m_isolate)
+ m_isolate = v8::Isolate::GetCurrent();
+ return m_isolate;
+ }
+
DOMWindow* domWindow() const;
ScriptExecutionContext* scriptExecutionContext() const;
@@ -81,6 +88,7 @@
v8::Local<v8::Value> m_exception;
ScopedPersistent<v8::Context> m_context;
+ v8::Isolate* m_isolate;
};
class EmptyScriptState : public ScriptState {
« no previous file with comments | « no previous file | Source/WebCore/bindings/v8/SerializedScriptValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698