Attachment 373025 Details for Bug 199270 – Patch

[patch] Patch

bug-199270-20190627162214.patch (text/plain), 3.34 KB, created by Konstantin Tokarev on 2019-06-27 06:22:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Tokarev

Created: 2019-06-27 06:22:15 PDT

Size: 3.34 KB

patch

obsolete

>Subversion Revision: 246878
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 420b5eae9bdef9225bae6e294ea70600428f292e..09e1fcf8fbee4d2fbbc04ba46d484c5fbe57c4d3 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        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>
> 
>         Web Inspector: throw an error if console.count/console.countReset is called with an object that throws an error from toString
>diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp
>index a532754a93650443bba10dd5057da86d4ca82d46..b7e4301a4a995d5c56d8b26bcd53b0f8e436b664 100644
>--- a/Source/JavaScriptCore/heap/Heap.cpp
>+++ b/Source/JavaScriptCore/heap/Heap.cpp
>@@ -96,7 +96,7 @@
> #include <wtf/spi/cocoa/objcSPI.h>
> #endif
> 
>-#if USE(GLIB)
>+#ifdef JSC_GLIB_API_ENABLED
> #include "JSCGLibWrapperObject.h"
> #endif
> 
>@@ -477,7 +477,7 @@ void Heap::lastChanceToFinalize()
> 
> 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
>     // back here and could try to recursively release objects. We guard that with a recursive entry
>diff --git a/Source/JavaScriptCore/heap/Heap.h b/Source/JavaScriptCore/heap/Heap.h
>index 7c751765a5b92d6e6d9bbdf392afa22a99b3ba92..181ce8f8759c1a9558278c12b26e062370872317 100644
>--- a/Source/JavaScriptCore/heap/Heap.h
>+++ b/Source/JavaScriptCore/heap/Heap.h
>@@ -86,7 +86,7 @@ class VM;
> class WeakGCMapBase;
> struct CurrentThreadState;
> 
>-#if USE(GLIB)
>+#ifdef JSC_GLIB_API_ENABLED
> class JSCGLibWrapperObject;
> #endif
> 
>@@ -279,7 +279,7 @@ public:
> #if USE(FOUNDATION)
>     template<typename T> void releaseSoon(RetainPtr<T>&&);
> #endif
>-#if USE(GLIB)
>+#ifdef JSC_GLIB_API_ENABLED
>     void releaseSoon(std::unique_ptr<JSCGLibWrapperObject>&&);
> #endif
> 
>@@ -664,7 +664,7 @@ private:
>     Vector<RetainPtr<CFTypeRef>> m_delayedReleaseObjects;
>     unsigned m_delayedReleaseRecursionCount { 0 };
> #endif
>-#if USE(GLIB)
>+#ifdef JSC_GLIB_API_ENABLED
>     Vector<std::unique_ptr<JSCGLibWrapperObject>> m_delayedReleaseObjects;
>     unsigned m_delayedReleaseRecursionCount { 0 };
> #endif
>diff --git a/Source/JavaScriptCore/heap/HeapInlines.h b/Source/JavaScriptCore/heap/HeapInlines.h
>index 8197730c2fc8a0e74dd06b56dfc5afccaf59a61d..5b69cd5e35f62b50663a9cbdc7394d1bd67ad1d8 100644
>--- a/Source/JavaScriptCore/heap/HeapInlines.h
>+++ b/Source/JavaScriptCore/heap/HeapInlines.h
>@@ -164,7 +164,7 @@ inline void Heap::releaseSoon(RetainPtr<T>&& object)
> }
> #endif
> 
>-#if USE(GLIB)
>+#ifdef JSC_GLIB_API_ENABLED
> inline void Heap::releaseSoon(std::unique_ptr<JSCGLibWrapperObject>&& object)
> {
>     m_delayedReleaseObjects.append(WTFMove(object));

Actions: View | Formatted Diff | Diff

Attachments on bug 199270: 373025