Use ListBoxPopupMenuClient for listboxes.

Bug:2754767

Enables us to remove some layering violations.

Change-Id: Iea184c7946bca9d840c708918f545a9d9b436254

1 files changed, 13 insertions, 64 deletions

diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index 87e7a6d..b43e0e6 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -351,57 +351,9 @@ void RenderThemeAndroid::adjustTextAreaStyle(CSSStyleSelector*, RenderStyle* sty
 
 bool RenderThemeAndroid::paintTextArea(RenderObject* obj, const PaintInfo& info, const IntRect& rect)
 {
-    if (!obj->isListBox())
-        return true;
-
-    paintCombo(obj, info, rect);
-    RenderStyle* style = obj->style();
-    if (style)
-        style->setColor(Color::transparent);
-    Node* node = obj->node();
-    if (!node || !node->hasTagName(HTMLNames::selectTag))
-        return true;
-
-    HTMLSelectElement* select = static_cast<HTMLSelectElement*>(node);
-    // The first item may be visible.  Make sure it does not draw.
-    // If it has a style, it overrides the RenderListBox's style, so we
-    // need to make sure both are set to transparent.
-    node = select->item(0);
-    if (node) {
-        RenderObject* renderer = node->renderer();
-        if (renderer) {
-            RenderStyle* renderStyle = renderer->style();
-            if (renderStyle)
-                renderStyle->setColor(Color::transparent);
-        }
-    }
-    // Find the first selected option, and draw its text.
-    // FIXME: In a later change, if there is more than one item selected,
-    // draw a string that says "X items" like iPhone Safari does
-    int index = select->selectedIndex();
-    node = select->item(index);
-    if (!node || !node->hasTagName(HTMLNames::optionTag))
-        return true;
-
-    HTMLOptionElement* option = static_cast<HTMLOptionElement*>(node);
-    String label = option->textIndentedToRespectGroupLabel();
-    SkRect r(rect);
-
-    SkPaint paint;
-    paint.setAntiAlias(true);
-    paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
-    // Values for text size and positioning determined by trial and error
-    paint.setTextSize(r.height() - SkIntToScalar(6));
-
-    SkCanvas* canvas = getCanvasFromInfo(info);
-    int saveCount = canvas->save();
-    r.fRight -= SkIntToScalar(RenderSkinCombo::extraWidth());
-    canvas->clipRect(r);
-    canvas->drawText(label.characters(), label.length() << 1,
-             r.fLeft + SkIntToScalar(5), r.fBottom - SkIntToScalar(5), paint);
-    canvas->restoreToCount(saveCount);
-
-    return true;    
+    if (obj->isMenuList())
+        paintCombo(obj, info, rect);
+    return true;
 }
 
 void RenderThemeAndroid::adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
@@ -414,16 +366,7 @@ bool RenderThemeAndroid::paintSearchField(RenderObject*, const PaintInfo&, const
     return true;    
 }
 
-void RenderThemeAndroid::adjustListboxStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
-{
-    style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed));
-    style->setMaxHeight(Length(style->fontSize() + listboxPadding, Fixed));
-    // Make webkit draw invisible, since it will simply draw the first element
-    style->setColor(Color::transparent);
-    addIntrinsicMargins(style);
-}
-
-static void adjustMenuListStyleCommon(RenderStyle* style, Element* e)
+static void adjustMenuListStyleCommon(RenderStyle* style)
 {
     // Added to make room for our arrow and make the touch target less cramped.
     style->setPaddingLeft(Length(RenderSkinCombo::padding(), Fixed));
@@ -432,9 +375,14 @@ static void adjustMenuListStyleCommon(RenderStyle* style, Element* e)
     style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed));
 }
 
+void RenderThemeAndroid::adjustListboxStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
+{
+    adjustMenuListButtonStyle(0, style, 0);
+}
+
 void RenderThemeAndroid::adjustMenuListStyle(CSSStyleSelector*, RenderStyle* style, Element* e) const
 {
-    adjustMenuListStyleCommon(style, e);
+    adjustMenuListStyleCommon(style);
     addIntrinsicMargins(style);
 }
 
@@ -450,7 +398,8 @@ bool RenderThemeAndroid::paintMenuList(RenderObject* obj, const PaintInfo& info,
     return paintCombo(obj, info, rect);
 }
 
-void RenderThemeAndroid::adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyle* style, Element* e) const
+void RenderThemeAndroid::adjustMenuListButtonStyle(CSSStyleSelector*,
+        RenderStyle* style, Element*) const
 {
     // Copied from RenderThemeSafari.
     const float baseFontSize = 11.0f;
@@ -468,7 +417,7 @@ void RenderThemeAndroid::adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyl
     const int padding = 4;
     style->setPaddingTop(Length(padding, Fixed));
     style->setPaddingLeft(Length(padding, Fixed));
-    adjustMenuListStyleCommon(style, e);
+    adjustMenuListStyleCommon(style);
 }
 
 bool RenderThemeAndroid::paintMenuListButton(RenderObject* obj, const PaintInfo& info, const IntRect& rect)