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

Side by Side Diff: sky/engine/core/rendering/RenderLayerScrollableArea.cpp

Issue 787293002: Remove the straggling DisableCompositingQueryAsserts. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 101
102 HostWindow* RenderLayerScrollableArea::hostWindow() const 102 HostWindow* RenderLayerScrollableArea::hostWindow() const
103 { 103 {
104 if (Page* page = box().frame()->page()) 104 if (Page* page = box().frame()->page())
105 return &page->chrome(); 105 return &page->chrome();
106 return nullptr; 106 return nullptr;
107 } 107 }
108 108
109 void RenderLayerScrollableArea::invalidateScrollbarRect(Scrollbar* scrollbar, co nst IntRect& rect) 109 void RenderLayerScrollableArea::invalidateScrollbarRect(Scrollbar* scrollbar, co nst IntRect& rect)
110 { 110 {
111 // See crbug.com/343132.
112 DisableCompositingQueryAsserts disabler;
113
114 IntRect scrollRect = rect; 111 IntRect scrollRect = rect;
115 // If we are not yet inserted into the tree, there is no need to issue paint invaldiations. 112 // If we are not yet inserted into the tree, there is no need to issue paint invaldiations.
116 if (!box().parent()) 113 if (!box().parent())
117 return; 114 return;
118 115
119 if (scrollbar == m_vBar.get()) 116 if (scrollbar == m_vBar.get())
120 scrollRect.move(verticalScrollbarStart(0, box().width()), box().borderTo p()); 117 scrollRect.move(verticalScrollbarStart(0, box().width()), box().borderTo p());
121 else 118 else
122 scrollRect.move(horizontalScrollbarStart(0), box().height() - box().bord erBottom() - scrollbar->height()); 119 scrollRect.move(horizontalScrollbarStart(0), box().height() - box().bord erBottom() - scrollbar->height());
123 120
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) 761 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
765 { 762 {
766 // We only want to track the topmost scroll child for scrollable areas with 763 // We only want to track the topmost scroll child for scrollable areas with
767 // overlay scrollbars. 764 // overlay scrollbars.
768 if (!hasOverlayScrollbars()) 765 if (!hasOverlayScrollbars())
769 return; 766 return;
770 m_nextTopmostScrollChild = scrollChild; 767 m_nextTopmostScrollChild = scrollChild;
771 } 768 }
772 769
773 } // namespace blink 770 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698