[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
arv at chromium.org
arv at chromium.org
Wed Dec 22 11:15:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit eb1cf1eaa977d42dfefb7f09043af12d5628698f
Author: arv at chromium.org <arv at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 16 03:02:17 2010 +0000
2010-07-15 Erik Arvidsson <arv at chromium.org>
Reviewed by David Levin.
Add directional property enums to the switch in applyProperty
https://bugs.webkit.org/show_bug.cgi?id=42438
Build fix for chromium mac.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63509 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f318992..8061a3d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15 Erik Arvidsson <arv at chromium.org>
+
+ Reviewed by David Levin.
+
+ Add directional property enums to the switch in applyProperty
+ https://bugs.webkit.org/show_bug.cgi?id=42438
+
+ Build fix for chromium mac.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+
2010-07-13 Zhenyao Mo <zmo at google.com>
Reviewed by Nate Chapin.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index f986970..cc4841d 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -5479,6 +5479,23 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
return;
case CSSPropertyInvalid:
return;
+
+ // Directional properties are resolved by resolveDirectionAwareProperty() before the switch.
+ case CSSPropertyWebkitBorderEnd:
+ case CSSPropertyWebkitBorderEndColor:
+ case CSSPropertyWebkitBorderEndStyle:
+ case CSSPropertyWebkitBorderEndWidth:
+ case CSSPropertyWebkitBorderStart:
+ case CSSPropertyWebkitBorderStartColor:
+ case CSSPropertyWebkitBorderStartStyle:
+ case CSSPropertyWebkitBorderStartWidth:
+ case CSSPropertyWebkitMarginEnd:
+ case CSSPropertyWebkitMarginStart:
+ case CSSPropertyWebkitPaddingEnd:
+ case CSSPropertyWebkitPaddingStart:
+ ASSERT_NOT_REACHED();
+ break;
+
case CSSPropertyFontStretch:
case CSSPropertyPage:
case CSSPropertyQuotes:
@@ -5498,10 +5515,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
case CSSPropertyTextUnderlineStyle:
case CSSPropertyTextUnderlineWidth:
case CSSPropertyWebkitFontSizeDelta:
- case CSSPropertyWebkitMarginEnd:
- case CSSPropertyWebkitMarginStart:
- case CSSPropertyWebkitPaddingEnd:
- case CSSPropertyWebkitPaddingStart:
case CSSPropertyWebkitTextDecorationsInEffect:
case CSSPropertyWebkitTextStroke:
case CSSPropertyWebkitVariableDeclarationBlock:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list