| 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 } | 350 } |
| 351 | 351 |
| 352 void RenderListBox::paintScrollbar(PaintInfo& paintInfo, const LayoutPoint& pain
tOffset) | 352 void RenderListBox::paintScrollbar(PaintInfo& paintInfo, const LayoutPoint& pain
tOffset) |
| 353 { | 353 { |
| 354 if (m_vBar) { | 354 if (m_vBar) { |
| 355 IntRect scrollRect = pixelSnappedIntRect(paintOffset.x() + width() - bor
derRight() - m_vBar->width(), | 355 IntRect scrollRect = pixelSnappedIntRect(paintOffset.x() + width() - bor
derRight() - m_vBar->width(), |
| 356 paintOffset.y() + borderTop(), | 356 paintOffset.y() + borderTop(), |
| 357 m_vBar->width(), | 357 m_vBar->width(), |
| 358 height() - (borderTop() + borderBottom())); | 358 height() - (borderTop() + borderBottom())); |
| 359 m_vBar->setFrameRect(scrollRect); | 359 m_vBar->setFrameRect(scrollRect); |
| 360 m_vBar->paint(paintInfo.context, paintInfo.rect()); | 360 m_vBar->paint(paintInfo.context, paintInfo.rect); |
| 361 } | 361 } |
| 362 } | 362 } |
| 363 | 363 |
| 364 static LayoutSize itemOffsetForAlignment(TextRun textRun, RenderStyle* itemStyle
, Font itemFont, LayoutRect itemBoudingBox) | 364 static LayoutSize itemOffsetForAlignment(TextRun textRun, RenderStyle* itemStyle
, Font itemFont, LayoutRect itemBoudingBox) |
| 365 { | 365 { |
| 366 ETextAlign actualAlignment = itemStyle->textAlign(); | 366 ETextAlign actualAlignment = itemStyle->textAlign(); |
| 367 // FIXME: Firefox doesn't respect JUSTIFY. Should we? | 367 // FIXME: Firefox doesn't respect JUSTIFY. Should we? |
| 368 // FIXME: Handle TAEND here | 368 // FIXME: Handle TAEND here |
| 369 if (actualAlignment == TASTART || actualAlignment == JUSTIFY) | 369 if (actualAlignment == TASTART || actualAlignment == JUSTIFY) |
| 370 actualAlignment = itemStyle->isLeftToRightDirection() ? LEFT : RIGHT; | 370 actualAlignment = itemStyle->isLeftToRightDirection() ? LEFT : RIGHT; |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 907 | 907 |
| 908 if (m_vBar) | 908 if (m_vBar) |
| 909 m_vBar->styleChanged(); | 909 m_vBar->styleChanged(); |
| 910 | 910 |
| 911 // Force an update since we know the scrollbars have changed things. | 911 // Force an update since we know the scrollbars have changed things. |
| 912 if (document()->hasAnnotatedRegions()) | 912 if (document()->hasAnnotatedRegions()) |
| 913 document()->setAnnotatedRegionsDirty(true); | 913 document()->setAnnotatedRegionsDirty(true); |
| 914 } | 914 } |
| 915 | 915 |
| 916 } // namespace WebCore | 916 } // namespace WebCore |
| OLD | NEW |