Commit a363da2f authored by jorlow@chromium.org's avatar jorlow@chromium.org
Browse files

2010-04-28 Sheriff Bot <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r58313.
        http://trac.webkit.org/changeset/58313
        https://bugs.webkit.org/show_bug.cgi?id=38253

        Regression evident in pixel tests: the search icon is always
        clipped at the bottom. (Requested by jorlow on #webkit).

        * rendering/RenderTextControl.cpp:
        (WebCore::RenderTextControl::controlClipRect):
        * rendering/RenderTextControl.h:
        (WebCore::RenderTextControl::hasControlClip):
        * rendering/RenderTextControlSingleLine.cpp:
        (WebCore::RenderTextControlSingleLine::paint):
        * rendering/RenderTextControlSingleLine.h:
2010-04-28  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r58313.
        http://trac.webkit.org/changeset/58313
        https://bugs.webkit.org/show_bug.cgi?id=38253

        Regression evident in pixel tests: the search icon is always
        clipped at the bottom. (Requested by jorlow on #webkit).

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3eb5fed6
2010-04-28 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r58313.
http://trac.webkit.org/changeset/58313
https://bugs.webkit.org/show_bug.cgi?id=38253
Regression evident in pixel tests: the search icon is always
clipped at the bottom. (Requested by jorlow on #webkit).
* fast/css/input-search-padding.html: Removed.
* platform/mac/fast/css/input-search-padding-expected.checksum: Removed.
* platform/mac/fast/css/input-search-padding-expected.png: Removed.
* platform/mac/fast/css/input-search-padding-expected.txt: Removed.
2010-04-28 Shinichiro Hamaji <hamaji@chromium.org>
 
Unreviewed. Disable printing/media-queries-print for now.
......
<style>
input {
font-size: 30pt;
padding-bottom: 30px;
}
</style>
<input type="search" value="value jgq not clipped" style="-webkit-appearance:none"><br>
<input type="text" value="value jgq not clipped">
\ No newline at end of file
abd9ac07712b928b2a294bab536286b1
\ No newline at end of file
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderTextControl {INPUT} at (2,2) size 429x82 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBlock {DIV} at (3,17) size 423x47
RenderBlock {DIV} at (0,26) size 10x13
RenderBlock {DIV} at (407,26) size 16x13
RenderBR {BR} at (433,86) size 0x0
RenderTextControl {INPUT} at (2,88) size 429x82 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
layer at (23,27) size 397x47 scrollWidth 413
RenderBlock {DIV} at (10,0) size 397x47
RenderText {#text} at (1,0) size 411x47
text run at (1,0) width 411: "value jgq not clipped"
layer at (13,113) size 423x47
RenderBlock {DIV} at (3,17) size 423x47
RenderText {#text} at (1,0) size 411x47
text run at (1,0) width 411: "value jgq not clipped"
2010-04-28 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r58313.
http://trac.webkit.org/changeset/58313
https://bugs.webkit.org/show_bug.cgi?id=38253
Regression evident in pixel tests: the search icon is always
clipped at the bottom. (Requested by jorlow on #webkit).
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::controlClipRect):
* rendering/RenderTextControl.h:
(WebCore::RenderTextControl::hasControlClip):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::paint):
* rendering/RenderTextControlSingleLine.h:
2010-04-28 Justin McPherson <justin.mcpherson@nokia.com>
 
Reviewed by Simon Hausmann.
......@@ -433,6 +433,13 @@ void RenderTextControl::forwardEvent(Event* event)
m_innerText->defaultEventHandler(event);
}
IntRect RenderTextControl::controlClipRect(int tx, int ty) const
{
IntRect clipRect = contentBoxRect();
clipRect.move(tx, ty);
return clipRect;
}
static const char* fontFamiliesWithInvalidCharWidth[] = {
"American Typewriter",
"Arial Hebrew",
......
......@@ -95,6 +95,8 @@ protected:
private:
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*) { }
virtual bool canHaveChildren() const { return false; }
......
/**
* Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
* Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
* (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
*
* This library is free software; you can redistribute it and/or
......@@ -185,9 +185,6 @@ void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, int tx, int ty)
if (paintInfo.phase == PaintPhaseBlockBackground && m_shouldDrawCapsLockIndicator) {
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());
theme()->paintCapsLockIndicator(this, paintInfo, contentsRect);
......@@ -361,18 +358,6 @@ void RenderTextControlSingleLine::capsLockStateMayHaveChanged()
}
}
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;
}
int RenderTextControlSingleLine::textBlockWidth() const
{
int width = RenderTextControl::textBlockWidth();
......
......@@ -55,7 +55,6 @@ public:
private:
virtual bool hasControlClip() const { return m_cancelButton; }
virtual IntRect controlClipRect(int tx, int ty) const;
virtual bool isTextField() const { return true; }
virtual void subtreeHasChanged();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment