Title: [224840] trunk/Source/WebCore
- Revision
- 224840
- Author
- [email protected]
- Date
- 2017-11-14 13:26:48 -0800 (Tue, 14 Nov 2017)
Log Message
Remove StyleResolver::State::document()
https://bugs.webkit.org/show_bug.cgi?id=179678
Reviewed by Antoine Quint.
We don't need both StyleResolver::document() and StyleResolver::State::document().
* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::updateConversionData):
(WebCore::StyleResolver::resolvedVariableValue):
(WebCore::StyleResolver::colorFromPrimitiveValue const):
(WebCore::StyleResolver::createFilterOperations):
* css/StyleResolver.h:
(WebCore::StyleResolver::State::document const): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (224839 => 224840)
--- trunk/Source/WebCore/ChangeLog 2017-11-14 21:22:51 UTC (rev 224839)
+++ trunk/Source/WebCore/ChangeLog 2017-11-14 21:26:48 UTC (rev 224840)
@@ -1,3 +1,20 @@
+2017-11-14 Antti Koivisto <[email protected]>
+
+ Remove StyleResolver::State::document()
+ https://bugs.webkit.org/show_bug.cgi?id=179678
+
+ Reviewed by Antoine Quint.
+
+ We don't need both StyleResolver::document() and StyleResolver::State::document().
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::State::updateConversionData):
+ (WebCore::StyleResolver::resolvedVariableValue):
+ (WebCore::StyleResolver::colorFromPrimitiveValue const):
+ (WebCore::StyleResolver::createFilterOperations):
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::State::document const): Deleted.
+
2017-11-14 Dean Jackson <[email protected]>
Stub implementations of OffscreenCanvas getContext and transferToImageBitmap
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (224839 => 224840)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-11-14 21:22:51 UTC (rev 224839)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-11-14 21:26:48 UTC (rev 224840)
@@ -319,7 +319,7 @@
inline void StyleResolver::State::updateConversionData()
{
- m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), m_rootElementStyle, m_element ? document().renderView() : nullptr);
+ m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), m_rootElementStyle, m_element ? m_element->document().renderView() : nullptr);
}
inline void StyleResolver::State::setStyle(std::unique_ptr<RenderStyle> style)
@@ -1702,7 +1702,7 @@
RefPtr<CSSValue> StyleResolver::resolvedVariableValue(CSSPropertyID propID, const CSSValue& value)
{
- CSSParser parser(m_state.document());
+ CSSParser parser(document());
return parser.parseValueWithVariableReferences(propID, value, m_state.style()->customProperties(), m_state.style()->direction(), m_state.style()->writingMode());
}
@@ -1826,11 +1826,11 @@
case 0:
return Color();
case CSSValueWebkitText:
- return state.document().textColor();
+ return document().textColor();
case CSSValueWebkitLink:
- return (state.element()->isLink() && forVisitedLink) ? state.document().visitedLinkColor() : state.document().linkColor();
+ return (state.element()->isLink() && forVisitedLink) ? document().visitedLinkColor() : document().linkColor();
case CSSValueWebkitActivelink:
- return state.document().activeLinkColor();
+ return document().activeLinkColor();
case CSSValueWebkitFocusRingColor:
return RenderTheme::focusRingColor();
case CSSValueCurrentcolor:
@@ -1928,7 +1928,7 @@
continue;
String cssUrl = primitiveValue.stringValue();
- URL url = ""
+ URL url = ""
RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(cssUrl, url.fragmentIdentifier());
operations.operations().append(operation);
Modified: trunk/Source/WebCore/css/StyleResolver.h (224839 => 224840)
--- trunk/Source/WebCore/css/StyleResolver.h 2017-11-14 21:22:51 UTC (rev 224839)
+++ trunk/Source/WebCore/css/StyleResolver.h 2017-11-14 21:26:48 UTC (rev 224840)
@@ -348,7 +348,6 @@
public:
void clear();
- Document& document() const { return m_element->document(); }
const Element* element() const { return m_element; }
void setStyle(std::unique_ptr<RenderStyle>);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
