| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 return; | 98 return; |
| 99 | 99 |
| 100 ASSERT(m_scrollableArea); | 100 ASSERT(m_scrollableArea); |
| 101 if (m_orientation == VerticalScrollbar) | 101 if (m_orientation == VerticalScrollbar) |
| 102 m_animator->willRemoveVerticalScrollbar(this); | 102 m_animator->willRemoveVerticalScrollbar(this); |
| 103 else | 103 else |
| 104 m_animator->willRemoveHorizontalScrollbar(this); | 104 m_animator->willRemoveHorizontalScrollbar(this); |
| 105 #endif | 105 #endif |
| 106 } | 106 } |
| 107 | 107 |
| 108 void Scrollbar::setFrameRect(const IntRect& frameRect) |
| 109 { |
| 110 if (frameRect == this->frameRect()) |
| 111 return; |
| 112 |
| 113 invalidate(); |
| 114 Widget::setFrameRect(frameRect); |
| 115 invalidate(); |
| 116 } |
| 117 |
| 108 ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const | 118 ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const |
| 109 { | 119 { |
| 110 return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : Scroll
barOverlayStyleDefault; | 120 return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : Scroll
barOverlayStyleDefault; |
| 111 } | 121 } |
| 112 | 122 |
| 113 void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const | 123 void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const |
| 114 { | 124 { |
| 115 if (m_scrollableArea) | 125 if (m_scrollableArea) |
| 116 m_scrollableArea->getTickmarks(tickmarks); | 126 m_scrollableArea->getTickmarks(tickmarks); |
| 117 } | 127 } |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 | 565 |
| 556 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr
ollPosition().y(); | 566 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr
ollPosition().y(); |
| 557 } | 567 } |
| 558 | 568 |
| 559 DisplayItemClient Scrollbar::displayItemClient() const | 569 DisplayItemClient Scrollbar::displayItemClient() const |
| 560 { | 570 { |
| 561 return m_scrollableArea->displayItemClient(); | 571 return m_scrollableArea->displayItemClient(); |
| 562 } | 572 } |
| 563 | 573 |
| 564 } // namespace blink | 574 } // namespace blink |
| OLD | NEW |