Commit 46b009c5 authored by hyatt's avatar hyatt

Make sure -webkit-border-fit accounts for padding as well as border.

        Reviewed by aroben

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::borderFitAdjust):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b891addd
2007-05-25 David Hyatt <hyatt@apple.com>
Make sure -webkit-border-fit accounts for padding as well as border.
Reviewed by aroben
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::borderFitAdjust):
2007-05-25 David Hyatt <hyatt@apple.com>
Rework line numbering (again). This time I finally think I have
......@@ -4309,14 +4309,14 @@ void RenderBlock::borderFitAdjust(int& x, int& w) const
int oldWidth = w;
adjustForBorderFit(0, left, right);
if (left != INT_MAX) {
left -= borderLeft();
left -= (borderLeft() + paddingLeft());
if (left > 0) {
x += left;
w -= left;
}
}
if (right != INT_MIN) {
right += borderRight();
right += (borderRight() + paddingRight());
if (right < oldWidth)
w -= (oldWidth - right);
}
......
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