Title: [154894] trunk/Source/WebCore
- Revision
- 154894
- Author
- [email protected]
- Date
- 2013-08-30 10:46:50 -0700 (Fri, 30 Aug 2013)
Log Message
Try to fix CSS_VARIABLES and CSS_DEVICE_ADAPTATION builds.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::StyleResolver):
(WebCore::StyleResolver::resolveVariables):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154893 => 154894)
--- trunk/Source/WebCore/ChangeLog 2013-08-30 17:43:46 UTC (rev 154893)
+++ trunk/Source/WebCore/ChangeLog 2013-08-30 17:46:50 UTC (rev 154894)
@@ -1,3 +1,11 @@
+2013-08-30 Andreas Kling <[email protected]>
+
+ Try to fix CSS_VARIABLES and CSS_DEVICE_ADAPTATION builds.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::StyleResolver):
+ (WebCore::StyleResolver::resolveVariables):
+
2013-08-30 Commit Queue <[email protected]>
Unreviewed, rolling out r154891.
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (154893 => 154894)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-08-30 17:43:46 UTC (rev 154893)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-08-30 17:46:50 UTC (rev 154894)
@@ -251,7 +251,7 @@
, m_matchAuthorAndUserStyles(matchAuthorAndUserStyles)
, m_fontSelector(CSSFontSelector::create(&m_document))
#if ENABLE(CSS_DEVICE_ADAPTATION)
- , m_viewportStyleResolver(ViewportStyleResolver::create(document))
+ , m_viewportStyleResolver(ViewportStyleResolver::create(&document))
#endif
, m_deprecatedStyleBuilder(DeprecatedStyleBuilder::sharedStyleBuilder())
, m_styleMap(this)
@@ -2038,7 +2038,7 @@
// FIXME: It would be faster not to re-parse from strings, but for now CSS property validation lives inside the parser so we do it there.
RefPtr<MutableStylePropertySet> resultSet = MutableStylePropertySet::create();
- if (!CSSParser::parseValue(resultSet.get(), id, _expression_.second, false, document()))
+ if (!CSSParser::parseValue(resultSet.get(), id, _expression_.second, false, &document()))
return; // _expression_ failed to parse.
for (unsigned i = 0; i < resultSet->propertyCount(); i++) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
