| 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 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 | 935 |
| 936 void RenderListBox::destroyScrollbar() | 936 void RenderListBox::destroyScrollbar() |
| 937 { | 937 { |
| 938 if (!m_vBar) | 938 if (!m_vBar) |
| 939 return; | 939 return; |
| 940 | 940 |
| 941 if (!m_vBar->isCustomScrollbar()) | 941 if (!m_vBar->isCustomScrollbar()) |
| 942 ScrollableArea::willRemoveScrollbar(m_vBar.get(), VerticalScrollbar); | 942 ScrollableArea::willRemoveScrollbar(m_vBar.get(), VerticalScrollbar); |
| 943 m_vBar->removeFromParent(); | 943 m_vBar->removeFromParent(); |
| 944 m_vBar->disconnectFromScrollableArea(); | 944 m_vBar->disconnectFromScrollableArea(); |
| 945 m_vBar = 0; | 945 m_vBar = nullptr; |
| 946 } | 946 } |
| 947 | 947 |
| 948 void RenderListBox::setHasVerticalScrollbar(bool hasScrollbar) | 948 void RenderListBox::setHasVerticalScrollbar(bool hasScrollbar) |
| 949 { | 949 { |
| 950 if (hasScrollbar == (m_vBar != 0)) | 950 if (hasScrollbar == (m_vBar != 0)) |
| 951 return; | 951 return; |
| 952 | 952 |
| 953 if (hasScrollbar) | 953 if (hasScrollbar) |
| 954 m_vBar = createScrollbar(); | 954 m_vBar = createScrollbar(); |
| 955 else | 955 else |
| 956 destroyScrollbar(); | 956 destroyScrollbar(); |
| 957 | 957 |
| 958 if (m_vBar) | 958 if (m_vBar) |
| 959 m_vBar->styleChanged(); | 959 m_vBar->styleChanged(); |
| 960 | 960 |
| 961 // Force an update since we know the scrollbars have changed things. | 961 // Force an update since we know the scrollbars have changed things. |
| 962 if (document().hasAnnotatedRegions()) | 962 if (document().hasAnnotatedRegions()) |
| 963 document().setAnnotatedRegionsDirty(true); | 963 document().setAnnotatedRegionsDirty(true); |
| 964 } | 964 } |
| 965 | 965 |
| 966 } // namespace WebCore | 966 } // namespace WebCore |
| OLD | NEW |