Diff
Modified: trunk/Source/WebCore/ChangeLog (200976 => 200977)
--- trunk/Source/WebCore/ChangeLog 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/ChangeLog 2016-05-16 23:11:08 UTC (rev 200977)
@@ -1,3 +1,28 @@
+2016-05-16 Alex Christensen <achristen...@webkit.org>
+
+ Don't include CSSParser.h from other headers
+ https://bugs.webkit.org/show_bug.cgi?id=157765
+
+ Reviewed by Zalan Bujtas.
+
+ No change in behavior. This just makes it so touching CSSParser.h doesn't rebuild as many files.
+
+ * css/CSSCalculationValue.cpp:
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::sourceSize):
+ (WebCore::filterProperties):
+ * css/CSSParser.h:
+ (WebCore::CSSParser::ValueWithCalculation::ValueWithCalculation):
+ * css/CSSProperty.h:
+ (WebCore::prefixingVariantForPropertyId):
+ * css/FontFace.cpp:
+ * css/StyleProperties.cpp:
+ (WebCore::MutableStyleProperties::parseDeclaration):
+ (WebCore::MutableStyleProperties::addParsedProperties):
+ * css/StyleProperties.h:
+ * css/StyleResolver.h:
+ * rendering/style/RenderStyle.cpp:
+
2016-05-16 Aaron Chu <aaron_...@apple.com>
REGRESSION (r200441): Yahoo sports, finance and news pages automatically scroll
Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (200976 => 200977)
--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2016-05-16 23:11:08 UTC (rev 200977)
@@ -32,6 +32,7 @@
#include "config.h"
#include "CSSCalculationValue.h"
+#include "CSSParser.h"
#include "CSSPrimitiveValueMappings.h"
#include "StyleResolver.h"
#include <wtf/MathExtras.h>
Modified: trunk/Source/WebCore/css/CSSParser.cpp (200976 => 200977)
--- trunk/Source/WebCore/css/CSSParser.cpp 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-05-16 23:11:08 UTC (rev 200977)
@@ -1595,7 +1595,7 @@
return SourceSize(WTFMove(_expression_), WTFMove(value));
}
-static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, std::bitset<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenCustomProperties)
+static inline void filterProperties(bool important, const ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, std::bitset<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenCustomProperties)
{
// Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
for (int i = input.size() - 1; i >= 0; --i) {
Modified: trunk/Source/WebCore/css/CSSParser.h (200976 => 200977)
--- trunk/Source/WebCore/css/CSSParser.h 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-05-16 23:11:08 UTC (rev 200977)
@@ -88,8 +88,6 @@
Error
};
- using ParsedPropertyVector = Vector<CSSProperty, 256>;
-
class ValueWithCalculation {
public:
explicit ValueWithCalculation(CSSParserValue& value)
Modified: trunk/Source/WebCore/css/CSSProperty.h (200976 => 200977)
--- trunk/Source/WebCore/css/CSSProperty.h 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/CSSProperty.h 2016-05-16 23:11:08 UTC (rev 200977)
@@ -104,6 +104,8 @@
RefPtr<CSSValue> m_value;
};
+typedef Vector<CSSProperty, 256> ParsedPropertyVector;
+
inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propertyID)
{
ASSERT(propertyID != CSSPropertyInvalid);
Modified: trunk/Source/WebCore/css/FontFace.cpp (200976 => 200977)
--- trunk/Source/WebCore/css/FontFace.cpp 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/FontFace.cpp 2016-05-16 23:11:08 UTC (rev 200977)
@@ -28,6 +28,7 @@
#include "CSSFontFaceSource.h"
#include "CSSFontFeatureValue.h"
+#include "CSSParser.h"
#include "CSSUnicodeRangeValue.h"
#include "CSSValuePool.h"
#include "Document.h"
Modified: trunk/Source/WebCore/css/StyleProperties.cpp (200976 => 200977)
--- trunk/Source/WebCore/css/StyleProperties.cpp 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2016-05-16 23:11:08 UTC (rev 200977)
@@ -818,7 +818,7 @@
return oldProperties != m_propertyVector;
}
-bool MutableStyleProperties::addParsedProperties(const CSSParser::ParsedPropertyVector& properties)
+bool MutableStyleProperties::addParsedProperties(const ParsedPropertyVector& properties)
{
bool anyChanged = false;
m_propertyVector.reserveCapacity(m_propertyVector.size() + properties.size());
Modified: trunk/Source/WebCore/css/StyleProperties.h (200976 => 200977)
--- trunk/Source/WebCore/css/StyleProperties.h 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/StyleProperties.h 2016-05-16 23:11:08 UTC (rev 200977)
@@ -22,7 +22,6 @@
#ifndef StyleProperties_h
#define StyleProperties_h
-#include "CSSParser.h"
#include "CSSParserMode.h"
#include "CSSPrimitiveValue.h"
#include "CSSProperty.h"
@@ -201,7 +200,7 @@
PropertySetCSSStyleDeclaration* cssStyleDeclaration();
- bool addParsedProperties(const CSSParser::ParsedPropertyVector&);
+ bool addParsedProperties(const ParsedPropertyVector&);
bool addParsedProperty(const CSSProperty&);
// These expand shorthand properties into multiple properties.
Modified: trunk/Source/WebCore/css/StyleResolver.h (200976 => 200977)
--- trunk/Source/WebCore/css/StyleResolver.h 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-05-16 23:11:08 UTC (rev 200977)
@@ -62,6 +62,7 @@
class CSSSelector;
class CSSStyleSheet;
class CSSValue;
+class CSSVariableDependentValue;
class ContainerNode;
class Document;
class Element;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (200976 => 200977)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-05-16 23:08:05 UTC (rev 200976)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-05-16 23:11:08 UTC (rev 200977)
@@ -25,6 +25,7 @@
#include "ContentData.h"
#include "CSSCustomPropertyValue.h"
+#include "CSSParser.h"
#include "CSSPropertyNames.h"
#include "CSSVariableDependentValue.h"
#include "CursorList.h"
