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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2550343002: Move border-collapse to be generated in ComputedStyleBase (Closed)
Patch Set: Created 4 years 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: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 1e6afe9da4816c0be507d72ed71436d7b5fc9b6c..f75285a29a5f187c5e1f8efa20a50377e6b2723c 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -842,8 +842,7 @@ bool ComputedStyle::diffNeedsFullLayoutAndPaintInvalidation(
return true;
if (isDisplayTableType(display())) {
- if (m_inheritedData.m_borderCollapse !=
- other.m_inheritedData.m_borderCollapse ||
+ if (borderCollapse() != other.borderCollapse() ||
emptyCells() != other.emptyCells() ||
captionSide() != other.captionSide() ||
m_nonInheritedData.m_tableLayout !=
@@ -852,7 +851,7 @@ bool ComputedStyle::diffNeedsFullLayoutAndPaintInvalidation(
// In the collapsing border model, 'hidden' suppresses other borders, while
// 'none' does not, so these style differences can be width differences.
- if (m_inheritedData.m_borderCollapse &&
+ if ((borderCollapse() == EBorderCollapse::Collapse) &&
alancutter (OOO until 2018) 2016/12/06 03:50:30 Pleased to see this change.
((borderTopStyle() == BorderStyleHidden &&
other.borderTopStyle() == BorderStyleNone) ||
(borderTopStyle() == BorderStyleNone &&
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698