binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable.

third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp

 /*
  * 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:
  *
  *     * 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 98 matching lines @@
 
         // MinorGC does not collect objects because it may be expensive to
         // update references during minorGC
         if (classId == WrapperTypeInfo::ObjectClassId) {
             v8::Persistent<v8::Object>::Cast(*value).MarkActive();
             return;
         }
 
         v8::Local<v8::Object> wrapper = v8::Local<v8::Object>::New(m_isolate, v8::Persistent<v8::Object>::Cast(*value));
         ASSERT(V8DOMWrapper::hasInternalFieldsSet(wrapper));
-        if (toWrapperTypeInfo(wrapper)->hasPendingActivity(wrapper)) {
+        if (toWrapperTypeInfo(wrapper)->isActiveScriptWrappable()
+            && toScriptWrappable(wrapper)->hasPendingActivity()) {
             v8::Persistent<v8::Object>::Cast(*value).MarkActive();
             return;
         }
 
         if (classId == WrapperTypeInfo::NodeClassId) {
             ASSERT(V8Node::hasInstance(wrapper, m_isolate));
             Node* node = V8Node::toImpl(wrapper);
             if (node->hasEventListeners()) {
                 v8::Persistent<v8::Object>::Cast(*value).MarkActive();
                 return;
@@ skipping 20 matching lines @@
         , m_liveRootGroupIdSet(false)
         , m_constructRetainedObjectInfos(constructRetainedObjectInfos)
     {
     }
 
     void VisitPersistentHandle(v8::Persistent<v8::Value>* value, uint16_t classId) override
     {
         if (classId != WrapperTypeInfo::NodeClassId && classId != WrapperTypeInfo::ObjectClassId)
             return;
 
+        if (value->IsIndependent())
+            return;
+
         v8::Local<v8::Object> wrapper = v8::Local<v8::Object>::New(m_isolate, v8::Persistent<v8::Object>::Cast(*value));
-        ASSERT(V8DOMWrapper::hasInternalFieldsSet(wrapper));
+        DCHECK(V8DOMWrapper::hasInternalFieldsSet(wrapper));
 
         const WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
-        if (type->hasPendingActivity(wrapper)) {
-            // If you hit this assert, you'll need to add a [DependentiLifetime]
-            // extended attribute to the DOM interface. A DOM interface that
-            // overrides hasPendingActivity must be marked as [DependentLifetime].
-            RELEASE_ASSERT(!value->IsIndependent());
+        if (type->isActiveScriptWrappable()
+            && toScriptWrappable(wrapper)->hasPendingActivity()) {
             m_isolate->SetObjectGroupId(*value, liveRootId());
             ++m_domObjectsWithPendingActivity;
         }
 
-        if (value->IsIndependent())
-            return;
-
         if (classId == WrapperTypeInfo::NodeClassId) {
             DCHECK(V8Node::hasInstance(wrapper, m_isolate));
             Node* node = V8Node::toImpl(wrapper);
             if (node->hasEventListeners())
                 addReferencesForNodeWithEventListeners(m_isolate, node, v8::Persistent<v8::Object>::Cast(*value));
             Node* root = V8GCController::opaqueRootForGC(m_isolate, node);
             m_isolate->SetObjectGroupId(*value, v8::UniqueId(reinterpret_cast<intptr_t>(root)));
             if (m_constructRetainedObjectInfos)
                 m_groupsWhichNeedRetainerInfo.append(root);
         } else if (classId == WrapperTypeInfo::ObjectClassId) {
             type->visitDOMWrapper(m_isolate, toScriptWrappable(wrapper), v8::Persistent<v8::Object>::Cast(*value));
         } else {
-            ASSERT_NOT_REACHED();
+            NOTREACHED();
         }
     }
 
     void notifyFinished()
     {
         if (!m_constructRetainedObjectInfos)
             return;
         std::sort(m_groupsWhichNeedRetainerInfo.begin(), m_groupsWhichNeedRetainerInfo.end());
         Node* alreadyAdded = 0;
         v8::HeapProfiler* profiler = m_isolate->GetHeapProfiler();
@@ skipping 251 matching lines @@
         // we don't need to check other wrappers.
         if (m_pendingActivityFound)
             return;
 
         if (classId != WrapperTypeInfo::NodeClassId && classId != WrapperTypeInfo::ObjectClassId)
             return;
 
         v8::Local<v8::Object> wrapper = v8::Local<v8::Object>::New(m_isolate, v8::Persistent<v8::Object>::Cast(*value));
         ASSERT(V8DOMWrapper::hasInternalFieldsSet(wrapper));
         // The ExecutionContext check is heavy, so it should be done at the last.
-        if (toWrapperTypeInfo(wrapper)->hasPendingActivity(wrapper)
+        if (toWrapperTypeInfo(wrapper)->isActiveScriptWrappable()
+            && toScriptWrappable(wrapper)->hasPendingActivity()
             // TODO(haraken): Currently we don't have a way to get a creation
             // context from a wrapper. We should implement the way and enable
             // the following condition.
             //
             // This condition affects only compositor workers, where one isolate
             // is shared by multiple workers. If we don't have the condition,
             // a worker object for a compositor worker doesn't get collected
             // until all compositor workers in the same isolate lose pending
             // activities. In other words, not having the condition delays
             // destruction of a worker object of a compositor worker.
@@ skipping 20 matching lines @@
     DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, scanPendingActivityHistogram, new CustomCountHistogram("Blink.ScanPendingActivityDuration", 1, 1000, 50));
     double startTime = WTF::currentTimeMS();
     v8::HandleScope scope(isolate);
     PendingActivityVisitor visitor(isolate, executionContext);
     toIsolate(executionContext)->VisitHandlesWithClassIds(&visitor);
     scanPendingActivityHistogram.count(static_cast<int>(WTF::currentTimeMS() - startTime));
     return visitor.pendingActivityFound();
 }
 
 } // namespace blink