Title: [130093] trunk/Source/WebCore
- Revision
- 130093
- Author
- rn...@webkit.org
- Date
- 2012-10-01 16:12:27 -0700 (Mon, 01 Oct 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (130092 => 130093)
--- trunk/Source/WebCore/ChangeLog 2012-10-01 23:08:52 UTC (rev 130092)
+++ trunk/Source/WebCore/ChangeLog 2012-10-01 23:12:27 UTC (rev 130093)
@@ -1,3 +1,12 @@
+2012-10-01 Ryosuke Niwa <rn...@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 <bda...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=97365
Modified: trunk/Source/WebCore/dom/ContainerNode.h (130092 => 130093)
--- trunk/Source/WebCore/dom/ContainerNode.h 2012-10-01 23:08:52 UTC (rev 130092)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2012-10-01 23:12:27 UTC (rev 130093)
@@ -45,7 +45,8 @@
public:
NoEventDispatchAssertion()
{
- ASSERT(isMainThread());
+ if (!isMainThread())
+ return;
#ifndef NDEBUG
s_count++;
#endif
@@ -53,7 +54,8 @@
~NoEventDispatchAssertion()
{
- ASSERT(isMainThread());
+ if (!isMainThread())
+ return;
ASSERT(s_count);
#ifndef NDEBUG
s_count--;
@@ -61,7 +63,12 @@
}
#ifndef NDEBUG
- static bool isEventDispatchForbidden() { return s_count; }
+ static bool isEventDispatchForbidden()
+ {
+ if (!isMainThread())
+ return false;
+ return s_count;
+ }
#endif
private:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
