Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Unmaintained
KDE Libraries
Commits
534b1560
Commit
534b1560
authored
Dec 18, 2013
by
Andrea Iacovitti
Browse files
@font-face rule: fix overriding of src property declarations.
BUG: 328982 FIXED-IN: 4.11.5
parent
4f0d3ec4
Changes
1
Hide whitespace changes
Inline
Side-by-side
khtml/css/cssparser.cpp
View file @
534b1560
...
...
@@ -375,6 +375,7 @@ CSSStyleDeclarationImpl *CSSParser::createStyleDeclaration( CSSStyleRuleImpl *ru
CSSStyleDeclarationImpl
*
CSSParser
::
createFontFaceStyleDeclaration
(
CSSFontFaceRuleImpl
*
rule
)
{
QList
<
CSSProperty
*>
*
propList
=
new
QList
<
CSSProperty
*>
;
CSSProperty
*
overriddenSrcProperty
=
0
;
for
(
int
i
=
0
;
i
<
numParsedProperties
;
i
++
)
{
CSSProperty
*
property
=
parsedProperties
[
i
];
int
id
=
property
->
id
();
...
...
@@ -385,9 +386,18 @@ CSSStyleDeclarationImpl *CSSParser::createFontFaceStyleDeclaration( CSSFontFaceR
property
->
setValue
(
new
CSSValueListImpl
(
CSSValueListImpl
::
Comma
)
);
static_cast
<
CSSValueListImpl
*>
(
property
->
value
())
->
append
(
value
);
value
->
deref
();
}
else
if
(
id
==
CSS_PROP_SRC
)
{
overriddenSrcProperty
=
property
;
continue
;
}
propList
->
append
(
parsedProperties
[
i
]
);
propList
->
append
(
property
);
}
if
(
overriddenSrcProperty
)
{
propList
->
append
(
overriddenSrcProperty
);
}
numParsedProperties
=
0
;
return
new
CSSStyleDeclarationImpl
(
rule
,
propList
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment