Changeset 58400 in webkit


Ignore:
Timestamp:
Apr 28, 2010 3:57:20 AM (14 years ago)
Author:
jorlow@chromium.org
Message:

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.
Location:
trunk
Files:
4 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r58398 r58400  
     12010-04-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r58313.
     4        http://trac.webkit.org/changeset/58313
     5        https://bugs.webkit.org/show_bug.cgi?id=38253
     6
     7        Regression evident in pixel tests: the search icon is always
     8        clipped at the bottom. (Requested by jorlow on #webkit).
     9
     10        * fast/css/input-search-padding.html: Removed.
     11        * platform/mac/fast/css/input-search-padding-expected.checksum: Removed.
     12        * platform/mac/fast/css/input-search-padding-expected.png: Removed.
     13        * platform/mac/fast/css/input-search-padding-expected.txt: Removed.
     14
    1152010-04-28  Shinichiro Hamaji  <hamaji@chromium.org>
    216

  • trunk/WebCore/ChangeLog

    r58390 r58400  
     12010-04-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r58313.
     4        http://trac.webkit.org/changeset/58313
     5        https://bugs.webkit.org/show_bug.cgi?id=38253
     6
     7        Regression evident in pixel tests: the search icon is always
     8        clipped at the bottom. (Requested by jorlow on #webkit).
     9
     10        * rendering/RenderTextControl.cpp:
     11        (WebCore::RenderTextControl::controlClipRect):
     12        * rendering/RenderTextControl.h:
     13        (WebCore::RenderTextControl::hasControlClip):
     14        * rendering/RenderTextControlSingleLine.cpp:
     15        (WebCore::RenderTextControlSingleLine::paint):
     16        * rendering/RenderTextControlSingleLine.h:
     17
    1182010-04-28  Justin McPherson <justin.mcpherson@nokia.com>
    219

  • trunk/WebCore/rendering/RenderTextControl.cpp

    r58313 r58400  
    432432        return;
    433433    m_innerText->defaultEventHandler(event);
     434}
     435
     436IntRect RenderTextControl::controlClipRect(int tx, int ty) const
     437{
     438    IntRect clipRect = contentBoxRect();
     439    clipRect.move(tx, ty);
     440    return clipRect;
    434441}
    435442

  • trunk/WebCore/rendering/RenderTextControl.h

    r58313 r58400  
    9696    virtual const char* renderName() const { return "RenderTextControl"; }
    9797    virtual bool isTextControl() const { return true; }
     98    virtual bool hasControlClip() const { return false; }
     99    virtual IntRect controlClipRect(int tx, int ty) const;
    98100    virtual void calcPrefWidths();
    99101    virtual void removeLeftoverAnonymousBlock(RenderBlock*) { }

  • trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

    r58313 r58400  
    11/**
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
    33 *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    44 *
    … …  
    186186        IntRect contentsRect = contentBoxRect();
    187187
    188         // Center vertically like the text.
    189         contentsRect.setY((height() - contentsRect.height()) / 2);
    190 
    191188        // Convert the rect into the coords used for painting the content
    192189        contentsRect.move(tx + x(), ty + y());
    … …  
    360357        repaint();
    361358    }
    362 }
    363 
    364 IntRect RenderTextControlSingleLine::controlClipRect(int tx, int ty) const
    365 {
    366     // This should only get called for search inputs, which have an innerBlock.
    367     ASSERT(hasControlClip());
    368     ASSERT(m_innerBlock);
    369 
    370     RenderBox* renderBox = m_innerBlock->renderBox();
    371     IntRect clipRect = IntRect(renderBox->x(), renderBox->y(), contentWidth(), contentHeight());       
    372     clipRect.move(tx, ty);
    373     return clipRect;
    374359}
    375360

  • trunk/WebCore/rendering/RenderTextControlSingleLine.h

    r58313 r58400  
    5656private:
    5757    virtual bool hasControlClip() const { return m_cancelButton; }
    58     virtual IntRect controlClipRect(int tx, int ty) const;
    5958    virtual bool isTextField() const { return true; }
    6059
Note: See TracChangeset for help on using the changeset viewer.