COMMIT_MESSAGE

Fix the default text color for form elements.

[Gtk] Implement RenderThemeGtk::systemColor to apply the correct colors from the current GTK theme.

WebCore/ChangeLog

2010-04-22  Olivier Tilloy  <olivier@tilloy.net>

        Reviewed by NOBODY (OOPS!).

        Fix the default text color for form elements.

        [Gtk] Implement RenderThemeGtk::systemColor to apply the correct colors

        from the current GTK theme.

        https://bugs.webkit.org/show_bug.cgi?id=37779

        * css/html.css:

        (input, textarea, keygen, select, button, isindex, datagrid):

        (keygen, select):

        * platform/gtk/RenderThemeGtk.cpp:

        (WebCore::RenderThemeGtk::RenderThemeGtk):

        (WebCore::RenderThemeGtk::systemColor):

        (WebCore::RenderThemeGtk::gtkButton):

        * platform/gtk/RenderThemeGtk.h:

2010-04-22  Gustavo Sverzut Barbieri  <barbieri@profusion.mobi>

        Reviewed by Eric Seidel.

WebCore/css/html.css

@@button {

input, textarea, keygen, select, button, isindex, datagrid {

    margin: 0__qem;

    font: -webkit-small-control;

307 color: ~~initial~~;

307 color: CaptionText;

    letter-spacing: normal;

    word-spacing: normal;

    line-height: normal;

@@keygen, select {

    -webkit-border-radius: 5px;

    white-space: pre;

    -webkit-rtl-ordering: logical;

482 color: black;

    background-color: white;

    cursor: default;

}

WebCore/platform/gtk/RenderThemeGtk.cpp

#include "RenderThemeGtk.h"

#include "AffineTransform.h"

28#include "CSSValueKeywords.h"

#include "GOwnPtr.h"

#include "Gradient.h"

#include "GraphicsContext.h"

@@static int mozGtkRefCount = 0;

RenderThemeGtk::RenderThemeGtk()

    : m_gtkWindow(0)

    , m_gtkContainer(0)

127 , m_gtkButton(0)

    , m_gtkEntry(0)

    , m_gtkTreeView(0)

    , m_panelColor(Color::white)

@@void RenderThemeGtk::systemFont(int, FontDescription&) const

    notImplemented();

}

Color RenderThemeGtk::systemColor(int cssValueId) const

{

    switch (cssValueId) {

    case CSSValueButtontext:

        return Color(gtkButton()->style->fg[GTK_STATE_NORMAL]);

    case CSSValueCaptiontext:

        return Color(gtkEntry()->style->fg[GTK_STATE_NORMAL]);

    default:

        return RenderTheme::systemColor(cssValueId);

    }

}

static void gtkStyleSetCallback(GtkWidget* widget, GtkStyle* previous, RenderTheme* renderTheme)

{

    // FIXME: Make sure this function doesn't get called many times for a single GTK+ style change signal.

@@GtkContainer* RenderThemeGtk::gtkContainer() const

    return m_gtkContainer;

}

GtkWidget* RenderThemeGtk::gtkButton() const

{

    if (m_gtkButton)

        return m_gtkButton;

    m_gtkButton = gtk_button_new();

    g_signal_connect(m_gtkButton, "style-set", G_CALLBACK(gtkStyleSetCallback), const_cast<RenderThemeGtk*>(this));

    gtk_container_add(gtkContainer(), m_gtkButton);

    gtk_widget_realize(m_gtkButton);

    return m_gtkButton;

}

GtkWidget* RenderThemeGtk::gtkEntry() const

{

    if (m_gtkEntry)

WebCore/platform/gtk/RenderThemeGtk.h

@@public:

    virtual void platformColorsDidChange();

85 // System fonts.

85 // System fonts and colors.

8686 virtual void systemFont(int propId, FontDescription&) const;

87 virtual Color systemColor(int cssValueId) const;

#if ENABLE(VIDEO)

    virtual String extraMediaControlsStyleSheet();

@@private:

    /*

     * hold the state

     */

142 GtkWidget* gtkButton() const;

    GtkWidget* gtkEntry() const;

    GtkWidget* gtkTreeView() const;

@@private:

    mutable GtkWidget* m_gtkWindow;

    mutable GtkContainer* m_gtkContainer;

154 mutable GtkWidget* m_gtkButton;

    mutable GtkWidget* m_gtkEntry;

    mutable GtkWidget* m_gtkTreeView;