Commit 9a4e5045 authored by inferno@chromium.org's avatar inferno@chromium.org

2010-11-23 Cris Neckar <cdn@chromium.org>

        Reviewed by Dimitri Glazkov.

        Removed unneeded conversions to RenderBlock.
        https://bugs.webkit.org/show_bug.cgi?id=49896

        Test: fast/css/input-search-table-column-crash.html

        * rendering/RenderTextControlSingleLine.cpp:
        (WebCore::RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight):
2010-11-23  Cris Neckar  <cdn@chromium.org>

        Reviewed by Dimitri Glazkov.

        Test for crash with input type search and table column style.
        https://bugs.webkit.org/show_bug.cgi?id=49896

        * fast/css/input-search-table-column-crash-expected.txt: Added.
        * fast/css/input-search-table-column-crash.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72639 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent db5604ca
2010-11-23 Cris Neckar <cdn@chromium.org>
Reviewed by Dimitri Glazkov.
Test for crash with input type search and table column style.
https://bugs.webkit.org/show_bug.cgi?id=49896
* fast/css/input-search-table-column-crash-expected.txt: Added.
* fast/css/input-search-table-column-crash.html: Added.
2010-11-23 Ryosuke Niwa <rniwa@webkit.org>
Reviewed by Adam Barth.
<html>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
</script>
<style>
input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
display: table-column;
}
</style>
<input type="search">
PASS
</html>
2010-11-23 Cris Neckar <cdn@chromium.org>
Reviewed by Dimitri Glazkov.
Removed unneeded conversions to RenderBlock.
https://bugs.webkit.org/show_bug.cgi?id=49896
Test: fast/css/input-search-table-column-crash.html
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight):
2010-11-23 Ryosuke Niwa <rniwa@webkit.org>
Reviewed by Adam Barth.
......@@ -585,16 +585,15 @@ int RenderTextControlSingleLine::preferredDecorationWidthRight() const
void RenderTextControlSingleLine::adjustControlHeightBasedOnLineHeight(int lineHeight)
{
if (RenderBox* resultsRenderer = m_resultsButton ? m_resultsButton->renderBox() : 0) {
toRenderBlock(resultsRenderer)->computeLogicalHeight();
resultsRenderer->computeLogicalHeight();
setHeight(max(height(),
resultsRenderer->borderTop() + resultsRenderer->borderBottom() +
resultsRenderer->paddingTop() + resultsRenderer->paddingBottom() +
resultsRenderer->marginTop() + resultsRenderer->marginBottom()));
lineHeight = max(lineHeight, resultsRenderer->height());
}
if (RenderBox* cancelRenderer = m_cancelButton ? m_cancelButton->renderBox() : 0) {
toRenderBlock(cancelRenderer)->computeLogicalHeight();
cancelRenderer->computeLogicalHeight();
setHeight(max(height(),
cancelRenderer->borderTop() + cancelRenderer->borderBottom() +
cancelRenderer->paddingTop() + cancelRenderer->paddingBottom() +
......
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