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

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

Issue 712573003: Remove usesCompositedScrolling (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: wee Created 6 years, 1 month 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@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 2134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2145 for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) 2145 for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
2146 child->invalidatePaintForBlockSelectionGaps(); 2146 child->invalidatePaintForBlockSelectionGaps();
2147 2147
2148 if (m_blockSelectionGapsBounds.isEmpty()) 2148 if (m_blockSelectionGapsBounds.isEmpty())
2149 return; 2149 return;
2150 2150
2151 LayoutRect rect = m_blockSelectionGapsBounds; 2151 LayoutRect rect = m_blockSelectionGapsBounds;
2152 if (renderer()->hasOverflowClip()) { 2152 if (renderer()->hasOverflowClip()) {
2153 RenderBox* box = renderBox(); 2153 RenderBox* box = renderBox();
2154 rect.move(-box->scrolledContentOffset()); 2154 rect.move(-box->scrolledContentOffset());
2155 if (!scrollableArea()->usesCompositedScrolling()) 2155 rect.intersect(box->overflowClipRect(LayoutPoint()));
2156 rect.intersect(box->overflowClipRect(LayoutPoint()));
2157 } 2156 }
2158 if (renderer()->hasClip()) 2157 if (renderer()->hasClip())
2159 rect.intersect(toRenderBox(renderer())->clipRect(LayoutPoint())); 2158 rect.intersect(toRenderBox(renderer())->clipRect(LayoutPoint()));
2160 if (!rect.isEmpty()) 2159 if (!rect.isEmpty())
2161 renderer()->invalidatePaintRectangle(rect); 2160 renderer()->invalidatePaintRectangle(rect);
2162 } 2161 }
2163 2162
2164 IntRect RenderLayer::blockSelectionGapsBounds() const 2163 IntRect RenderLayer::blockSelectionGapsBounds() const
2165 { 2164 {
2166 if (!renderer()->isRenderBlock()) 2165 if (!renderer()->isRenderBlock())
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
2777 } 2776 }
2778 } 2777 }
2779 2778
2780 void showLayerTree(const blink::RenderObject* renderer) 2779 void showLayerTree(const blink::RenderObject* renderer)
2781 { 2780 {
2782 if (!renderer) 2781 if (!renderer)
2783 return; 2782 return;
2784 showLayerTree(renderer->enclosingLayer()); 2783 showLayerTree(renderer->enclosingLayer());
2785 } 2784 }
2786 #endif 2785 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698