summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org>2015-08-05 17:15:27 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org>2015-08-05 17:15:27 +0000
commit279226447e8a2c2f78f5c1cfd02e481b669fe92b (patch)
tree89f29794421d1525cc411357da7e19ac794c714e /third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
parent6498a17a01801978d04a189bb370ce7b40420f29 (diff)
downloadchromium_src-279226447e8a2c2f78f5c1cfd02e481b669fe92b.zip
chromium_src-279226447e8a2c2f78f5c1cfd02e481b669fe92b.tar.gz
chromium_src-279226447e8a2c2f78f5c1cfd02e481b669fe92b.tar.bz2
Preparation for combining paths of focus rings and outlines
This is split from https://codereview.chromium.org/1224933002/ to ease review. - Rename addFocusRingRects to addOutlineRects; - Remove ComputedStyle::outlineSize() which returns incorrect value when outline style is 'auto'. We should use ComputedStyle::outlineOutsetExtent() (renamed from outlineOutset() to avoid ambiguity) instead. BUG=506669 Review URL: https://codereview.chromium.org/1269123002 git-svn-id: svn://svn.chromium.org/blink/trunk@200049 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Source/core/layout/LayoutTableCell.cpp')
-rw-r--r--third_party/WebKit/Source/core/layout/LayoutTableCell.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
index 296f327..5ee5ab0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
@@ -322,11 +322,11 @@ LayoutRect LayoutTableCell::clippedOverflowRectForPaintInvalidation(const Layout
return LayoutBlockFlow::clippedOverflowRectForPaintInvalidation(paintInvalidationContainer, paintInvalidationState);
bool rtl = !styleForCellFlow().isLeftToRightDirection();
- int outlineSize = style()->outlineSize();
- int left = std::max(borderHalfLeft(true), outlineSize);
- int right = std::max(borderHalfRight(true), outlineSize);
- int top = std::max(borderHalfTop(true), outlineSize);
- int bottom = std::max(borderHalfBottom(true), outlineSize);
+ int outlineOutset = style()->outlineOutsetExtent();
+ int left = std::max(borderHalfLeft(true), outlineOutset);
+ int right = std::max(borderHalfRight(true), outlineOutset);
+ int top = std::max(borderHalfTop(true), outlineOutset);
+ int bottom = std::max(borderHalfBottom(true), outlineOutset);
if ((left && !rtl) || (right && rtl)) {
if (LayoutTableCell* before = table()->cellBefore(this)) {
top = std::max(top, before->borderHalfTop(true));