| 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@gmail.com> | 9 * Christian Biesinger <cbiesinger@gmail.com> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 * deletingthe provisions above and replace them with the notice and | 38 * deletingthe provisions above and replace them with the notice and |
| 39 * other provisions required by the MPL or the GPL, as the case may be. | 39 * other provisions required by the MPL or the GPL, as the case may be. |
| 40 * If you do not delete the provisions above, a recipient may use your | 40 * If you do not delete the provisions above, a recipient may use your |
| 41 * version of this file under any of the LGPL, the MPL or the GPL. | 41 * version of this file under any of the LGPL, the MPL or the GPL. |
| 42 */ | 42 */ |
| 43 | 43 |
| 44 #include "core/paint/PaintLayerScrollableArea.h" | 44 #include "core/paint/PaintLayerScrollableArea.h" |
| 45 | 45 |
| 46 #include "core/css/PseudoStyleRequest.h" | 46 #include "core/css/PseudoStyleRequest.h" |
| 47 #include "core/dom/AXObjectCache.h" | 47 #include "core/dom/AXObjectCache.h" |
| 48 #include "core/dom/DOMNodeIds.h" |
| 48 #include "core/dom/Node.h" | 49 #include "core/dom/Node.h" |
| 49 #include "core/dom/shadow/ShadowRoot.h" | 50 #include "core/dom/shadow/ShadowRoot.h" |
| 50 #include "core/editing/FrameSelection.h" | 51 #include "core/editing/FrameSelection.h" |
| 51 #include "core/frame/FrameHost.h" | 52 #include "core/frame/FrameHost.h" |
| 52 #include "core/frame/FrameView.h" | 53 #include "core/frame/FrameView.h" |
| 53 #include "core/frame/LocalFrame.h" | 54 #include "core/frame/LocalFrame.h" |
| 54 #include "core/frame/Settings.h" | 55 #include "core/frame/Settings.h" |
| 55 #include "core/html/HTMLFrameOwnerElement.h" | 56 #include "core/html/HTMLFrameOwnerElement.h" |
| 56 #include "core/input/EventHandler.h" | 57 #include "core/input/EventHandler.h" |
| 57 #include "core/layout/LayoutFlexibleBox.h" | 58 #include "core/layout/LayoutFlexibleBox.h" |
| (...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1613 m_scrollableArea->m_rebuildVerticalScrollbarLayer = true; | 1614 m_scrollableArea->m_rebuildVerticalScrollbarLayer = true; |
| 1614 | 1615 |
| 1615 if (!scrollbar->isCustomScrollbar()) | 1616 if (!scrollbar->isCustomScrollbar()) |
| 1616 m_scrollableArea->willRemoveScrollbar(*scrollbar, orientation); | 1617 m_scrollableArea->willRemoveScrollbar(*scrollbar, orientation); |
| 1617 | 1618 |
| 1618 toFrameView(scrollbar->parent())->removeChild(scrollbar.get()); | 1619 toFrameView(scrollbar->parent())->removeChild(scrollbar.get()); |
| 1619 scrollbar->disconnectFromScrollableArea(); | 1620 scrollbar->disconnectFromScrollableArea(); |
| 1620 scrollbar = nullptr; | 1621 scrollbar = nullptr; |
| 1621 } | 1622 } |
| 1622 | 1623 |
| 1624 uint64_t PaintLayerScrollableArea::id() const |
| 1625 { |
| 1626 return DOMNodeIds::idForNode(box().node()); |
| 1627 } |
| 1628 |
| 1623 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) | 1629 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) |
| 1624 { | 1630 { |
| 1625 visitor->trace(m_scrollableArea); | 1631 visitor->trace(m_scrollableArea); |
| 1626 visitor->trace(m_hBar); | 1632 visitor->trace(m_hBar); |
| 1627 visitor->trace(m_vBar); | 1633 visitor->trace(m_vBar); |
| 1628 } | 1634 } |
| 1629 | 1635 |
| 1630 } // namespace blink | 1636 } // namespace blink |
| OLD | NEW |