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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.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 unified diff | Download patch
« no previous file with comments | « sky/engine/core/rendering/ClipRectsCache.h ('k') | sky/engine/core/rendering/RenderBox.h » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 } 2031 }
2032 2032
2033 // If we have clipping, then we can't have any spillout. 2033 // If we have clipping, then we can't have any spillout.
2034 bool useOverflowClip = hasOverflowClip() && !hasSelfPaintingLayer(); 2034 bool useOverflowClip = hasOverflowClip() && !hasSelfPaintingLayer();
2035 bool useClip = (hasControlClip() || useOverflowClip); 2035 bool useClip = (hasControlClip() || useOverflowClip);
2036 bool checkChildren = !useClip; 2036 bool checkChildren = !useClip;
2037 if (!checkChildren) { 2037 if (!checkChildren) {
2038 if (hasControlClip()) { 2038 if (hasControlClip()) {
2039 checkChildren = locationInContainer.intersects(controlClipRect(adjus tedLocation)); 2039 checkChildren = locationInContainer.intersects(controlClipRect(adjus tedLocation));
2040 } else { 2040 } else {
2041 LayoutRect clipRect = overflowClipRect(adjustedLocation, IncludeOver layScrollbarSize); 2041 LayoutRect clipRect = overflowClipRect(adjustedLocation);
2042 if (style()->hasBorderRadius()) 2042 if (style()->hasBorderRadius())
2043 checkChildren = locationInContainer.intersects(style()->getRound edBorderFor(clipRect)); 2043 checkChildren = locationInContainer.intersects(style()->getRound edBorderFor(clipRect));
2044 else 2044 else
2045 checkChildren = locationInContainer.intersects(clipRect); 2045 checkChildren = locationInContainer.intersects(clipRect);
2046 } 2046 }
2047 } 2047 }
2048 if (checkChildren) { 2048 if (checkChildren) {
2049 // Hit test descendants first. 2049 // Hit test descendants first.
2050 LayoutSize scrolledOffset(localOffset); 2050 LayoutSize scrolledOffset(localOffset);
2051 if (hasOverflowClip()) 2051 if (hasOverflowClip())
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
2939 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 2939 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
2940 { 2940 {
2941 showRenderObject(); 2941 showRenderObject();
2942 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2942 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2943 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2943 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2944 } 2944 }
2945 2945
2946 #endif 2946 #endif
2947 2947
2948 } // namespace blink 2948 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/ClipRectsCache.h ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698