[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/khtml/css
From: Maks Orlovich <maksim () kde ! org>
Date: 2010-05-30 18:27:57
Message-ID: 20100530182757.795DCAC8C3 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1132465 by orlovich:
Don't bail out in the middle of handling of background-position: inherit/initial,
w/o setting the Y portion.
BUG: 240022
M +3 -4 cssstyleselector.cpp
--- trunk/KDE/kdelibs/khtml/css/cssstyleselector.cpp #1132464:1132465
@@ -141,18 +141,16 @@
currChild->clear##Prop(); \
currChild = currChild->next(); \
} \
- return; \
-} \
-if (isInitial) { \
+} else if (isInitial) { \
BackgroundLayer* currChild = style->accessBackgroundLayers(); \
currChild->set##Prop(RenderStyle::initial##Prop()); \
for (currChild = currChild->next(); currChild; currChild = currChild->next()) \
currChild->clear##Prop(); \
- return; \
}
#define HANDLE_BACKGROUND_VALUE(prop, Prop, value) { \
HANDLE_BACKGROUND_INHERIT_AND_INITIAL(prop, Prop) \
+else { \
if (!value->isPrimitiveValue() && !value->isValueList()) \
return; \
BackgroundLayer* currChild = style->accessBackgroundLayers(); \
@@ -179,6 +177,7 @@
/* Reset all remaining layers to not have the property set. */ \
currChild->clear##Prop(); \
currChild = currChild->next(); \
+ } \
} }
#define HANDLE_INHERIT_COND(propID, prop, Prop) \
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic