| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 
      reserved. |     2  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 
      reserved. | 
|     3  * |     3  * | 
|     4  * Portions are Copyright (C) 1998 Netscape Communications Corporation. |     4  * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 
|     5  * |     5  * | 
|     6  * Other contributors: |     6  * Other contributors: | 
|     7  *   Robert O'Callahan <roc+@cs.cmu.edu> |     7  *   Robert O'Callahan <roc+@cs.cmu.edu> | 
|     8  *   David Baron <dbaron@fas.harvard.edu> |     8  *   David Baron <dbaron@fas.harvard.edu> | 
|     9  *   Christian Biesinger <cbiesinger@web.de> |     9  *   Christian Biesinger <cbiesinger@web.de> | 
|    10  *   Randall Jesup <rjesup@wgate.com> |    10  *   Randall Jesup <rjesup@wgate.com> | 
| (...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   889  |   889  | 
|   890 void RenderLayerScrollableArea::destroyScrollbar(ScrollbarOrientation orientatio
      n) |   890 void RenderLayerScrollableArea::destroyScrollbar(ScrollbarOrientation orientatio
      n) | 
|   891 { |   891 { | 
|   892     RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar :
       m_vBar; |   892     RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar :
       m_vBar; | 
|   893     if (!scrollbar) |   893     if (!scrollbar) | 
|   894         return; |   894         return; | 
|   895  |   895  | 
|   896     if (!scrollbar->isCustomScrollbar()) |   896     if (!scrollbar->isCustomScrollbar()) | 
|   897         willRemoveScrollbar(scrollbar.get(), orientation); |   897         willRemoveScrollbar(scrollbar.get(), orientation); | 
|   898  |   898  | 
|   899     toScrollView(scrollbar->parent())->removeChild(scrollbar.get()); |   899     toFrameView(scrollbar->parent())->removeChild(scrollbar.get()); | 
|   900     scrollbar->disconnectFromScrollableArea(); |   900     scrollbar->disconnectFromScrollableArea(); | 
|   901     scrollbar = nullptr; |   901     scrollbar = nullptr; | 
|   902 } |   902 } | 
|   903  |   903  | 
|   904 void RenderLayerScrollableArea::setHasHorizontalScrollbar(bool hasScrollbar) |   904 void RenderLayerScrollableArea::setHasHorizontalScrollbar(bool hasScrollbar) | 
|   905 { |   905 { | 
|   906     if (hasScrollbar == hasHorizontalScrollbar()) |   906     if (hasScrollbar == hasHorizontalScrollbar()) | 
|   907         return; |   907         return; | 
|   908  |   908  | 
|   909     if (hasScrollbar) { |   909     if (hasScrollbar) { | 
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1486 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) |  1486 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) | 
|  1487 { |  1487 { | 
|  1488     // We only want to track the topmost scroll child for scrollable areas with |  1488     // We only want to track the topmost scroll child for scrollable areas with | 
|  1489     // overlay scrollbars. |  1489     // overlay scrollbars. | 
|  1490     if (!hasOverlayScrollbars()) |  1490     if (!hasOverlayScrollbars()) | 
|  1491         return; |  1491         return; | 
|  1492     m_nextTopmostScrollChild = scrollChild; |  1492     m_nextTopmostScrollChild = scrollChild; | 
|  1493 } |  1493 } | 
|  1494  |  1494  | 
|  1495 } // namespace blink |  1495 } // namespace blink | 
| OLD | NEW |