Replace IDBPendingTransactionMonitor with end-of-recursion-scope tasks

Source/bindings/core/v8/V8PerIsolateData.h

 /*
  * Copyright (C) 2009 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #ifndef V8PerIsolateData_h
 #define V8PerIsolateData_h
 
 #include "bindings/core/v8/ScopedPersistent.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "bindings/core/v8/WrapperTypeInfo.h"
 #include "gin/public/isolate_holder.h"
-#include "modules/indexeddb/IDBPendingTransactionMonitor.h"
 #include "wtf/HashMap.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 #include <v8.h>
 
 namespace blink {
 
 class DOMDataStore;
 class GCEventData;
 class StringCache;
 struct WrapperTypeInfo;
 
 typedef WTF::Vector<DOMDataStore*> DOMDataStoreList;
 
 class V8PerIsolateData {
 public:
+    class EndOfScopeTask {
+    public:
+        virtual ~EndOfScopeTask() { }
+        virtual void Run() = 0;
+    };
+
     static v8::Isolate* initialize();
     static V8PerIsolateData* from(v8::Isolate* isolate)
     {
         ASSERT(isolate);
         ASSERT(isolate->GetData(gin::kEmbedderBlink));
         return static_cast<V8PerIsolateData*>(isolate->GetData(gin::kEmbedderBlink));
     }
 
     static void willBeDestroyed(v8::Isolate*);
     static void destroy(v8::Isolate*);
@@ skipping 34 matching lines @@
     void setDOMTemplate(void* domTemplateKey, v8::Handle<v8::FunctionTemplate>);
 
     bool hasInstance(const WrapperTypeInfo*, v8::Handle<v8::Value>);
     v8::Handle<v8::Object> findInstanceInPrototypeChain(const WrapperTypeInfo*, v8::Handle<v8::Value>);
 
     v8::Local<v8::Context> ensureScriptRegexpContext();
 
     const char* previousSamplingState() const { return m_previousSamplingState; }
     void setPreviousSamplingState(const char* name) { m_previousSamplingState = name; }
 
-    IDBPendingTransactionMonitor* ensureIDBPendingTransactionMonitor();
+    // EndOfScopeTasks are run by V8RecursionScope when control is returning
+    // to C++ from script, after executing a script task (e.g. callback,
+    // event) or microtasks (e.g. promise). This is explicitly needed for
+    // Indexed DB transactions per spec, but should in general be avoided.
+    void addEndOfScopeTask(PassOwnPtr<EndOfScopeTask>);
+    void runEndOfScopeTasks();
+    void clearEndOfScopeTasks();
 
 private:
     V8PerIsolateData();
     ~V8PerIsolateData();
 
     typedef HashMap<const void*, v8::Eternal<v8::FunctionTemplate> > DOMTemplateMap;
     DOMTemplateMap& currentDOMTemplateMap();
     bool hasInstance(const WrapperTypeInfo*, v8::Handle<v8::Value>, DOMTemplateMap&);
     v8::Handle<v8::Object> findInstanceInPrototypeChain(const WrapperTypeInfo*, v8::Handle<v8::Value>, DOMTemplateMap&);
 
@@ skipping 15 matching lines @@
     int m_recursionLevel;
     bool m_isHandlingRecursionLevelError;
     bool m_isReportingException;
 
 #if ENABLE(ASSERT)
     int m_internalScriptRecursionLevel;
 #endif
     OwnPtr<GCEventData> m_gcEventData;
     bool m_performingMicrotaskCheckpoint;
 
-    OwnPtr<IDBPendingTransactionMonitor> m_idbPendingTransactionMonitor;
+    Vector<OwnPtr<EndOfScopeTask>> m_endOfScopeTasks;
 };
 
 } // namespace blink
 
 #endif // V8PerIsolateData_h