Changeset 130093 in webkit

Timestamp:

Oct 1, 2012, 4:12:27 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

Build fix. Clearly, these objects could be instantiated in worker threads.
Not sure why my patch asserted that we're in the main thread.

• dom/ContainerNode.h:

(WebCore::NoEventDispatchAssertion::NoEventDispatchAssertion):
(WebCore::NoEventDispatchAssertion::~NoEventDispatchAssertion):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-01  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix. Clearly, these objects could be instantiated in worker threads.
+        Not sure why my patch asserted that we're in the main thread.
+
+        * dom/ContainerNode.h:
+        (WebCore::NoEventDispatchAssertion::NoEventDispatchAssertion):
+        (WebCore::NoEventDispatchAssertion::~NoEventDispatchAssertion):
+
 2012-10-01  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.h

@@ -46 +46 @@
     NoEventDispatchAssertion()
     {
-        ASSERT(isMainThread());
+        if (!isMainThread())
+            return;
 #ifndef NDEBUG
         s_count++;
@@ -54 +55 @@
     ~NoEventDispatchAssertion()
     {
-        ASSERT(isMainThread());
+        if (!isMainThread())
+            return;
         ASSERT(s_count);
 #ifndef NDEBUG
@@ -62 +64 @@
 
 #ifndef NDEBUG
-    static bool isEventDispatchForbidden() { return s_count; }
+    static bool isEventDispatchForbidden()
+    {
+        if (!isMainThread())
+            return false;
+        return s_count;
+    }
 #endif