Title: [183776] trunk/Source/WebCore
- Revision
- 183776
- Author
- [email protected]
- Date
- 2015-05-04 16:10:34 -0700 (Mon, 04 May 2015)
Log Message
Unreviewed. Fix build with SECURITY_ASSERTIONS enabled.
<rdar://problem/20653104>
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::ScriptExecutionContext):
(WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache):
(WebCore::ScriptExecutionContext::suspendActiveDOMObjects):
(WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
* dom/ScriptExecutionContext.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183775 => 183776)
--- trunk/Source/WebCore/ChangeLog 2015-05-04 22:53:10 UTC (rev 183775)
+++ trunk/Source/WebCore/ChangeLog 2015-05-04 23:10:34 UTC (rev 183776)
@@ -1,3 +1,15 @@
+2015-05-04 Chris Dumez <[email protected]>
+
+ Unreviewed. Fix build with SECURITY_ASSERTIONS enabled.
+ <rdar://problem/20653104>
+
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::ScriptExecutionContext):
+ (WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache):
+ (WebCore::ScriptExecutionContext::suspendActiveDOMObjects):
+ (WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
+ * dom/ScriptExecutionContext.h:
+
2015-05-04 Simon Fraser <[email protected]>
Fix updating of tiled backing opaquenss when the page background color changes
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (183775 => 183776)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-05-04 22:53:10 UTC (rev 183775)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-05-04 23:10:34 UTC (rev 183776)
@@ -81,6 +81,8 @@
, m_timerNestingLevel(0)
#if !ASSERT_DISABLED
, m_inScriptExecutionContextDestructor(false)
+#endif
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
, m_activeDOMObjectRemovalForbidden(false)
#endif
{
@@ -181,7 +183,7 @@
bool canSuspend = true;
m_activeDOMObjectAdditionForbidden = true;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
m_activeDOMObjectRemovalForbidden = true;
#endif
@@ -201,7 +203,7 @@
}
m_activeDOMObjectAdditionForbidden = false;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
m_activeDOMObjectRemovalForbidden = false;
#endif
@@ -220,7 +222,7 @@
#endif
m_activeDOMObjectAdditionForbidden = true;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
m_activeDOMObjectRemovalForbidden = true;
#endif
@@ -233,7 +235,7 @@
activeDOMObject->suspend(why);
m_activeDOMObjectAdditionForbidden = false;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
m_activeDOMObjectRemovalForbidden = false;
#endif
@@ -250,7 +252,7 @@
m_activeDOMObjectsAreSuspended = false;
m_activeDOMObjectAdditionForbidden = true;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
m_activeDOMObjectRemovalForbidden = true;
#endif
@@ -263,7 +265,7 @@
activeDOMObject->resume();
m_activeDOMObjectAdditionForbidden = false;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
m_activeDOMObjectRemovalForbidden = false;
#endif
}
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (183775 => 183776)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-05-04 22:53:10 UTC (rev 183775)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-05-04 23:10:34 UTC (rev 183776)
@@ -237,6 +237,8 @@
#if !ASSERT_DISABLED
bool m_inScriptExecutionContextDestructor;
+#endif
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
bool m_activeDOMObjectRemovalForbidden;
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
