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

Unified Diff: Source/core/rendering/style/StyleRareInheritedData.cpp

Issue 219633002: Proper support for multiple text decorations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix jchaffraix' issues. Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/wtf/RefVector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/StyleRareInheritedData.cpp
diff --git a/Source/core/rendering/style/StyleRareInheritedData.cpp b/Source/core/rendering/style/StyleRareInheritedData.cpp
index bcc9efce3aba6aee142ffd152b7b6c25697c2425..0e28952eb3f033e03abf86634b6fb1b3d83da86b 100644
--- a/Source/core/rendering/style/StyleRareInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareInheritedData.cpp
@@ -22,6 +22,7 @@
#include "config.h"
#include "core/rendering/style/StyleRareInheritedData.h"
+#include "core/rendering/style/AppliedTextDecoration.h"
#include "core/rendering/style/CursorList.h"
#include "core/rendering/style/DataEquivalency.h"
#include "core/rendering/style/QuotesData.h"
@@ -39,7 +40,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
Color colors[5];
void* ownPtrs[1];
AtomicString atomicStrings[4];
- void* refPtrs[2];
+ void* refPtrs[3];
Length lengths[1];
float secondFloat;
unsigned m_bitfields[2];
@@ -152,6 +153,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, textEmphasisCustomMark(o.textEmphasisCustomMark)
, m_tabSize(o.m_tabSize)
, tapHighlightColor(o.tapHighlightColor)
+ , appliedTextDecorations(o.appliedTextDecorations)
{
}
@@ -214,7 +216,8 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& m_imageRendering == o.m_imageRendering
&& m_textUnderlinePosition == o.m_textUnderlinePosition
&& m_rubyPosition == o.m_rubyPosition
- && dataEquivalent(listStyleImage.get(), o.listStyleImage.get());
+ && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
+ && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
}
bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/wtf/RefVector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698