Diff
Modified: trunk/LayoutTests/ChangeLog (121186 => 121187)
--- trunk/LayoutTests/ChangeLog 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/ChangeLog 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,3 +1,31 @@
+2012-06-25 Alpha Lam <[email protected]>
+
+ Unreviewed, rolling out r121129.
+ http://trac.webkit.org/changeset/121129
+ https://bugs.webkit.org/show_bug.cgi?id=89542
+
+ Chromium ASan failure: crbug.com/134402
+
+ * fast/css/variables/border-width.html:
+ * fast/css/variables/build-supports-variables-expected.txt: Removed.
+ * fast/css/variables/build-supports-variables.html: Removed.
+ * fast/css/variables/colors-test.html:
+ * fast/css/variables/complex-cycle.html:
+ * fast/css/variables/computed-style.html:
+ * fast/css/variables/inherited-values.html:
+ * fast/css/variables/inline-styles.html:
+ * fast/css/variables/invalid-shorthand.html:
+ * fast/css/variables/invalid-variable-value.html:
+ * fast/css/variables/multi-level-cycle.html:
+ * fast/css/variables/redefinition.html:
+ * fast/css/variables/shorthand.html:
+ * fast/css/variables/simple-cycle.html:
+ * fast/css/variables/transform-test.html:
+ * fast/css/variables/undefined.html:
+ * fast/css/variables/use-before-defined.html:
+ * fast/css/variables/var-inside-shorthand.html:
+ * fast/css/variables/variable-chain.html:
+
2012-06-25 Raymond Toy <[email protected]>
Add layout tests for audio codecs
Modified: trunk/LayoutTests/fast/css/variables/border-width.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/border-width.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/border-width.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
div {
border-color: green;
Deleted: trunk/LayoutTests/fast/css/variables/build-supports-variables-expected.txt (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/build-supports-variables-expected.txt 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/build-supports-variables-expected.txt 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1 +0,0 @@
-YES
Deleted: trunk/LayoutTests/fast/css/variables/build-supports-variables.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/build-supports-variables.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/build-supports-variables.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,9 +0,0 @@
-<body>NO</body>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-
-internals.settings.setCSSVariablesEnabled(true);
-if (internals.settings.cssVariablesEnabled())
- document.body.innerHTML = "YES";
-</script>
Modified: trunk/LayoutTests/fast/css/variables/colors-test.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/colors-test.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/colors-test.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-foreground: green;
Modified: trunk/LayoutTests/fast/css/variables/complex-cycle.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/complex-cycle.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/complex-cycle.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-a: -webkit-var(f);
Modified: trunk/LayoutTests/fast/css/variables/computed-style.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/computed-style.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/computed-style.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-a: bold;
Modified: trunk/LayoutTests/fast/css/variables/inherited-values.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/inherited-values.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/inherited-values.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-foreground: green;
Modified: trunk/LayoutTests/fast/css/variables/inline-styles.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/inline-styles.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/inline-styles.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<body style="-webkit-var-a: green;">
<div style="color: -webkit-var(a);">
This text should be green on a white background.
Modified: trunk/LayoutTests/fast/css/variables/invalid-shorthand.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/invalid-shorthand.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/invalid-shorthand.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
div {
-webkit-var-a: 10px solid green;
Modified: trunk/LayoutTests/fast/css/variables/invalid-variable-value.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/invalid-variable-value.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/invalid-variable-value.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
div {
-webkit-var-a: green;
Modified: trunk/LayoutTests/fast/css/variables/multi-level-cycle.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/multi-level-cycle.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/multi-level-cycle.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
.a {
-webkit-var-a: -webkit-var(b);
Modified: trunk/LayoutTests/fast/css/variables/redefinition.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/redefinition.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/redefinition.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-a: red;
Modified: trunk/LayoutTests/fast/css/variables/shorthand.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/shorthand.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/shorthand.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
div {
-webkit-var-myborder: 10px solid green;
Modified: trunk/LayoutTests/fast/css/variables/simple-cycle.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/simple-cycle.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/simple-cycle.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-a: -webkit-var(a);
Modified: trunk/LayoutTests/fast/css/variables/transform-test.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/transform-test.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/transform-test.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
div {
display: inline-block;
Modified: trunk/LayoutTests/fast/css/variables/undefined.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/undefined.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/undefined.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
border: -webkit-var(myborder);
Modified: trunk/LayoutTests/fast/css/variables/use-before-defined.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/use-before-defined.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/use-before-defined.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
div {
color: -webkit-var(a);
Modified: trunk/LayoutTests/fast/css/variables/var-inside-shorthand.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/var-inside-shorthand.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/var-inside-shorthand.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-MyBorderColor: green;
Modified: trunk/LayoutTests/fast/css/variables/variable-chain.html (121186 => 121187)
--- trunk/LayoutTests/fast/css/variables/variable-chain.html 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/LayoutTests/fast/css/variables/variable-chain.html 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,6 +1,3 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
<style>
body {
-webkit-var-c: green;
Modified: trunk/Source/WebCore/ChangeLog (121186 => 121187)
--- trunk/Source/WebCore/ChangeLog 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/ChangeLog 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,3 +1,30 @@
+2012-06-25 Alpha Lam <[email protected]>
+
+ Unreviewed, rolling out r121129.
+ http://trac.webkit.org/changeset/121129
+ https://bugs.webkit.org/show_bug.cgi?id=89542
+
+ Chromium ASan failure: crbug.com/134402
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParserContext::CSSParserContext):
+ (WebCore::operator==):
+ (WebCore):
+ (WebCore::CSSParser::detectDashToken):
+ (WebCore::CSSParser::lex):
+ * css/CSSParser.h:
+ (CSSParser):
+ * css/CSSParserMode.h:
+ (CSSParserContext):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+ * page/Settings.h:
+ (Settings):
+ * testing/InternalSettings.cpp:
+ * testing/InternalSettings.h:
+ (InternalSettings):
+ * testing/InternalSettings.idl:
+
2012-06-25 Adam Barth <[email protected]>
Use InterpolationLow on chromium-android
Modified: trunk/Source/WebCore/css/CSSParser.cpp (121186 => 121187)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-06-25 22:19:03 UTC (rev 121187)
@@ -194,9 +194,6 @@
, isCSSCustomFilterEnabled(false)
, isCSSRegionsEnabled(false)
, isCSSGridLayoutEnabled(false)
-#if ENABLE(CSS_VARIABLES)
- , isCSSVariablesEnabled(false)
-#endif
, needsSiteSpecificQuirks(false)
, enforcesCSSMIMETypeInNoQuirksMode(true)
{
@@ -210,9 +207,6 @@
, isCSSCustomFilterEnabled(document->settings() ? document->settings()->isCSSCustomFilterEnabled() : false)
, isCSSRegionsEnabled(document->cssRegionsEnabled())
, isCSSGridLayoutEnabled(document->cssGridLayoutEnabled())
-#if ENABLE(CSS_VARIABLES)
- , isCSSVariablesEnabled(document->settings() ? document->settings()->cssVariablesEnabled() : false)
-#endif
, needsSiteSpecificQuirks(document->settings() ? document->settings()->needsSiteSpecificQuirks() : false)
, enforcesCSSMIMETypeInNoQuirksMode(!document->settings() || document->settings()->enforceCSSMIMETypeInNoQuirksMode())
{
@@ -227,9 +221,6 @@
&& a.isCSSCustomFilterEnabled == b.isCSSCustomFilterEnabled
&& a.isCSSRegionsEnabled == b.isCSSRegionsEnabled
&& a.isCSSGridLayoutEnabled == b.isCSSGridLayoutEnabled
-#if ENABLE(CSS_VARIABLES)
- && a.isCSSVariablesEnabled == b.isCSSVariablesEnabled
-#endif
&& a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
&& a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode;
}
@@ -1091,25 +1082,6 @@
return static_pointer_cast<CSSValueList>(dummyStyle->getPropertyCSSValue(CSSPropertyFontFamily));
}
-#if ENABLE(CSS_VARIABLES)
-bool CSSParser::parseValue(StylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, Document* document)
-{
- ASSERT(!string.isEmpty());
-
- CSSParserContext context(document);
-
- if (parseSimpleLengthValue(declaration, propertyID, string, important, context.mode))
- return true;
- if (parseColorValue(declaration, propertyID, string, important, context.mode))
- return true;
- if (parseKeywordValue(declaration, propertyID, string, important, context))
- return true;
-
- CSSParser parser(context);
- return parser.parseValue(declaration, propertyID, string, important, static_cast<StyleSheetContents*>(0));
-}
-#endif
-
bool CSSParser::parseValue(StylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
{
ASSERT(!string.isEmpty());
@@ -2991,11 +2963,6 @@
}
#if ENABLE(CSS_VARIABLES)
-bool CSSParser::cssVariablesEnabled() const
-{
- return m_context.isCSSVariablesEnabled;
-}
-
void CSSParser::storeVariableDeclaration(const CSSParserString& name, PassOwnPtr<CSSParserValueList> value, bool important)
{
StringBuilder builder;
@@ -8625,7 +8592,7 @@
else if (isASCIIAlphaCaselessEqual(name[10], 'x') && isEqualToCSSIdentifier(name + 1, "webkit-ma"))
m_token = MAXFUNCTION;
#if ENABLE(CSS_VARIABLES)
- else if (cssVariablesEnabled() && isASCIIAlphaCaselessEqual(name[10], 'r') && isEqualToCSSIdentifier(name + 1, "webkit-va"))
+ else if (isASCIIAlphaCaselessEqual(name[10], 'r') && isEqualToCSSIdentifier(name + 1, "webkit-va"))
m_token = VARFUNCTION;
#endif
} else if (length == 12 && isEqualToCSSIdentifier(name + 1, "webkit-calc"))
@@ -8967,7 +8934,7 @@
case CharacterDash:
#if ENABLE(CSS_VARIABLES)
- if (cssVariablesEnabled() && m_currentCharacter[10] == '-' && isEqualToCSSIdentifier(m_currentCharacter, "webkit-var") && isIdentifierStartAfterDash(m_currentCharacter + 11)) {
+ if (m_currentCharacter[10] == '-' && isEqualToCSSIdentifier(m_currentCharacter, "webkit-var") && isIdentifierStartAfterDash(m_currentCharacter + 11)) {
// handle variable declarations
m_currentCharacter += 11;
parseIdentifier(result, hasEscape);
Modified: trunk/Source/WebCore/css/CSSParser.h (121186 => 121187)
--- trunk/Source/WebCore/css/CSSParser.h 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/css/CSSParser.h 2012-06-25 22:19:03 UTC (rev 121187)
@@ -92,8 +92,6 @@
bool parseQuotes(CSSPropertyID, bool important);
#if ENABLE(CSS_VARIABLES)
- static bool parseValue(StylePropertySet*, CSSPropertyID, const String&, bool important, Document*);
- bool cssVariablesEnabled() const;
void storeVariableDeclaration(const CSSParserString&, PassOwnPtr<CSSParserValueList>, bool important);
#endif
Modified: trunk/Source/WebCore/css/CSSParserMode.h (121186 => 121187)
--- trunk/Source/WebCore/css/CSSParserMode.h 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/css/CSSParserMode.h 2012-06-25 22:19:03 UTC (rev 121187)
@@ -66,9 +66,6 @@
bool isCSSCustomFilterEnabled;
bool isCSSRegionsEnabled;
bool isCSSGridLayoutEnabled;
-#if ENABLE(CSS_VARIABLES)
- bool isCSSVariablesEnabled;
-#endif
bool needsSiteSpecificQuirks;
bool enforcesCSSMIMETypeInNoQuirksMode;
};
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (121186 => 121187)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-06-25 22:19:03 UTC (rev 121187)
@@ -3325,7 +3325,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<StylePropertySet> resultSet = StylePropertySet::create();
- if (!CSSParser::parseValue(resultSet.get(), id, _expression_.second, false, document()))
+ if (!CSSParser::parseValue(resultSet.get(), id, _expression_.second, false, CSSStrictMode, 0))
return; // _expression_ failed to parse.
for (unsigned i = 0; i < resultSet->propertyCount(); i++) {
Modified: trunk/Source/WebCore/page/Settings.h (121186 => 121187)
--- trunk/Source/WebCore/page/Settings.h 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/page/Settings.h 2012-06-25 22:19:03 UTC (rev 121187)
@@ -331,14 +331,6 @@
bool cssRegionsEnabled() const { return false; }
#endif
-#if ENABLE(CSS_VARIABLES)
- void setCSSVariablesEnabled(bool enabled) { m_cssVariablesEnabled = enabled; }
- bool cssVariablesEnabled() const { return true; }
-#else
- void setCSSVariablesEnabled(bool) { }
- bool cssVariablesEnabled() const { return false; }
-#endif
-
void setRegionBasedColumnsEnabled(bool enabled) { m_regionBasedColumnsEnabled = enabled; }
bool regionBasedColumnsEnabled() const { return m_regionBasedColumnsEnabled; }
@@ -685,9 +677,6 @@
#if ENABLE(CSS_REGIONS)
bool m_cssRegionsEnabled : 1;
#endif
-#if ENABLE(CSS_VARIABLES)
- bool m_cssVariablesEnabled : 1;
-#endif
bool m_regionBasedColumnsEnabled : 1;
bool m_cssGridLayoutEnabled : 1;
bool m_downloadableBinaryFontsEnabled : 1;
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (121186 => 121187)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-06-25 22:19:03 UTC (rev 121187)
@@ -348,18 +348,6 @@
RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled);
}
-void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setCSSVariablesEnabled(enabled);
-}
-
-bool InternalSettings::cssVariablesEnabled(ExceptionCode& ec)
-{
- InternalSettingsGuardForSettingsReturn(false);
- return settings()->cssVariablesEnabled();
-}
-
void InternalSettings::setMediaPlaybackRequiresUserGesture(bool enabled, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
Modified: trunk/Source/WebCore/testing/InternalSettings.h (121186 => 121187)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-06-25 22:19:03 UTC (rev 121187)
@@ -75,8 +75,6 @@
void setEnableScrollAnimator(bool enabled, ExceptionCode&);
bool scrollAnimatorEnabled(ExceptionCode&);
void setCSSExclusionsEnabled(bool enabled, ExceptionCode&);
- void setCSSVariablesEnabled(bool enabled, ExceptionCode&);
- bool cssVariablesEnabled(ExceptionCode&);
void setMediaPlaybackRequiresUserGesture(bool, ExceptionCode&);
void setEditingBehavior(const String&, ExceptionCode&);
void setFixedPositionCreatesStackingContext(bool, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (121186 => 121187)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2012-06-25 22:19:03 UTC (rev 121187)
@@ -54,8 +54,6 @@
void setEnableScrollAnimator(in boolean enabled) raises(DOMException);
boolean scrollAnimatorEnabled() raises(DOMException);
void setCSSExclusionsEnabled(in boolean enabled) raises(DOMException);
- void setCSSVariablesEnabled(in boolean enabled) raises(DOMException);
- boolean cssVariablesEnabled() raises(DOMException);
void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
void setEditingBehavior(in DOMString behavior) raises(DOMException);
void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
Modified: trunk/Source/WebKit/chromium/ChangeLog (121186 => 121187)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-25 22:19:03 UTC (rev 121187)
@@ -1,5 +1,19 @@
2012-06-25 Alpha Lam <[email protected]>
+ Unreviewed, rolling out r121129.
+ http://trac.webkit.org/changeset/121129
+ https://bugs.webkit.org/show_bug.cgi?id=89542
+
+ Chromium ASan failure: crbug.com/134402
+
+ * features.gypi:
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
+2012-06-25 Alpha Lam <[email protected]>
+
Roll Chromium DEPS to r144020
https://bugs.webkit.org/show_bug.cgi?id=89912
Modified: trunk/Source/WebKit/chromium/features.gypi (121186 => 121187)
--- trunk/Source/WebKit/chromium/features.gypi 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-06-25 22:19:03 UTC (rev 121187)
@@ -46,7 +46,7 @@
'ENABLE_CSS_IMAGE_RESOLUTION=0',
'ENABLE_CSS_REGIONS=1',
'ENABLE_CSS_SHADERS=1',
- 'ENABLE_CSS_VARIABLES=1',
+ 'ENABLE_CSS_VARIABLES=0',
'ENABLE_CUSTOM_SCHEME_HANDLER=0',
'ENABLE_DATALIST=1',
'ENABLE_DASHBOARD_SUPPORT=0',
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (121186 => 121187)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-06-25 22:19:03 UTC (rev 121187)
@@ -105,7 +105,6 @@
virtual void setExperimentalCSSRegionsEnabled(bool) = 0;
virtual void setExperimentalCSSGridLayoutEnabled(bool) = 0;
virtual void setExperimentalCSSCustomFilterEnabled(bool) = 0;
- virtual void setExperimentalCSSVariablesEnabled(bool) = 0;
virtual void setOpenGLMultisamplingEnabled(bool) = 0;
virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0;
virtual void setWebGLErrorsToConsoleEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (121186 => 121187)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-06-25 22:19:03 UTC (rev 121187)
@@ -338,11 +338,6 @@
m_settings->setCSSCustomFilterEnabled(enabled);
}
-void WebSettingsImpl::setExperimentalCSSVariablesEnabled(bool enabled)
-{
- m_settings->setCSSVariablesEnabled(enabled);
-}
-
void WebSettingsImpl::setOpenGLMultisamplingEnabled(bool enabled)
{
m_settings->setOpenGLMultisamplingEnabled(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (121186 => 121187)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-25 22:13:24 UTC (rev 121186)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-06-25 22:19:03 UTC (rev 121187)
@@ -97,7 +97,6 @@
virtual void setExperimentalCSSRegionsEnabled(bool);
virtual void setExperimentalCSSGridLayoutEnabled(bool);
virtual void setExperimentalCSSCustomFilterEnabled(bool);
- virtual void setExperimentalCSSVariablesEnabled(bool);
virtual void setOpenGLMultisamplingEnabled(bool);
virtual void setPrivilegedWebGLExtensionsEnabled(bool);
virtual void setWebGLErrorsToConsoleEnabled(bool);
