| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 3 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 } | 351 } |
| 352 | 352 |
| 353 void RenderListBox::paintScrollbar(PaintInfo& paintInfo, const LayoutPoint& pain
tOffset) | 353 void RenderListBox::paintScrollbar(PaintInfo& paintInfo, const LayoutPoint& pain
tOffset) |
| 354 { | 354 { |
| 355 if (m_vBar) { | 355 if (m_vBar) { |
| 356 IntRect scrollRect = pixelSnappedIntRect(paintOffset.x() + width() - bor
derRight() - m_vBar->width(), | 356 IntRect scrollRect = pixelSnappedIntRect(paintOffset.x() + width() - bor
derRight() - m_vBar->width(), |
| 357 paintOffset.y() + borderTop(), | 357 paintOffset.y() + borderTop(), |
| 358 m_vBar->width(), | 358 m_vBar->width(), |
| 359 height() - (borderTop() + borderBottom())); | 359 height() - (borderTop() + borderBottom())); |
| 360 m_vBar->setFrameRect(scrollRect); | 360 m_vBar->setFrameRect(scrollRect); |
| 361 m_vBar->paint(paintInfo.context, paintInfo.rect); | 361 m_vBar->paint(paintInfo.context, paintInfo.rect()); |
| 362 } | 362 } |
| 363 } | 363 } |
| 364 | 364 |
| 365 static LayoutSize itemOffsetForAlignment(TextRun textRun, RenderStyle* itemStyle
, Font itemFont, LayoutRect itemBoudingBox) | 365 static LayoutSize itemOffsetForAlignment(TextRun textRun, RenderStyle* itemStyle
, Font itemFont, LayoutRect itemBoudingBox) |
| 366 { | 366 { |
| 367 ETextAlign actualAlignment = itemStyle->textAlign(); | 367 ETextAlign actualAlignment = itemStyle->textAlign(); |
| 368 // FIXME: Firefox doesn't respect JUSTIFY. Should we? | 368 // FIXME: Firefox doesn't respect JUSTIFY. Should we? |
| 369 // FIXME: Handle TAEND here | 369 // FIXME: Handle TAEND here |
| 370 if (actualAlignment == TASTART || actualAlignment == JUSTIFY) | 370 if (actualAlignment == TASTART || actualAlignment == JUSTIFY) |
| 371 actualAlignment = itemStyle->isLeftToRightDirection() ? LEFT : RIGHT; | 371 actualAlignment = itemStyle->isLeftToRightDirection() ? LEFT : RIGHT; |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 | 908 |
| 909 if (m_vBar) | 909 if (m_vBar) |
| 910 m_vBar->styleChanged(); | 910 m_vBar->styleChanged(); |
| 911 | 911 |
| 912 // Force an update since we know the scrollbars have changed things. | 912 // Force an update since we know the scrollbars have changed things. |
| 913 if (document()->hasAnnotatedRegions()) | 913 if (document()->hasAnnotatedRegions()) |
| 914 document()->setAnnotatedRegionsDirty(true); | 914 document()->setAnnotatedRegionsDirty(true); |
| 915 } | 915 } |
| 916 | 916 |
| 917 } // namespace WebCore | 917 } // namespace WebCore |
| OLD | NEW |