Changeset 70997 in webkit

Timestamp:

Oct 31, 2010 1:20:42 PM (14 years ago)

Author:

Darin Adler

Message:

2010-10-31 Darin Adler <Darin Adler>

Reviewed by Dan Bernstein.

Visited links not populated correctly in new web processes after the first
​https://bugs.webkit.org/show_bug.cgi?id=48735
rdar://problem/8442177

• UIProcess/VisitedLinkProvider.cpp: (WebKit::VisitedLinkProvider::VisitedLinkProvider): Initialize m_webProcessHasVisitedLinkState. (WebKit::VisitedLinkProvider::processDidFinishLaunching): Renamed from populateVisitedLinksIfNeeded. Set m_webProcessHasVisitedLinkState to false, since this is a new process, and also start the timer so the visited links messages will be sent. (WebKit::VisitedLinkProvider::processDidClose): Renamed from stopVisitedLinksTimer. (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired): Added logic so we send SetVisitedLinkTable and AllVisitedLinkStateChanged once to each new process and to set m_webProcessHasVisitedLinkState to true once that is done.

• UIProcess/VisitedLinkProvider.h: Updated for above changes.

• UIProcess/WebContext.cpp: (WebKit::WebContext::processDidFinishLaunching): Called VisitedLinkProvider function under its new name. Also used ASSERT_UNUSED rather than ASSERT since the argument is used only for the assertion. (WebKit::WebContext::processDidClose): Ditto.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/VisitedLinkProvider.cpp (modified) (6 diffs)
• UIProcess/VisitedLinkProvider.h (modified) (2 diffs)
• UIProcess/WebContext.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-31  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Visited links not populated correctly in new web processes after the first
+        https://bugs.webkit.org/show_bug.cgi?id=48735
+        rdar://problem/8442177
+
+        * UIProcess/VisitedLinkProvider.cpp:
+        (WebKit::VisitedLinkProvider::VisitedLinkProvider): Initialize
+        m_webProcessHasVisitedLinkState.
+        (WebKit::VisitedLinkProvider::processDidFinishLaunching): Renamed
+        from populateVisitedLinksIfNeeded. Set m_webProcessHasVisitedLinkState
+        to false, since this is a new process, and also start the timer
+        so the visited links messages will be sent.
+        (WebKit::VisitedLinkProvider::processDidClose): Renamed from
+        stopVisitedLinksTimer.
+        (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
+        Added logic so we send SetVisitedLinkTable and
+        AllVisitedLinkStateChanged once to each new process and to set
+        m_webProcessHasVisitedLinkState to true once that is done.
+
+        * UIProcess/VisitedLinkProvider.h: Updated for above changes.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::processDidFinishLaunching): Called
+        VisitedLinkProvider function under its new name. Also used
+        ASSERT_UNUSED rather than ASSERT since the argument is used
+        only for the assertion.
+        (WebKit::WebContext::processDidClose): Ditto.
+
 2010-10-30  Andreas Kling  <kling@webkit.org>
 

trunk/WebKit2/UIProcess/VisitedLinkProvider.cpp

@@ -40 +40 @@
     : m_context(context)
     , m_visitedLinksPopulated(false)
+    , m_webProcessHasVisitedLinkState(false)
     , m_keyCount(0)
     , m_tableSize(0)
@@ -46 +47 @@
 }
 
-void VisitedLinkProvider::populateVisitedLinksIfNeeded()
+void VisitedLinkProvider::processDidFinishLaunching()
 {
+    m_webProcessHasVisitedLinkState = false;
+
+    if (m_keyCount)
+        m_pendingVisitedLinksTimer.startOneShot(0);
+
     if (m_visitedLinksPopulated)
         return;
@@ -64 +70 @@
 }
 
-void VisitedLinkProvider::stopVisitedLinksTimer()
+void VisitedLinkProvider::processDidClose()
 {
     m_pendingVisitedLinksTimer.stop();
@@ -150 +156 @@
     m_keyCount += pendingVisitedLinks.size();
 
-    if (currentTableSize != newTableSize) {
+    if (!m_webProcessHasVisitedLinkState || currentTableSize != newTableSize) {
         // Send the new visited link table.
         
@@ -161 +167 @@
     
     // We now need to let the web process know that we've added links.
-    if (addedVisitedLinks.size() <= 20) {
+    if (m_webProcessHasVisitedLinkState && addedVisitedLinks.size() <= 20) {
         m_context->process()->send(Messages::WebProcess::VisitedLinkStateChanged(addedVisitedLinks), 0);
         return;
@@ -168 +174 @@
     // Just recalculate all the visited links.
     m_context->process()->send(Messages::WebProcess::AllVisitedLinkStateChanged(), 0);
+    m_webProcessHasVisitedLinkState = true;
 }
 

trunk/WebKit2/UIProcess/VisitedLinkProvider.h

@@ -42 +42 @@
     explicit VisitedLinkProvider(WebContext*);
 
-    void populateVisitedLinksIfNeeded();
     void addVisitedLink(WebCore::LinkHash);
 
-    void stopVisitedLinksTimer();
+    void processDidFinishLaunching();
+    void processDidClose();
 
 private:
@@ -52 +52 @@
     WebContext* m_context;
     bool m_visitedLinksPopulated;
+    bool m_webProcessHasVisitedLinkState;
 
     unsigned m_keyCount;

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -190 +190 @@
 {
     // FIXME: Once we support multiple processes per context, this assertion won't hold.
-    ASSERT(process == m_process);
-
-    m_visitedLinkProvider.populateVisitedLinksIfNeeded();
+    ASSERT_UNUSED(process, process == m_process);
+
+    m_visitedLinkProvider.processDidFinishLaunching();
 }
 
@@ -198 +198 @@
 {
     // FIXME: Once we support multiple processes per context, this assertion won't hold.
-    ASSERT(process == m_process);
-
-    m_visitedLinkProvider.stopVisitedLinksTimer();
+    ASSERT_UNUSED(process, process == m_process);
+
+    m_visitedLinkProvider.processDidClose();
 
     m_process = 0;