Title: [219892] trunk/Source/WebCore
- Revision
- 219892
- Author
- dba...@webkit.org
- Date
- 2017-07-25 16:06:29 -0700 (Tue, 25 Jul 2017)
Log Message
Make StyleResolver::isValid{Cue, Region}StyleProperty() static, inline, non-member functions
https://bugs.webkit.org/show_bug.cgi?id=174827
Reviewed by Simon Fraser.
StyleResolver::isValid{Cue, Region}StyleProperty() access neither instance nor
class data. Moreover, they are private member functions and hence cannot be
used outside of StyleResolver's implementation. So, make these static, inline,
non-member functions.
* css/StyleResolver.cpp:
(WebCore::isValidRegionStyleProperty):
(WebCore::isValidCueStyleProperty):
(WebCore::StyleResolver::CascadedProperties::addMatch):
(WebCore::StyleResolver::isValidRegionStyleProperty): Deleted.
(WebCore::StyleResolver::isValidCueStyleProperty): Deleted.
* css/StyleResolver.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (219891 => 219892)
--- trunk/Source/WebCore/ChangeLog 2017-07-25 22:48:56 UTC (rev 219891)
+++ trunk/Source/WebCore/ChangeLog 2017-07-25 23:06:29 UTC (rev 219892)
@@ -1,3 +1,23 @@
+2017-07-25 Daniel Bates <daba...@apple.com>
+
+ Make StyleResolver::isValid{Cue, Region}StyleProperty() static, inline, non-member functions
+ https://bugs.webkit.org/show_bug.cgi?id=174827
+
+ Reviewed by Simon Fraser.
+
+ StyleResolver::isValid{Cue, Region}StyleProperty() access neither instance nor
+ class data. Moreover, they are private member functions and hence cannot be
+ used outside of StyleResolver's implementation. So, make these static, inline,
+ non-member functions.
+
+ * css/StyleResolver.cpp:
+ (WebCore::isValidRegionStyleProperty):
+ (WebCore::isValidCueStyleProperty):
+ (WebCore::StyleResolver::CascadedProperties::addMatch):
+ (WebCore::StyleResolver::isValidRegionStyleProperty): Deleted.
+ (WebCore::StyleResolver::isValidCueStyleProperty): Deleted.
+ * css/StyleResolver.h:
+
2017-07-25 Per Arne Vollan <pvol...@apple.com>
Dragged links are blurry on 1x displays.
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (219891 => 219892)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-07-25 22:48:56 UTC (rev 219891)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-07-25 23:06:29 UTC (rev 219892)
@@ -1474,8 +1474,8 @@
}
// http://dev.w3.org/csswg/css3-regions/#the-at-region-style-rule
-// FIXME: add incremental support for other region styling properties.
-inline bool StyleResolver::isValidRegionStyleProperty(CSSPropertyID id)
+// FIXME: Add incremental support for other region styling properties.
+static inline bool isValidRegionStyleProperty(CSSPropertyID id)
{
switch (id) {
case CSSPropertyBackgroundColor:
@@ -1489,7 +1489,7 @@
}
#if ENABLE(VIDEO_TRACK)
-inline bool StyleResolver::isValidCueStyleProperty(CSSPropertyID id)
+static inline bool isValidCueStyleProperty(CSSPropertyID id)
{
switch (id) {
case CSSPropertyBackground:
@@ -2146,10 +2146,10 @@
}
CSSPropertyID propertyID = current.id();
- if (propertyWhitelistType == PropertyWhitelistRegion && !StyleResolver::isValidRegionStyleProperty(propertyID))
+ if (propertyWhitelistType == PropertyWhitelistRegion && !isValidRegionStyleProperty(propertyID))
continue;
#if ENABLE(VIDEO_TRACK)
- if (propertyWhitelistType == PropertyWhitelistCue && !StyleResolver::isValidCueStyleProperty(propertyID))
+ if (propertyWhitelistType == PropertyWhitelistCue && !isValidCueStyleProperty(propertyID))
continue;
#endif
Modified: trunk/Source/WebCore/css/StyleResolver.h (219891 => 219892)
--- trunk/Source/WebCore/css/StyleResolver.h 2017-07-25 22:48:56 UTC (rev 219891)
+++ trunk/Source/WebCore/css/StyleResolver.h 2017-07-25 23:06:29 UTC (rev 219892)
@@ -327,10 +327,6 @@
void applyCascadedProperties(CascadedProperties&, int firstProperty, int lastProperty, const MatchResult*);
void cascadeMatches(CascadedProperties&, const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
- static bool isValidRegionStyleProperty(CSSPropertyID);
-#if ENABLE(VIDEO_TRACK)
- static bool isValidCueStyleProperty(CSSPropertyID);
-#endif
void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPage, const String& pageName);
void matchPageRulesForList(Vector<StyleRulePage*>& matchedRules, const Vector<StyleRulePage*>&, bool isLeftPage, bool isFirstPage, const String& pageName);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
