Changeset 58313 in webkit

Timestamp:

Apr 27, 2010 10:19:47 AM (14 years ago)

Author:

Joseph Pecoraro

Message:

2010-04-27 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Dan Bernstein.

<input type="search"> with uneven padding causes text clipping
​https://bugs.webkit.org/show_bug.cgi?id=38160

• fast/css/input-search-padding.html: Added.
• platform/mac/fast/css/input-search-padding-expected.checksum: Added.
• platform/mac/fast/css/input-search-padding-expected.png: Added.
• platform/mac/fast/css/input-search-padding-expected.txt: Added.

2010-04-27 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Dan Bernstein.

<input type="search"> with uneven padding causes text clipping
​https://bugs.webkit.org/show_bug.cgi?id=38160

Test: fast/css/input-search-padding.html

An <input type="search"> contains an inner block, which is explicitly
centered in RenderTextControlSingleLine based on the height of the element.
However, the clipping rect was not using the set location, and instead
calculated off of the top border and padding alone. This also vertically
centers the Caps Lock indicator.

• rendering/RenderTextControl.cpp: moved controlClipRect implementation to RenderTextControlSingleLine
• rendering/RenderTextControl.h: allow a subclass implementation of controlClipRect, removed redundant hasControlClip implementation, and moved controlClipRect
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::paint): vertically center the Caps Lock indicator (WebCore::RenderTextControlSingleLine::controlClipRect): use the set location of the anonymous inner block instead
• rendering/RenderTextControlSingleLine.h: allow for an implementation of controlClipRect for <input type="search">

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/input-search-padding.html (added)
• LayoutTests/platform/mac/fast/css/input-search-padding-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/input-search-padding-expected.png (added)
• LayoutTests/platform/mac/fast/css/input-search-padding-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTextControl.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextControl.h (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (3 diffs)
• WebCore/rendering/RenderTextControlSingleLine.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-27  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        <input type="search"> with uneven padding causes text clipping
+        https://bugs.webkit.org/show_bug.cgi?id=38160
+
+        * fast/css/input-search-padding.html: Added.
+        * platform/mac/fast/css/input-search-padding-expected.checksum: Added.
+        * platform/mac/fast/css/input-search-padding-expected.png: Added.
+        * platform/mac/fast/css/input-search-padding-expected.txt: Added.
+
 2010-04-27  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-27  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        <input type="search"> with uneven padding causes text clipping
+        https://bugs.webkit.org/show_bug.cgi?id=38160
+
+        Test: fast/css/input-search-padding.html
+
+        An <input type="search"> contains an inner block, which is explicitly
+        centered in RenderTextControlSingleLine based on the height of the element.
+        However, the clipping rect was not using the set location, and instead
+        calculated off of the top border and padding alone. This also vertically
+        centers the Caps Lock indicator.
+
+        * rendering/RenderTextControl.cpp: moved controlClipRect implementation to RenderTextControlSingleLine
+        * rendering/RenderTextControl.h: allow a subclass implementation of controlClipRect, removed redundant hasControlClip implementation, and moved controlClipRect
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::paint): vertically center the Caps Lock indicator
+        (WebCore::RenderTextControlSingleLine::controlClipRect): use the set location of the anonymous inner block instead
+        * rendering/RenderTextControlSingleLine.h: allow for an implementation of controlClipRect for <input type="search">
+
 2010-04-27  Thomas Zander <t.zander@nokia.com>
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -432 +432 @@
         return;
     m_innerText->defaultEventHandler(event);
-}
-
-IntRect RenderTextControl::controlClipRect(int tx, int ty) const
-{
-    IntRect clipRect = contentBoxRect();
-    clipRect.move(tx, ty);
-    return clipRect;
 }
 

trunk/WebCore/rendering/RenderTextControl.h

@@ -96 +96 @@
     virtual const char* renderName() const { return "RenderTextControl"; }
     virtual bool isTextControl() const { return true; }
-    virtual bool hasControlClip() const { return false; }
-    virtual IntRect controlClipRect(int tx, int ty) const;
     virtual void calcPrefWidths();
     virtual void removeLeftoverAnonymousBlock(RenderBlock*) { }

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -1 +1 @@
 /**
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
  *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) 
  *
@@ -186 +186 @@
         IntRect contentsRect = contentBoxRect();
 
+        // Center vertically like the text.
+        contentsRect.setY((height() - contentsRect.height()) / 2);
+
         // Convert the rect into the coords used for painting the content
         contentsRect.move(tx + x(), ty + y());
@@ -357 +360 @@
         repaint();
     }
+}
+
+IntRect RenderTextControlSingleLine::controlClipRect(int tx, int ty) const
+{
+    // This should only get called for search inputs, which have an innerBlock.
+    ASSERT(hasControlClip());
+    ASSERT(m_innerBlock);
+
+    RenderBox* renderBox = m_innerBlock->renderBox();
+    IntRect clipRect = IntRect(renderBox->x(), renderBox->y(), contentWidth(), contentHeight());        
+    clipRect.move(tx, ty);
+    return clipRect;
 }
 

trunk/WebCore/rendering/RenderTextControlSingleLine.h

@@ -56 +56 @@
 private:
     virtual bool hasControlClip() const { return m_cancelButton; }
+    virtual IntRect controlClipRect(int tx, int ty) const;
     virtual bool isTextField() const { return true; }