Unreviewed, rolling out r198500.
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2016 02:24:51 +0000 (02:24 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2016 02:24:51 +0000 (02:24 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h

index dce2f44..44e7b15 100644 (file)
@@ -1,3 +1,16 @@
+2016-03-24  Chris Dumez  <cdumez@apple.com>
+
+        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  <dabates@apple.com>
 
         CSP: Move logic for reporting a violation from ContentSecurityPolicyDirectiveList to ContentSecurityPolicy
index 793dba0..0cfa005 100644 (file)
@@ -533,7 +533,7 @@ Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsig
     , 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 @@ void Document::setInPageCache(bool flag)
 
         clearStyleResolver();
         clearSelectorQueryCache();
+        clearSharedObjectPool();
     } else {
         if (childNeedsStyleRecalc())
             scheduleStyleRecalc();
@@ -5091,9 +5092,10 @@ void Document::finishedParsing()
     m_cachedResourceLoader->clearPreloads();
 }
 
-void Document::sharedObjectPoolClearTimerFired()
+void Document::clearSharedObjectPool()
 {
     m_sharedObjectPool = nullptr;
+    m_sharedObjectPoolClearTimer.stop();
 }
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
index de4b379..d180a90 100644 (file)
@@ -1723,7 +1723,7 @@ private:
 
     RefPtr<NamedFlowCollection> m_namedFlows;
 
-    void sharedObjectPoolClearTimerFired();
+    void clearSharedObjectPool();
     Timer m_sharedObjectPoolClearTimer;
 
     std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool;