Title: [198658] trunk/Source/WebCore
- Revision
- 198658
- Author
- [email protected]
- Date
- 2016-03-24 19:24:51 -0700 (Thu, 24 Mar 2016)
Log Message
Unreviewed, rolling out r198500.
Roll back in r197552 as it did not seem to cause a PLT
regression after all
Reverted changeset:
"Unreviewed, rolling out r197552."
https://bugs.webkit.org/show_bug.cgi?id=154986
http://trac.webkit.org/changeset/198500
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (198657 => 198658)
--- trunk/Source/WebCore/ChangeLog 2016-03-25 02:14:14 UTC (rev 198657)
+++ trunk/Source/WebCore/ChangeLog 2016-03-25 02:24:51 UTC (rev 198658)
@@ -1,3 +1,16 @@
+2016-03-24 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r198500.
+
+ Roll back in r197552 as it did not seem to cause a PLT
+ regression after all
+
+ Reverted changeset:
+
+ "Unreviewed, rolling out r197552."
+ https://bugs.webkit.org/show_bug.cgi?id=154986
+ http://trac.webkit.org/changeset/198500
+
2016-03-24 Daniel Bates <[email protected]>
CSP: Move logic for reporting a violation from ContentSecurityPolicyDirectiveList to ContentSecurityPolicy
Modified: trunk/Source/WebCore/dom/Document.cpp (198657 => 198658)
--- trunk/Source/WebCore/dom/Document.cpp 2016-03-25 02:14:14 UTC (rev 198657)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-03-25 02:24:51 UTC (rev 198658)
@@ -533,7 +533,7 @@
, m_scheduledTasksAreSuspended(false)
, m_visualUpdatesAllowed(true)
, m_visualUpdatesSuppressionTimer(*this, &Document::visualUpdatesSuppressionTimerFired)
- , m_sharedObjectPoolClearTimer(*this, &Document::sharedObjectPoolClearTimerFired)
+ , m_sharedObjectPoolClearTimer(*this, &Document::clearSharedObjectPool)
#ifndef NDEBUG
, m_didDispatchViewportPropertiesChanged(false)
#endif
@@ -4645,6 +4645,7 @@
clearStyleResolver();
clearSelectorQueryCache();
+ clearSharedObjectPool();
} else {
if (childNeedsStyleRecalc())
scheduleStyleRecalc();
@@ -5091,9 +5092,10 @@
m_cachedResourceLoader->clearPreloads();
}
-void Document::sharedObjectPoolClearTimerFired()
+void Document::clearSharedObjectPool()
{
m_sharedObjectPool = nullptr;
+ m_sharedObjectPoolClearTimer.stop();
}
#if ENABLE(TELEPHONE_NUMBER_DETECTION)
Modified: trunk/Source/WebCore/dom/Document.h (198657 => 198658)
--- trunk/Source/WebCore/dom/Document.h 2016-03-25 02:14:14 UTC (rev 198657)
+++ trunk/Source/WebCore/dom/Document.h 2016-03-25 02:24:51 UTC (rev 198658)
@@ -1723,7 +1723,7 @@
RefPtr<NamedFlowCollection> m_namedFlows;
- void sharedObjectPoolClearTimerFired();
+ void clearSharedObjectPool();
Timer m_sharedObjectPoolClearTimer;
std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
