Changeset 51428 in webkit

Timestamp:

Nov 26, 2009 9:59:55 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-26 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

[Chromium] Ignore line-height CSS property specified to push buttons on
Windows and Linux.
​https://bugs.webkit.org/show_bug.cgi?id=31712

LayoutTests/fast/forms/control-restrict-line-height.html checks that the
following controls should ignore line-height CSS property.

• <select>
• <input type=button>
• <input type=search>

This change addresses the <input type=button> issue with Chromium/Windows
and Chromium/Linux.

• rendering/RenderThemeChromiumSkia.cpp: Implement adjustButtonStyle() to ignore line-height.
• rendering/RenderThemeChromiumSkia.h: Declare adjustButtonStyle().

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeChromiumSkia.cpp (modified) (1 diff)
• rendering/RenderThemeChromiumSkia.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-26  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Ignore line-height CSS property specified to push buttons on
+        Windows and Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=31712
+
+        LayoutTests/fast/forms/control-restrict-line-height.html checks that the
+        following controls should ignore line-height CSS property.
+         - <select>
+         - <input type=button>
+         - <input type=search>
+        This change addresses the <input type=button> issue with Chromium/Windows
+        and Chromium/Linux.
+        
+        * rendering/RenderThemeChromiumSkia.cpp: Implement adjustButtonStyle() to ignore line-height.
+        * rendering/RenderThemeChromiumSkia.h: Declare adjustButtonStyle().
+
 2009-11-26  Kinuko Yasuda  <kinuko@chromium.com>
 

trunk/WebCore/rendering/RenderThemeChromiumSkia.cpp

@@ -349 +349 @@
 }
 
+void RenderThemeChromiumSkia::adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const;
+{
+    if (style->appearance() == PushButtonPart) {
+        // Ignore line-height.
+        style->setLineHeight(RenderStyle::initialLineHeight());
+    }
+}
+
+
 bool RenderThemeChromiumSkia::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
 {

trunk/WebCore/rendering/RenderThemeChromiumSkia.h

@@ -72 +72 @@
 
         virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+        virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
 
         virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);