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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2147393003: Don't skip table rows when computing visual rects if the row is the ancestor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: none Created 4 years, 5 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
« no previous file with comments | « third_party/WebKit/LayoutTests/paint/invalidation/composited-table-row-expected.txt ('k') | no next file » | 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2026 matching lines...) Expand 10 before | Expand all | Expand 10 after
2037 { 2037 {
2038 inflateVisualRectForReflectionAndFilter(rect); 2038 inflateVisualRectForReflectionAndFilter(rect);
2039 2039
2040 if (ancestor == this) 2040 if (ancestor == this)
2041 return true; 2041 return true;
2042 2042
2043 bool ancestorSkipped; 2043 bool ancestorSkipped;
2044 bool filterOrReflectionSkipped; 2044 bool filterOrReflectionSkipped;
2045 LayoutObject* container = this->container(ancestor, &ancestorSkipped, &filte rOrReflectionSkipped); 2045 LayoutObject* container = this->container(ancestor, &ancestorSkipped, &filte rOrReflectionSkipped);
2046 LayoutBox* localContainingBlock = containingBlock(); 2046 LayoutBox* localContainingBlock = containingBlock();
2047 // Skip table row because cells and rows are in the same coordinate space. 2047 // Skip table row because cells and rows are in the same coordinate space, e xcept when we're already at the ancestor.
2048 if (container->isTableRow()) { 2048 if (container->isTableRow() && container != ancestor) {
2049 DCHECK(isTableCell()); 2049 DCHECK(isTableCell());
2050 localContainingBlock = toLayoutBox(container->parent()); 2050 localContainingBlock = toLayoutBox(container->parent());
2051 container = container->parent(); 2051 container = container->parent();
2052 } 2052 }
2053 if (!container) 2053 if (!container)
2054 return true; 2054 return true;
2055 2055
2056 if (filterOrReflectionSkipped) 2056 if (filterOrReflectionSkipped)
2057 inflateVisualRectForReflectionAndFilterUnderContainer(rect, *container, ancestor); 2057 inflateVisualRectForReflectionAndFilterUnderContainer(rect, *container, ancestor);
2058 2058
(...skipping 2867 matching lines...) Expand 10 before | Expand all | Expand 10 after
4926 m_rareData->m_snapAreas->remove(&snapArea); 4926 m_rareData->m_snapAreas->remove(&snapArea);
4927 } 4927 }
4928 } 4928 }
4929 4929
4930 SnapAreaSet* LayoutBox::snapAreas() const 4930 SnapAreaSet* LayoutBox::snapAreas() const
4931 { 4931 {
4932 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; 4932 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
4933 } 4933 }
4934 4934
4935 } // namespace blink 4935 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/paint/invalidation/composited-table-row-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698