Title: [230887] trunk/Source/_javascript_Core
Revision
230887
Author
carlo...@webkit.org
Date
2018-04-20 23:38:21 -0700 (Fri, 20 Apr 2018)

Log Message

[GLIB] All API tests fail in debug builds
https://bugs.webkit.org/show_bug.cgi?id=184813

Reviewed by Mark Lam.

This is because of a conflict of ExceptionHandler class used in tests and ExceptionHandler struct defined in
JSCContext.cpp. This patch renames the ExceptionHandler struct as JSCContextExceptionHandler.

* API/glib/JSCContext.cpp:
(JSCContextExceptionHandler::JSCContextExceptionHandler):
(JSCContextExceptionHandler::~JSCContextExceptionHandler):
(jscContextConstructed):
(ExceptionHandler::ExceptionHandler): Deleted.
(ExceptionHandler::~ExceptionHandler): Deleted.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/glib/JSCContext.cpp (230886 => 230887)


--- trunk/Source/_javascript_Core/API/glib/JSCContext.cpp	2018-04-21 06:36:12 UTC (rev 230886)
+++ trunk/Source/_javascript_Core/API/glib/JSCContext.cpp	2018-04-21 06:38:21 UTC (rev 230887)
@@ -52,8 +52,8 @@
     PROP_VIRTUAL_MACHINE,
 };
 
-struct ExceptionHandler {
-    ExceptionHandler(JSCExceptionHandler handler, void* userData = nullptr, GDestroyNotify destroyNotifyFunction = nullptr)
+struct JSCContextExceptionHandler {
+    JSCContextExceptionHandler(JSCExceptionHandler handler, void* userData = nullptr, GDestroyNotify destroyNotifyFunction = nullptr)
         : handler(handler)
         , userData(userData)
         , destroyNotifyFunction(destroyNotifyFunction)
@@ -60,13 +60,13 @@
     {
     }
 
-    ~ExceptionHandler()
+    ~JSCContextExceptionHandler()
     {
         if (destroyNotifyFunction)
             destroyNotifyFunction(userData);
     }
 
-    ExceptionHandler(ExceptionHandler&& other)
+    JSCContextExceptionHandler(JSCContextExceptionHandler&& other)
     {
         std::swap(handler, other.handler);
         std::swap(userData, other.userData);
@@ -73,8 +73,8 @@
         std::swap(destroyNotifyFunction, other.destroyNotifyFunction);
     }
 
-    ExceptionHandler(const ExceptionHandler&) = delete;
-    ExceptionHandler& operator=(const ExceptionHandler&) = delete;
+    JSCContextExceptionHandler(const JSCContextExceptionHandler&) = delete;
+    JSCContextExceptionHandler& operator=(const JSCContextExceptionHandler&) = delete;
 
     JSCExceptionHandler handler { nullptr };
     void* userData { nullptr };
@@ -85,7 +85,7 @@
     GRefPtr<JSCVirtualMachine> vm;
     JSRetainPtr<JSGlobalContextRef> jsContext;
     GRefPtr<JSCException> exception;
-    Vector<ExceptionHandler> exceptionHandlers;
+    Vector<JSCContextExceptionHandler> exceptionHandlers;
 };
 
 WEBKIT_DEFINE_TYPE(JSCContext, jsc_context, G_TYPE_OBJECT)
@@ -150,7 +150,7 @@
     if (!context->priv->vm)
         jscContextSetVirtualMachine(context, adoptGRef(jsc_virtual_machine_new()));
 
-    context->priv->exceptionHandlers.append(ExceptionHandler([](JSCContext* context, JSCException* exception, gpointer) {
+    context->priv->exceptionHandlers.append(JSCContextExceptionHandler([](JSCContext* context, JSCException* exception, gpointer) {
         jsc_context_throw_exception(context, exception);
     }));
 }

Modified: trunk/Source/_javascript_Core/ChangeLog (230886 => 230887)


--- trunk/Source/_javascript_Core/ChangeLog	2018-04-21 06:36:12 UTC (rev 230886)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-04-21 06:38:21 UTC (rev 230887)
@@ -1,3 +1,20 @@
+2018-04-20  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GLIB] All API tests fail in debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=184813
+
+        Reviewed by Mark Lam.
+
+        This is because of a conflict of ExceptionHandler class used in tests and ExceptionHandler struct defined in
+        JSCContext.cpp. This patch renames the ExceptionHandler struct as JSCContextExceptionHandler.
+
+        * API/glib/JSCContext.cpp:
+        (JSCContextExceptionHandler::JSCContextExceptionHandler):
+        (JSCContextExceptionHandler::~JSCContextExceptionHandler):
+        (jscContextConstructed):
+        (ExceptionHandler::ExceptionHandler): Deleted.
+        (ExceptionHandler::~ExceptionHandler): Deleted.
+
 2018-04-20  Tim Horton  <timothy_hor...@apple.com>
 
         Adjust geolocation feature flag
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to