summaryrefslogtreecommitdiff
path: root/Source/WebCore/rendering/RenderTheme.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
commitcd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch)
tree8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebCore/rendering/RenderTheme.cpp
parentd11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff)
downloadqtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebCore/rendering/RenderTheme.cpp')
-rw-r--r--Source/WebCore/rendering/RenderTheme.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderTheme.cpp b/Source/WebCore/rendering/RenderTheme.cpp
index 28c5604f6..6ea025c5d 100644
--- a/Source/WebCore/rendering/RenderTheme.cpp
+++ b/Source/WebCore/rendering/RenderTheme.cpp
@@ -111,26 +111,26 @@ void RenderTheme::adjustStyle(CSSStyleSelector* selector, RenderStyle* style, El
// Border
LengthBox borderBox(style->borderTopWidth(), style->borderRightWidth(), style->borderBottomWidth(), style->borderLeftWidth());
borderBox = m_theme->controlBorder(part, style->font(), borderBox, style->effectiveZoom());
- if (borderBox.top().value() != style->borderTopWidth()) {
+ if (borderBox.top().value() != static_cast<int>(style->borderTopWidth())) {
if (borderBox.top().value())
style->setBorderTopWidth(borderBox.top().value());
else
style->resetBorderTop();
}
- if (borderBox.right().value() != style->borderRightWidth()) {
+ if (borderBox.right().value() != static_cast<int>(style->borderRightWidth())) {
if (borderBox.right().value())
style->setBorderRightWidth(borderBox.right().value());
else
style->resetBorderRight();
}
- if (borderBox.bottom().value() != style->borderBottomWidth()) {
+ if (borderBox.bottom().value() != static_cast<int>(style->borderBottomWidth())) {
style->setBorderBottomWidth(borderBox.bottom().value());
if (borderBox.bottom().value())
style->setBorderBottomWidth(borderBox.bottom().value());
else
style->resetBorderBottom();
}
- if (borderBox.left().value() != style->borderLeftWidth()) {
+ if (borderBox.left().value() != static_cast<int>(style->borderLeftWidth())) {
style->setBorderLeftWidth(borderBox.left().value());
if (borderBox.left().value())
style->setBorderLeftWidth(borderBox.left().value());