Merge 139854

Source/WebCore/bindings/v8/ScriptState.h

 /*
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
         m_exception = exception;
     }
     v8::Local<v8::Value> exception() { return m_exception; }
     void clearException() { m_exception.Clear(); }
 
     v8::Local<v8::Context> context() const
     {
         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;
 
     static ScriptState* forContext(v8::Local<v8::Context>);
     static ScriptState* current();
 
 protected:
     ScriptState() { }
     ~ScriptState();
 
 private:
     friend ScriptState* mainWorldScriptState(Frame*);
     explicit ScriptState(v8::Handle<v8::Context>);
 
     static void weakReferenceCallback(v8::Persistent<v8::Value> object, void* parameter);
 
     v8::Local<v8::Value> m_exception;
     ScopedPersistent<v8::Context> m_context;
+    v8::Isolate* m_isolate;
 };
 
 class EmptyScriptState : public ScriptState {
 public:
     EmptyScriptState() : ScriptState() { }
     ~EmptyScriptState() { }
 };
 
 class ScriptStateProtectedPtr {
     WTF_MAKE_NONCOPYABLE(ScriptStateProtectedPtr);
@@ skipping 32 matching lines @@
 #if ENABLE(WORKERS)
 ScriptState* scriptStateFromWorkerContext(WorkerContext*);
 #endif
 
 inline DOMWrapperWorld* debuggerWorld() { return mainThreadNormalWorld(); }
 inline DOMWrapperWorld* pluginWorld() { return mainThreadNormalWorld(); }
 
 }
 
 #endif // ScriptState_h