Changeset 246881 in webkit

Timestamp:

Jun 27, 2019 8:38:57 AM (5 years ago)

Author:

Konstantin Tokarev

Message:

Use JSC_GLIB_API_ENABLED instead of USE(GLIB) as a compile-time check for GLib JSC API
​https://bugs.webkit.org/show_bug.cgi?id=199270

Reviewed by Michael Catanzaro.

This change allows building code with enabled USE(GLIB) but without
GLib JSC API.

• heap/Heap.cpp:

(JSC::Heap::releaseDelayedReleasedObjects):

• heap/Heap.h:
• heap/HeapInlines.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (2 diffs)
• heap/Heap.h (modified) (3 diffs)
• heap/HeapInlines.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-27  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Use JSC_GLIB_API_ENABLED instead of USE(GLIB) as a compile-time check for GLib JSC API
+        https://bugs.webkit.org/show_bug.cgi?id=199270
+
+        Reviewed by Michael Catanzaro.
+
+        This change allows building code with enabled USE(GLIB) but without
+        GLib JSC API.
+
+        * heap/Heap.cpp:
+        (JSC::Heap::releaseDelayedReleasedObjects):
+        * heap/Heap.h:
+        * heap/HeapInlines.h:
+
 2019-06-27  Devin Rousso  <drousso@apple.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -97 +97 @@
 #endif
 
-#if USE(GLIB)
+#ifdef JSC_GLIB_API_ENABLED
 #include "JSCGLibWrapperObject.h"
 #endif
@@ -478 +478 @@
 void Heap::releaseDelayedReleasedObjects()
 {
-#if USE(FOUNDATION) || USE(GLIB)
+#if USE(FOUNDATION) || defined(JSC_GLIB_API_ENABLED)
     // We need to guard against the case that releasing an object can create more objects due to the
     // release calling into JS. When those JS call(s) exit and all locks are being dropped we end up

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -87 +87 @@
 struct CurrentThreadState;
 
-#if USE(GLIB)
+#ifdef JSC_GLIB_API_ENABLED
 class JSCGLibWrapperObject;
 #endif
@@ -280 +280 @@
     template<typename T> void releaseSoon(RetainPtr<T>&&);
 #endif
-#if USE(GLIB)
+#ifdef JSC_GLIB_API_ENABLED
     void releaseSoon(std::unique_ptr<JSCGLibWrapperObject>&&);
 #endif
@@ -665 +665 @@
     unsigned m_delayedReleaseRecursionCount { 0 };
 #endif
-#if USE(GLIB)
+#ifdef JSC_GLIB_API_ENABLED
     Vector<std::unique_ptr<JSCGLibWrapperObject>> m_delayedReleaseObjects;
     unsigned m_delayedReleaseRecursionCount { 0 };

trunk/Source/JavaScriptCore/heap/HeapInlines.h

@@ -165 +165 @@
 #endif
 
-#if USE(GLIB)
+#ifdef JSC_GLIB_API_ENABLED
 inline void Heap::releaseSoon(std::unique_ptr<JSCGLibWrapperObject>&& object)
 {