Title: [154291] trunk/Source/WebCore
- Revision
- 154291
- Author
- psola...@apple.com
- Date
- 2013-08-19 12:43:47 -0700 (Mon, 19 Aug 2013)
Log Message
<https://webkit.org/b/120019> Document::visitedLinkState() should return a reference
Reviewed by Andreas Kling.
Document::m_visitedLinkState is never NULL so we can just return a reference. Also make it a const.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::initElement):
* dom/Document.h:
(WebCore::Document::visitedLinkState):
* history/CachedPage.cpp:
(WebCore::CachedPage::restore):
* page/Page.cpp:
(WebCore::Page::allVisitedStateChanged):
(WebCore::Page::visitedStateChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154290 => 154291)
--- trunk/Source/WebCore/ChangeLog 2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/ChangeLog 2013-08-19 19:43:47 UTC (rev 154291)
@@ -1,3 +1,21 @@
+2013-08-19 Pratik Solanki <psola...@apple.com>
+
+ <https://webkit.org/b/120019> Document::visitedLinkState() should return a reference
+
+ Reviewed by Andreas Kling.
+
+ Document::m_visitedLinkState is never NULL so we can just return a reference. Also make it a const.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::State::initElement):
+ * dom/Document.h:
+ (WebCore::Document::visitedLinkState):
+ * history/CachedPage.cpp:
+ (WebCore::CachedPage::restore):
+ * page/Page.cpp:
+ (WebCore::Page::allVisitedStateChanged):
+ (WebCore::Page::visitedStateChanged):
+
2013-08-19 Ryosuke Niwa <rn...@webkit.org>
ASSERTION FAILED: !node || node->isShadowRoot() in WebCore::EventRetargeter::eventTargetRespectingTargetRules
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (154290 => 154291)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-08-19 19:43:47 UTC (rev 154291)
@@ -409,7 +409,7 @@
{
m_element = e;
m_styledElement = e && e->isStyledElement() ? static_cast<StyledElement*>(e) : 0;
- m_elementLinkState = e ? e->document()->visitedLinkState()->determineLinkState(e) : NotInsideLink;
+ m_elementLinkState = e ? e->document()->visitedLinkState().determineLinkState(e) : NotInsideLink;
}
inline void StyleResolver::initElement(Element* e)
Modified: trunk/Source/WebCore/dom/Document.h (154290 => 154291)
--- trunk/Source/WebCore/dom/Document.h 2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/dom/Document.h 2013-08-19 19:43:47 UTC (rev 154291)
@@ -651,7 +651,7 @@
void resetLinkColor();
void resetVisitedLinkColor();
void resetActiveLinkColor();
- VisitedLinkState* visitedLinkState() const { return m_visitedLinkState.get(); }
+ VisitedLinkState& visitedLinkState() const { return *m_visitedLinkState; }
MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const LayoutPoint&, const PlatformMouseEvent&);
@@ -1350,7 +1350,7 @@
Color m_linkColor;
Color m_visitedLinkColor;
Color m_activeLinkColor;
- OwnPtr<VisitedLinkState> m_visitedLinkState;
+ const OwnPtr<VisitedLinkState> m_visitedLinkState;
bool m_visuallyOrdered;
ReadyState m_readyState;
Modified: trunk/Source/WebCore/history/CachedPage.cpp (154290 => 154291)
--- trunk/Source/WebCore/history/CachedPage.cpp 2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/history/CachedPage.cpp 2013-08-19 19:43:47 UTC (rev 154291)
@@ -90,7 +90,7 @@
if (m_needStyleRecalcForVisitedLinks) {
for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
- frame->document()->visitedLinkState()->invalidateStyleForAllLinks();
+ frame->document()->visitedLinkState().invalidateStyleForAllLinks();
}
#if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/page/Page.cpp (154290 => 154291)
--- trunk/Source/WebCore/page/Page.cpp 2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/page/Page.cpp 2013-08-19 19:43:47 UTC (rev 154291)
@@ -1072,7 +1072,7 @@
if (page->m_group != group)
continue;
for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree()->traverseNext())
- frame->document()->visitedLinkState()->invalidateStyleForAllLinks();
+ frame->document()->visitedLinkState().invalidateStyleForAllLinks();
}
}
@@ -1088,7 +1088,7 @@
if (page->m_group != group)
continue;
for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree()->traverseNext())
- frame->document()->visitedLinkState()->invalidateStyleForLink(linkHash);
+ frame->document()->visitedLinkState().invalidateStyleForLink(linkHash);
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
