Changeset 51386 in webkit

Timestamp:

Nov 25, 2009 8:50:38 AM (14 years ago)

Author:

benm@google.com

Message:

The select elements do not reflect the actual choice the user makes.
​https://bugs.webkit.org/show_bug.cgi?id=31831

Patch by Andrei Popescu <​andreip@google.com> on 2009-11-25
Reviewed by Dimitri Glazkov.

Handle the drawing of the listboxes in Android code.

No new features, just fixing an Android problem. Existing layout tests are sufficient.

• platform/android/RenderThemeAndroid.cpp:

(WebCore::theme):
(WebCore::RenderThemeAndroid::platformActiveSelectionBackgroundColor):
(WebCore::RenderThemeAndroid::platformActiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeAndroid::platformInactiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeAndroid::platformActiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeAndroid::platformInactiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeAndroid::adjustButtonStyle):
(WebCore::RenderThemeAndroid::paintTextArea):
(WebCore::RenderThemeAndroid::adjustListboxStyle):

• platform/android/RenderThemeAndroid.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/android/RenderThemeAndroid.cpp (modified) (10 diffs)
• platform/android/RenderThemeAndroid.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-25  Andrei Popescu  <andreip@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        The select elements do not reflect the actual choice the user makes.
+        https://bugs.webkit.org/show_bug.cgi?id=31831
+
+        Handle the drawing of the listboxes in Android code.
+
+        No new features, just fixing an Android problem. Existing layout tests are sufficient.
+
+        * platform/android/RenderThemeAndroid.cpp:
+        (WebCore::theme):
+        (WebCore::RenderThemeAndroid::platformActiveSelectionBackgroundColor):
+        (WebCore::RenderThemeAndroid::platformActiveListBoxSelectionBackgroundColor):
+        (WebCore::RenderThemeAndroid::platformInactiveListBoxSelectionBackgroundColor):
+        (WebCore::RenderThemeAndroid::platformActiveListBoxSelectionForegroundColor):
+        (WebCore::RenderThemeAndroid::platformInactiveListBoxSelectionForegroundColor):
+        (WebCore::RenderThemeAndroid::adjustButtonStyle):
+        (WebCore::RenderThemeAndroid::paintTextArea):
+        (WebCore::RenderThemeAndroid::adjustListboxStyle):
+        * platform/android/RenderThemeAndroid.h:
+
 2009-11-25  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/platform/android/RenderThemeAndroid.cpp

@@ -1 +1 @@
 /*
- * Copyright 2006, The Android Open Source Project
+ * Copyright 2009, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14 +14 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
@@ -30 +30 @@
 #include "Element.h"
 #include "GraphicsContext.h"
+#include "HTMLNames.h"
+#include "HTMLOptionElement.h"
+#include "HTMLSelectElement.h"
+#include "Node.h"
 #include "PlatformGraphicsContext.h"
 #include "RenderSkinAndroid.h"
@@ -42 +46 @@
 // of buttons, so that our button images are large enough to properly fit
 // the text.
-const int BUTTON_PADDING = 18;
+const int buttonPadding = 18;
 
 // Add padding to the fontSize of ListBoxes to get their maximum sizes.
 // Listboxes often have a specified size.  Since we change them into
 // dropdowns, we want a much smaller height, which encompasses the text.
-const int LISTBOX_PADDING = 5;
+const int listboxPadding = 5;
 
 // This is the color of selection in a textfield.  It was obtained by checking
 // the color of selection in TextViews in the system.
-const RGBA32 SELECTION_COLOR = makeRGB(255, 146, 0);
+const RGBA32 selectionColor = makeRGB(255, 146, 0);
 
 static SkCanvas* getCanvasFromInfo(const RenderObject::PaintInfo& info)
@@ -60 +64 @@
 RenderTheme* theme()
 {
-    static RenderThemeAndroid androidTheme;
+    DEFINE_STATIC_LOCAL(RenderThemeAndroid, androidTheme, ());
     return &androidTheme;
 }
@@ -98 +102 @@
 Color RenderThemeAndroid::platformActiveSelectionBackgroundColor() const
 {
-    return Color(SELECTION_COLOR);
+    return Color(selectionColor);
 }
 
@@ -117 +121 @@
 
 Color RenderThemeAndroid::platformTextSearchHighlightColor() const
+{
+    return Color(Color::transparent);
+}
+
+Color RenderThemeAndroid::platformActiveListBoxSelectionBackgroundColor() const
+{
+    return Color(Color::transparent);
+}
+
+Color RenderThemeAndroid::platformInactiveListBoxSelectionBackgroundColor() const
+{
+    return Color(Color::transparent);
+}
+
+Color RenderThemeAndroid::platformActiveListBoxSelectionForegroundColor() const
+{
+    return Color(Color::transparent);
+}
+
+Color RenderThemeAndroid::platformInactiveListBoxSelectionForegroundColor() const
 {
     return Color(Color::transparent);
@@ -178 +202 @@
     style->setPaddingLeft(Length(padding, Fixed));
     style->setPaddingRight(Length(padding, Fixed));
-    style->setMinHeight(Length(style->fontSize() + BUTTON_PADDING, Fixed));
+    style->setMinHeight(Length(style->fontSize() + buttonPadding, Fixed));
 }
 
@@ -237 +261 @@
 bool RenderThemeAndroid::paintTextArea(RenderObject* obj, const RenderObject::PaintInfo& info, const IntRect& rect)
 {
-    if (obj->isMenuList())
-        return paintCombo(obj, info, 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;    
 }
@@ -255 +327 @@
 {
     style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed));
-    style->setMaxHeight(Length(style->fontSize() + LISTBOX_PADDING, 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);
 }

trunk/WebCore/platform/android/RenderThemeAndroid.h

@@ -64 +64 @@
     virtual Color platformInactiveSelectionForegroundColor() const;
     virtual Color platformTextSearchHighlightColor() const;
-    
+
+    virtual Color platformActiveListBoxSelectionBackgroundColor() const;
+    virtual Color platformInactiveListBoxSelectionBackgroundColor() const;
+    virtual Color platformActiveListBoxSelectionForegroundColor() const;
+    virtual Color platformInactiveListBoxSelectionForegroundColor() const;
+
     virtual void systemFont(int, WebCore::FontDescription&) const {}