Diff
Modified: trunk/Source/WebCore/ChangeLog (95603 => 95604)
--- trunk/Source/WebCore/ChangeLog 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebCore/ChangeLog 2011-09-21 08:59:13 UTC (rev 95604)
@@ -1,3 +1,16 @@
+2011-09-21 Andras Becsi <[email protected]>
+
+ [Qt] Remove Qt specific code from css/SelectorChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=67702
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests needed.
+
+ * css/SelectorChecker.cpp: Move Qt-specific code to the Qt-specific WebPlatformStrategies.
+ (WebCore::SelectorChecker::determineLinkStateSlowCase):
+ * platform/VisitedLinkStrategy.h:
+
2011-09-16 MORITA Hajime <[email protected]>
Style changes on forwarded shadow children should trigger shadow renderer reconstruction.
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (95603 => 95604)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2011-09-21 08:59:13 UTC (rev 95604)
@@ -59,11 +59,6 @@
#include "XLinkNames.h"
#endif
-#if PLATFORM(QT)
-//FIXME: Remove this Qt specific code from a platform neutral file.
-#include <qwebhistoryinterface.h>
-#endif
-
namespace WebCore {
using namespace HTMLNames;
@@ -230,29 +225,11 @@
const AtomicString* attr = linkAttribute(element);
if (!attr || attr->isNull())
return NotInsideLink;
-
-#if PLATFORM(QT)
- //FIXME: Remove this Qt specific code from a platform neutral file.
- Vector<UChar, 512> url;
- visitedURL(m_document->baseURL(), *attr, url);
- if (url.isEmpty())
- return InsideUnvisitedLink;
-
- // If the Qt4.4 interface for the history is used, we will have to fallback
- // to the old global history.
- QWebHistoryInterface* iface = QWebHistoryInterface::defaultInterface();
- if (iface)
- return iface->historyContains(QString(reinterpret_cast<QChar*>(url.data()), url.size())) ? InsideVisitedLink : InsideUnvisitedLink;
-
- LinkHash hash = visitedLinkHash(url.data(), url.size());
- if (!hash)
- return InsideUnvisitedLink;
-#else
+
LinkHash hash = visitedLinkHash(m_document->baseURL(), *attr);
if (!hash)
return InsideUnvisitedLink;
-#endif
-
+
Frame* frame = m_document->frame();
if (!frame)
return InsideUnvisitedLink;
@@ -264,7 +241,7 @@
m_linksCheckedForVisitedState.add(hash);
#if USE(PLATFORM_STRATEGIES)
- return platformStrategies()->visitedLinkStrategy()->isLinkVisited(page, hash) ? InsideVisitedLink : InsideUnvisitedLink;
+ return platformStrategies()->visitedLinkStrategy()->isLinkVisited(page, hash, m_document->baseURL(), *attr) ? InsideVisitedLink : InsideUnvisitedLink;
#else
return page->group().isLinkVisited(hash) ? InsideVisitedLink : InsideUnvisitedLink;
#endif
Modified: trunk/Source/WebCore/platform/VisitedLinkStrategy.h (95603 => 95604)
--- trunk/Source/WebCore/platform/VisitedLinkStrategy.h 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebCore/platform/VisitedLinkStrategy.h 2011-09-21 08:59:13 UTC (rev 95604)
@@ -32,10 +32,11 @@
typedef uint64_t LinkHash;
class Page;
+class KURL;
class VisitedLinkStrategy {
public:
- virtual bool isLinkVisited(Page*, LinkHash) = 0;
+ virtual bool isLinkVisited(Page*, LinkHash, const KURL& baseURL, const AtomicString& attributeURL) = 0;
virtual void addVisitedLink(Page*, LinkHash) = 0;
protected:
Modified: trunk/Source/WebKit/mac/ChangeLog (95603 => 95604)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-21 08:59:13 UTC (rev 95604)
@@ -1,3 +1,14 @@
+2011-09-21 Andras Becsi <[email protected]>
+
+ [Qt] Remove Qt specific code from css/SelectorChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=67702
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::isLinkVisited):
+
2011-09-20 Anders Carlsson <[email protected]>
Remove ScrollView::platformContentsSize
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (95603 => 95604)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:59:13 UTC (rev 95604)
@@ -51,7 +51,7 @@
virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
// WebCore::VisitedLinkStrategy
- virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash);
+ virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL);
virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
};
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (95603 => 95604)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2011-09-21 08:59:13 UTC (rev 95604)
@@ -81,7 +81,7 @@
END_BLOCK_OBJC_EXCEPTIONS;
}
-bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash)
+bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash, const KURL&, const AtomicString&)
{
return page->group().isLinkVisited(hash);
}
Modified: trunk/Source/WebKit/qt/ChangeLog (95603 => 95604)
--- trunk/Source/WebKit/qt/ChangeLog 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-09-21 08:59:13 UTC (rev 95604)
@@ -1,3 +1,14 @@
+2011-09-21 Andras Becsi <[email protected]>
+
+ [Qt] Remove Qt specific code from css/SelectorChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=67702
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp: Check the Qt global history here, instead of a platform independent file.
+ (WebPlatformStrategies::isLinkVisited):
+ * WebCoreSupport/WebPlatformStrategies.h:
+
2011-09-20 Jarred Nicholls <[email protected]>
[Qt] Permit qrc resources to load in QWebSettings::setUserStyleSheetUrl()
Modified: trunk/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp (95603 => 95604)
--- trunk/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp 2011-09-21 08:59:13 UTC (rev 95604)
@@ -39,6 +39,7 @@
#include <PluginDatabase.h>
#include <QCoreApplication>
#include <QLocale>
+#include <qwebhistoryinterface.h>
#include <qwebpage.h>
#include <qwebpluginfactory.h>
#include <wtf/MathExtras.h>
@@ -743,8 +744,19 @@
// VisitedLinkStrategy
-bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash)
+bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash, const KURL& baseURL, const AtomicString& attributeURL)
{
+ ASSERT(hash);
+
+ Vector<UChar, 512> url;
+ visitedURL(baseURL, attributeURL, url);
+
+ // If the Qt4.4 interface for the history is used, we will have to fallback
+ // to the old global history.
+ QWebHistoryInterface* iface = QWebHistoryInterface::defaultInterface();
+ if (iface)
+ return iface->historyContains(QString(reinterpret_cast<QChar*>(url.data()), url.size()));
+
return page->group().isLinkVisited(hash);
}
Modified: trunk/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h (95603 => 95604)
--- trunk/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:59:13 UTC (rev 95604)
@@ -153,7 +153,7 @@
virtual WTF::String validationMessageStepMismatchText();
// WebCore::VisitedLinkStrategy
- virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash);
+ virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL);
virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
};
Modified: trunk/Source/WebKit/win/ChangeLog (95603 => 95604)
--- trunk/Source/WebKit/win/ChangeLog 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/win/ChangeLog 2011-09-21 08:59:13 UTC (rev 95604)
@@ -1,3 +1,14 @@
+2011-09-21 Andras Becsi <[email protected]>
+
+ [Qt] Remove Qt specific code from css/SelectorChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=67702
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp: Modify to match new prototype.
+ (WebPlatformStrategies::isLinkVisited):
+ * WebCoreSupport/WebPlatformStrategies.h: Ditto.
+
2011-09-17 Mihai Parparita <[email protected]>
FrameLoaderClient BackForwardList-related methods are unsued
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (95603 => 95604)
--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2011-09-21 08:59:13 UTC (rev 95604)
@@ -99,7 +99,7 @@
}
}
-bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash)
+bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash, const KURL&, const AtomicString&)
{
return page->group().isLinkVisited(hash);
}
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h (95603 => 95604)
--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:59:13 UTC (rev 95604)
@@ -51,7 +51,7 @@
virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
// WebCore::VisitedLinkStrategy
- virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash);
+ virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL);
virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
};
Modified: trunk/Source/WebKit/wince/ChangeLog (95603 => 95604)
--- trunk/Source/WebKit/wince/ChangeLog 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/wince/ChangeLog 2011-09-21 08:59:13 UTC (rev 95604)
@@ -1,3 +1,14 @@
+2011-09-21 Andras Becsi <[email protected]>
+
+ [Qt] Remove Qt specific code from css/SelectorChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=67702
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCoreSupport/PlatformStrategiesWinCE.cpp:
+ (PlatformStrategiesWinCE::addVisitedLink):
+ * WebCoreSupport/PlatformStrategiesWinCE.h:
+
2011-09-17 Mihai Parparita <[email protected]>
FrameLoaderClient BackForwardList-related methods are unsued
Modified: trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp (95603 => 95604)
--- trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.cpp 2011-09-21 08:59:13 UTC (rev 95604)
@@ -676,7 +676,7 @@
return page->group().isLinkVisited(hash);
}
-void PlatformStrategiesWinCE::addVisitedLink(Page* page, LinkHash hash)
+void PlatformStrategiesWinCE::addVisitedLink(Page* page, LinkHash hash, const KURL&, const AtomicString&)
{
page->group().addVisitedLinkHash(hash);
}
Modified: trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h (95603 => 95604)
--- trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit/wince/WebCoreSupport/PlatformStrategiesWinCE.h 2011-09-21 08:59:13 UTC (rev 95604)
@@ -148,7 +148,7 @@
virtual WTF::String validationMessageStepMismatchText();
// WebCore::VisitedLinkStrategy
- virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash);
+ virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL&, const WTF::AtomicString&);
virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
};
Modified: trunk/Source/WebKit2/ChangeLog (95603 => 95604)
--- trunk/Source/WebKit2/ChangeLog 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-21 08:59:13 UTC (rev 95604)
@@ -1,3 +1,15 @@
+2011-09-21 Andras Becsi <[email protected]>
+
+ [Qt] Remove Qt specific code from css/SelectorChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=67702
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Modify to match new prototype.
+ (WebKit::WebPlatformStrategies::isLinkVisited):
+ (WebKit::WebPlatformStrategies::addVisitedLink):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h: Ditto.
+
2011-09-20 Anders Carlsson <[email protected]>
Get rid of PluginView::setBoundsSize from WebKit2
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (95603 => 95604)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2011-09-21 08:59:13 UTC (rev 95604)
@@ -115,12 +115,12 @@
// VisitedLinkStrategy
-bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash linkHash)
+bool WebPlatformStrategies::isLinkVisited(Page*, LinkHash linkHash, const KURL&, const AtomicString&)
{
return WebProcess::shared().isLinkVisited(linkHash);
}
-void WebPlatformStrategies::addVisitedLink(Page* page, LinkHash linkHash)
+void WebPlatformStrategies::addVisitedLink(Page*, LinkHash linkHash)
{
WebProcess::shared().addVisitedLink(linkHash);
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (95603 => 95604)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:41:57 UTC (rev 95603)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2011-09-21 08:59:13 UTC (rev 95604)
@@ -56,7 +56,7 @@
void populatePluginCache();
// WebCore::VisitedLinkStrategy
- virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash);
+ virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash, const WebCore::KURL& baseURL, const WTF::AtomicString& attributeURL);
virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash);
bool m_pluginCacheIsPopulated;
