summaryrefslogtreecommitdiffstats
path: root/webkit/port/rendering
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-21 19:15:11 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-21 19:15:11 +0000
commit2d84617f10c745c25e67544467c6d7f7d6367132 (patch)
tree7013aebe47c37a1bfbe6c314cf1997038d6a1a98 /webkit/port/rendering
parent50e12183260c4b94ce3ee3316b27b998af5b7926 (diff)
downloadchromium_src-2d84617f10c745c25e67544467c6d7f7d6367132.zip
chromium_src-2d84617f10c745c25e67544467c6d7f7d6367132.tar.gz
chromium_src-2d84617f10c745c25e67544467c6d7f7d6367132.tar.bz2
pull in some upstream code in this forked file
Review URL: http://codereview.chromium.org/11570 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/rendering')
-rw-r--r--webkit/port/rendering/RenderThemeMac.mm8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/port/rendering/RenderThemeMac.mm b/webkit/port/rendering/RenderThemeMac.mm
index 22d5146..48d5d12 100644
--- a/webkit/port/rendering/RenderThemeMac.mm
+++ b/webkit/port/rendering/RenderThemeMac.mm
@@ -440,6 +440,14 @@ bool RenderThemeMac::isControlStyled(const RenderStyle* style, const BorderData&
{
if (style->appearance() == TextFieldPart || style->appearance() == TextAreaPart || style->appearance() == ListboxPart)
return style->border() != border;
+
+ // FIXME: This is horrible, but there is not much else that can be done. Menu lists cannot draw properly when
+ // scaled. They can't really draw properly when transformed either. We can't detect the transform case at style
+ // adjustment time so that will just have to stay broken. We can however detect that we're zooming. If zooming
+ // is in effect we treat it like the control is styled.
+ if (style->appearance() == MenulistPart && style->effectiveZoom() != 1.0f)
+ return true;
+
return RenderTheme::isControlStyled(style, border, background, backgroundColor);
}