summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-02-01 17:15:19 -0500
committerLeon Scroggins <scroggo@google.com>2011-02-03 10:28:58 -0500
commit82160d9cd33152498ed3f4e701e713c15e50d7e5 (patch)
tree6393fcdc9e967b4df9e30a05b0689f4d304bfb93 /WebCore/rendering
parenta5bca47a4e69875e8de101751842c94b7ec9803c (diff)
downloadexternal_webkit-82160d9cd33152498ed3f4e701e713c15e50d7e5.zip
external_webkit-82160d9cd33152498ed3f4e701e713c15e50d7e5.tar.gz
external_webkit-82160d9cd33152498ed3f4e701e713c15e50d7e5.tar.bz2
Use ListBoxPopupMenuClient for listboxes.
Bug:2754767 Enables us to remove some layering violations. Change-Id: Iea184c7946bca9d840c708918f545a9d9b436254
Diffstat (limited to 'WebCore/rendering')
-rw-r--r--WebCore/rendering/RenderTheme.cpp2
-rw-r--r--WebCore/rendering/RenderTheme.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderTheme.cpp b/WebCore/rendering/RenderTheme.cpp
index 522bd4d..538b6c6 100644
--- a/WebCore/rendering/RenderTheme.cpp
+++ b/WebCore/rendering/RenderTheme.cpp
@@ -198,7 +198,7 @@ void RenderTheme::adjustStyle(CSSStyleSelector* selector, RenderStyle* style, El
return adjustTextFieldStyle(selector, style, e);
case TextAreaPart:
return adjustTextAreaStyle(selector, style, e);
-#ifdef ANDROID_LISTBOX_USES_MENU_LIST
+#if ENABLE(NO_LISTBOX_RENDERING)
case ListboxPart:
return adjustListboxStyle(selector, style, e);
#endif
diff --git a/WebCore/rendering/RenderTheme.h b/WebCore/rendering/RenderTheme.h
index aedb8eb..13c69e6 100644
--- a/WebCore/rendering/RenderTheme.h
+++ b/WebCore/rendering/RenderTheme.h
@@ -236,7 +236,7 @@ protected:
virtual void adjustTextAreaStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
-#ifdef ANDROID_LISTBOX_USES_MENU_LIST
+#if ENABLE(NO_LISTBOX_RENDERING)
virtual void adjustListboxStyle(CSSStyleSelector*, RenderStyle*, Element*) const {}
#endif
virtual void adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const;