Changeset 117248 in webkit

Timestamp:

May 16, 2012 2:58:59 AM (12 years ago)

Author:

abecsi@webkit.org

Message:

[WTR] Visited link tracking is not disabled properly
​https://bugs.webkit.org/show_bug.cgi?id=76699

Reviewed by Jocelyn Turcotte.

Source/WebKit2:

If PLATFORM_STRATEGIES is enabled visited link tracking is done through
VisitedLinkProvider and not through PageGroup.
InjectedBundle sets the shouldTrackVisitedLinks flag on the PageGroup,
thus the shared VisitedLinkTable does get populated with visited links
regardless of the flag.

The WebProcess should only track visited links if tracking is specifically
enabled for a test through WTR's LayoutTestController.

This patch fixes several flacky and failing layout tests on Qt-WK2.

• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::setShouldTrackVisitedLinks): Let the WebProcess
know about visited link tracking.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::setShouldTrackVisitedLinks):
(WebKit::WebProcess::addVisitedLink):

• WebProcess/WebProcess.h:

(WebProcess):

LayoutTests:

• platform/qt-5.0-wk2/Skipped: Unskip passing tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-5.0-wk2/Skipped (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebProcess.cpp (modified) (3 diffs)
• Source/WebKit2/WebProcess/WebProcess.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-16  Andras Becsi  <andras.becsi@nokia.com>
+
+        [WTR] Visited link tracking is not disabled properly
+        https://bugs.webkit.org/show_bug.cgi?id=76699
+
+        Reviewed by Jocelyn Turcotte.
+
+        * platform/qt-5.0-wk2/Skipped: Unskip passing tests.
+
 2012-05-16  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/LayoutTests/platform/qt-5.0-wk2/Skipped

@@ -397 +397 @@
 platform/qt/plugins/qt-qwidget-plugin.html
 
-# [Qt][WK2]REGRESSION(r105461): It made 8 tests fail
-# https://bugs.webkit.org/show_bug.cgi?id=76699
-fast/block/margin-collapse/056.html
-tables/mozilla/marvin/backgr_simple-table-column.html
-tables/mozilla/marvin/backgr_simple-table-row-group.html
-tables/mozilla/marvin/backgr_simple-table-row.html
-tables/mozilla_expected_failures/marvin/backgr_border-table-column.html
-tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html
-tables/mozilla_expected_failures/marvin/backgr_layers-show.html
-tables/mozilla_expected_failures/marvin/backgr_position-table-column.html
-
 # [Qt][WK2] scrollbars/scroll-rtl-or-bt-layer.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=76986
@@ -542 +531 @@
 http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml
 
-# [Qt][WK2]REGRESSION(r105461): It made 8 tests fail and 30 tests flakey
-# https://bugs.webkit.org/show_bug.cgi?id=76699
-tables/mozilla/marvin/backgr_simple-table-cell.html
-
 # [Qt][WK2] Failing http/tests/plugins tests after reenabled plugins
 # https://bugs.webkit.org/show_bug.cgi?id=82895

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-16  Andras Becsi  <andras.becsi@nokia.com>
+
+        [WTR] Visited link tracking is not disabled properly
+        https://bugs.webkit.org/show_bug.cgi?id=76699
+
+        Reviewed by Jocelyn Turcotte.
+
+        If PLATFORM_STRATEGIES is enabled visited link tracking is done through
+        VisitedLinkProvider and not through PageGroup.
+        InjectedBundle sets the shouldTrackVisitedLinks flag on the PageGroup,
+        thus the shared VisitedLinkTable does get populated with visited links
+        regardless of the flag.
+
+        The WebProcess should only track visited links if tracking is specifically
+        enabled for a test through WTR's LayoutTestController.
+
+        This patch fixes several flacky and failing layout tests on Qt-WK2.
+
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::setShouldTrackVisitedLinks): Let the WebProcess
+        know about visited link tracking.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        (WebKit::WebProcess::setShouldTrackVisitedLinks):
+        (WebKit::WebProcess::addVisitedLink):
+        * WebProcess/WebProcess.h:
+        (WebProcess):
+
 2012-05-15  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -112 +112 @@
 void InjectedBundle::setShouldTrackVisitedLinks(bool shouldTrackVisitedLinks)
 {
-    PageGroup::setShouldTrackVisitedLinks(shouldTrackVisitedLinks);
+    WebProcess::shared().setShouldTrackVisitedLinks(shouldTrackVisitedLinks);
 }
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -131 +131 @@
     : ChildProcess(shutdownTimeout)
     , m_inDidClose(false)
+    , m_shouldTrackVisitedLinks(true)
     , m_hasSetCacheModel(false)
     , m_cacheModel(CacheModelDocumentViewer)
@@ -262 +263 @@
 void WebProcess::setShouldTrackVisitedLinks(bool shouldTrackVisitedLinks)
 {
+    m_shouldTrackVisitedLinks = shouldTrackVisitedLinks;
     PageGroup::setShouldTrackVisitedLinks(shouldTrackVisitedLinks);
 }
@@ -345 +347 @@
 void WebProcess::addVisitedLink(WebCore::LinkHash linkHash)
 {
-    if (isLinkVisited(linkHash))
+    if (isLinkVisited(linkHash) || !m_shouldTrackVisitedLinks)
         return;
     connection()->send(Messages::WebContext::AddVisitedLinkHash(linkHash), 0);

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -116 +116 @@
 #endif
     
+    void setShouldTrackVisitedLinks(bool);
     void addVisitedLink(WebCore::LinkHash);
     bool isLinkVisited(WebCore::LinkHash) const;
@@ -168 +169 @@
     void platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*);
     void platformTerminate();
-    void setShouldTrackVisitedLinks(bool);
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&) const;
@@ -262 +262 @@
     // FIXME: The visited link table should not be per process.
     VisitedLinkTable m_visitedLinkTable;
+    bool m_shouldTrackVisitedLinks;
 
     bool m_hasSetCacheModel;