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

Unified Diff: sky/engine/core/rendering/RenderLayerClipper.cpp

Issue 715453002: Remove OverlayScrollbarSizeRelevancy. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/RenderLayerClipper.cpp
diff --git a/sky/engine/core/rendering/RenderLayerClipper.cpp b/sky/engine/core/rendering/RenderLayerClipper.cpp
index 81bf9f00c3bfe62fb1b09df1d133ce735aed7ca7..ead4e83be2601afdab2cef626841720aa8bd2c65 100644
--- a/sky/engine/core/rendering/RenderLayerClipper.cpp
+++ b/sky/engine/core/rendering/RenderLayerClipper.cpp
@@ -64,7 +64,7 @@ static void applyClipRects(const ClipRectsContext& context, RenderObject& render
ASSERT(renderer.hasOverflowClip() || renderer.hasClip());
if (renderer.hasOverflowClip()) {
- ClipRect newOverflowClip = toRenderBox(renderer).overflowClipRect(offset, context.scrollbarRelevancy);
+ ClipRect newOverflowClip = toRenderBox(renderer).overflowClipRect(offset);
newOverflowClip.setHasRadius(renderer.style()->hasBorderRadius());
clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.overflowClipRect()));
if (renderer.isPositioned())
@@ -94,7 +94,6 @@ ClipRects* RenderLayerClipper::clipRectsIfCached(const ClipRectsContext& context
// http://crbug.com/366118 for an example.
if (context.rootLayer != entry.root)
return 0;
- ASSERT(entry.scrollbarRelevancy == context.scrollbarRelevancy);
#ifdef CHECK_CACHED_CLIP_RECTS
// This code is useful to check cached clip rects, but is too expensive to leave enabled in debug builds by default.
@@ -112,9 +111,6 @@ ClipRects* RenderLayerClipper::storeClipRectsInCache(const ClipRectsContext& con
{
ClipRectsCache::Entry& entry = cache().get(context.cacheSlot);
entry.root = context.rootLayer;
-#if ENABLE(ASSERT)
- entry.scrollbarRelevancy = context.scrollbarRelevancy;
-#endif
if (parentClipRects) {
// If our clip rects match the clip rects of our parent, we share storage.
@@ -222,7 +218,7 @@ void RenderLayerClipper::calculateRects(const ClipRectsContext& context, const L
if (m_renderer.hasOverflowClip()) {
// This layer establishes a clip of some kind.
if (!isClippingRoot || context.respectOverflowClip == RespectOverflowClip) {
- foregroundRect.intersect(toRenderBox(m_renderer).overflowClipRect(offset, context.scrollbarRelevancy));
+ foregroundRect.intersect(toRenderBox(m_renderer).overflowClipRect(offset));
if (m_renderer.style()->hasBorderRadius())
foregroundRect.setHasRadius(true);
}
« no previous file with comments | « sky/engine/core/rendering/RenderLayerClipper.h ('k') | sky/engine/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698