Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 2049063002: Revert of Use element id's for animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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"
49 #include "core/dom/Node.h" 48 #include "core/dom/Node.h"
50 #include "core/dom/shadow/ShadowRoot.h" 49 #include "core/dom/shadow/ShadowRoot.h"
51 #include "core/editing/FrameSelection.h" 50 #include "core/editing/FrameSelection.h"
52 #include "core/frame/FrameHost.h" 51 #include "core/frame/FrameHost.h"
53 #include "core/frame/FrameView.h" 52 #include "core/frame/FrameView.h"
54 #include "core/frame/LocalFrame.h" 53 #include "core/frame/LocalFrame.h"
55 #include "core/frame/Settings.h" 54 #include "core/frame/Settings.h"
56 #include "core/html/HTMLFrameOwnerElement.h" 55 #include "core/html/HTMLFrameOwnerElement.h"
57 #include "core/input/EventHandler.h" 56 #include "core/input/EventHandler.h"
58 #include "core/layout/LayoutFlexibleBox.h" 57 #include "core/layout/LayoutFlexibleBox.h"
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1635 m_scrollableArea->m_rebuildVerticalScrollbarLayer = true; 1634 m_scrollableArea->m_rebuildVerticalScrollbarLayer = true;
1636 1635
1637 if (!scrollbar->isCustomScrollbar()) 1636 if (!scrollbar->isCustomScrollbar())
1638 m_scrollableArea->willRemoveScrollbar(*scrollbar, orientation); 1637 m_scrollableArea->willRemoveScrollbar(*scrollbar, orientation);
1639 1638
1640 toFrameView(scrollbar->parent())->removeChild(scrollbar.get()); 1639 toFrameView(scrollbar->parent())->removeChild(scrollbar.get());
1641 scrollbar->disconnectFromScrollableArea(); 1640 scrollbar->disconnectFromScrollableArea();
1642 scrollbar = nullptr; 1641 scrollbar = nullptr;
1643 } 1642 }
1644 1643
1645 uint64_t PaintLayerScrollableArea::id() const
1646 {
1647 return DOMNodeIds::idForNode(box().node());
1648 }
1649
1650 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) 1644 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
1651 { 1645 {
1652 visitor->trace(m_scrollableArea); 1646 visitor->trace(m_scrollableArea);
1653 visitor->trace(m_hBar); 1647 visitor->trace(m_hBar);
1654 visitor->trace(m_vBar); 1648 visitor->trace(m_vBar);
1655 } 1649 }
1656 1650
1657 int PaintLayerScrollableArea::PreventRelayoutScope::s_count = 0; 1651 int PaintLayerScrollableArea::PreventRelayoutScope::s_count = 0;
1658 SubtreeLayoutScope* PaintLayerScrollableArea::PreventRelayoutScope::s_layoutScop e = nullptr; 1652 SubtreeLayoutScope* PaintLayerScrollableArea::PreventRelayoutScope::s_layoutScop e = nullptr;
1659 bool PaintLayerScrollableArea::PreventRelayoutScope::s_relayoutNeeded = false; 1653 bool PaintLayerScrollableArea::PreventRelayoutScope::s_relayoutNeeded = false;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
1727 1721
1728 void PaintLayerScrollableArea::DelayScrollPositionClampScope::clampScrollableAre as() 1722 void PaintLayerScrollableArea::DelayScrollPositionClampScope::clampScrollableAre as()
1729 { 1723 {
1730 for (auto& scrollableArea : *s_needsClamp) 1724 for (auto& scrollableArea : *s_needsClamp)
1731 scrollableArea->clampScrollPositionsAfterLayout(); 1725 scrollableArea->clampScrollPositionsAfterLayout();
1732 delete s_needsClamp; 1726 delete s_needsClamp;
1733 s_needsClamp = nullptr; 1727 s_needsClamp = nullptr;
1734 } 1728 }
1735 1729
1736 } // namespace blink 1730 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698