debugging for crbug.com/646539

third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

Index: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
index 36ac5078990af9decb9abb06fe93f180cf5365c4..8d7e4a4bced830ff415d9343be3298e63b172a20 100644
--- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
+++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
@@ -21,147 +21,13 @@
 
 #include "core/style/StyleRareInheritedData.h"
 
-#include "core/style/AppliedTextDecoration.h"
-#include "core/style/CursorData.h"
-#include "core/style/DataEquivalency.h"
-#include "core/style/ComputedStyle.h"
-#include "core/style/ComputedStyleConstants.h"
-#include "core/style/QuotesData.h"
-#include "core/style/ShadowList.h"
-#include "core/style/StyleImage.h"
-#include "core/style/StyleVariableData.h"
-
 namespace blink {
 
-struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareInheritedData> {
-    void* styleImage;
-    Color firstColor;
-    float firstFloat;
-    Color colors[5];
-    void* ownPtrs[1];
-    AtomicString atomicStrings[3];
-    void* refPtrs[1];
-    Persistent<void*> persistentHandles[2];
-    Length lengths[1];
-    float secondFloat;
-    unsigned m_bitfields[2];
-    short pagedMediaShorts[2];
-    short hyphenationShorts[3];
-    uint8_t snapHeight;
-
-    Color touchColors;
-    TabSize tabSize;
-    void* variables[1];
-    TextSizeAdjust textSizeAdjust;
-};
-
-static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheritedData), "StyleRareInheritedData should stay small");
-
 StyleRareInheritedData::StyleRareInheritedData()
-    : listStyleImage(ComputedStyle::initialListStyleImage())
-    , textStrokeWidth(ComputedStyle::initialTextStrokeWidth())
-    , indent(ComputedStyle::initialTextIndent())
-    , m_effectiveZoom(ComputedStyle::initialZoom())
-    , widows(ComputedStyle::initialWidows())
-    , orphans(ComputedStyle::initialOrphans())
-    , m_textStrokeColorIsCurrentColor(true)
-    , m_textFillColorIsCurrentColor(true)
-    , m_textEmphasisColorIsCurrentColor(true)
-    , m_visitedLinkTextStrokeColorIsCurrentColor(true)
+    : m_textStrokeColorIsCurrentColor(true)
     , m_visitedLinkTextFillColorIsCurrentColor(true)
-    , m_visitedLinkTextEmphasisColorIsCurrentColor(true)
-    , textSecurity(ComputedStyle::initialTextSecurity())
-    , userModify(READ_ONLY)
-    , wordBreak(ComputedStyle::initialWordBreak())
-    , overflowWrap(ComputedStyle::initialOverflowWrap())
-    , lineBreak(LineBreakAuto)
-    , userSelect(ComputedStyle::initialUserSelect())
-    , speak(SpeakNormal)
-    , hyphens(HyphensManual)
-    , textEmphasisFill(TextEmphasisFillFilled)
-    , textEmphasisMark(TextEmphasisMarkNone)
-    , textEmphasisPosition(TextEmphasisPositionOver)
-    , m_textAlignLast(ComputedStyle::initialTextAlignLast())
-    , m_textJustify(ComputedStyle::initialTextJustify())
-    , m_textOrientation(TextOrientationMixed)
-    , m_textCombine(ComputedStyle::initialTextCombine())
-    , m_textIndentLine(ComputedStyle::initialTextIndentLine())
-    , m_textIndentType(ComputedStyle::initialTextIndentLine())
-    , m_imageRendering(ComputedStyle::initialImageRendering())
-    , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
-    , m_rubyPosition(ComputedStyle::initialRubyPosition())
-    , m_subtreeWillChangeContents(false)
-    , m_selfOrAncestorHasDirAutoAttribute(false)
-    , m_respectImageOrientation(false)
-    , m_snapHeightPosition(0)
-    , hyphenationLimitBefore(-1)
-    , hyphenationLimitAfter(-1)
-    , hyphenationLimitLines(-1)
-    , m_snapHeightUnit(0)
-    , tapHighlightColor(ComputedStyle::initialTapHighlightColor())
-    , m_tabSize(ComputedStyle::initialTabSize())
-    , m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust())
-{
-}
-
-StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
-    : RefCounted<StyleRareInheritedData>()
-    , listStyleImage(o.listStyleImage)
-    , m_textStrokeColor(o.m_textStrokeColor)
-    , textStrokeWidth(o.textStrokeWidth)
-    , m_textFillColor(o.m_textFillColor)
-    , m_textEmphasisColor(o.m_textEmphasisColor)
-    , m_visitedLinkTextStrokeColor(o.m_visitedLinkTextStrokeColor)
-    , m_visitedLinkTextFillColor(o.m_visitedLinkTextFillColor)
-    , m_visitedLinkTextEmphasisColor(o.m_visitedLinkTextEmphasisColor)
-    , textShadow(o.textShadow)
-    , highlight(o.highlight)
-    , cursorData(o.cursorData)
-    , indent(o.indent)
-    , m_effectiveZoom(o.m_effectiveZoom)
-    , widows(o.widows)
-    , orphans(o.orphans)
-    , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor)
-    , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor)
-    , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor)
-    , m_visitedLinkTextStrokeColorIsCurrentColor(o.m_visitedLinkTextStrokeColorIsCurrentColor)
-    , m_visitedLinkTextFillColorIsCurrentColor(o.m_visitedLinkTextFillColorIsCurrentColor)
-    , m_visitedLinkTextEmphasisColorIsCurrentColor(o.m_visitedLinkTextEmphasisColorIsCurrentColor)
-    , textSecurity(o.textSecurity)
-    , userModify(o.userModify)
-    , wordBreak(o.wordBreak)
-    , overflowWrap(o.overflowWrap)
-    , lineBreak(o.lineBreak)
-    , userSelect(o.userSelect)
-    , speak(o.speak)
-    , hyphens(o.hyphens)
-    , textEmphasisFill(o.textEmphasisFill)
-    , textEmphasisMark(o.textEmphasisMark)
-    , textEmphasisPosition(o.textEmphasisPosition)
-    , m_textAlignLast(o.m_textAlignLast)
-    , m_textJustify(o.m_textJustify)
-    , m_textOrientation(o.m_textOrientation)
-    , m_textCombine(o.m_textCombine)
-    , m_textIndentLine(o.m_textIndentLine)
-    , m_textIndentType(o.m_textIndentType)
-    , m_imageRendering(o.m_imageRendering)
-    , m_textUnderlinePosition(o.m_textUnderlinePosition)
-    , m_rubyPosition(o.m_rubyPosition)
-    , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
-    , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute)
-    , m_respectImageOrientation(o.m_respectImageOrientation)
-    , m_snapHeightPosition(o.m_snapHeightPosition)
-    , hyphenationString(o.hyphenationString)
-    , hyphenationLimitBefore(o.hyphenationLimitBefore)
-    , hyphenationLimitAfter(o.hyphenationLimitAfter)
-    , hyphenationLimitLines(o.hyphenationLimitLines)
-    , m_snapHeightUnit(o.m_snapHeightUnit)
-    , textEmphasisCustomMark(o.textEmphasisCustomMark)
-    , tapHighlightColor(o.tapHighlightColor)
-    , appliedTextDecorations(o.appliedTextDecorations)
-    , m_tabSize(o.m_tabSize)
-    , variables(o.variables)
-    , m_textSizeAdjust(o.m_textSizeAdjust)
+    , m_textDecorationColor(StyleColor::currentColor())
+    , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
 {
 }
 
@@ -169,75 +35,13 @@ StyleRareInheritedData::~StyleRareInheritedData()
 {
 }
 
-bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
-{
-    return m_textStrokeColor == o.m_textStrokeColor
-        && textStrokeWidth == o.textStrokeWidth
-        && m_textFillColor == o.m_textFillColor
-        && m_textEmphasisColor == o.m_textEmphasisColor
-        && m_visitedLinkTextStrokeColor == o.m_visitedLinkTextStrokeColor
-        && m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor
-        && m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor
-        && tapHighlightColor == o.tapHighlightColor
-        && shadowDataEquivalent(o)
-        && highlight == o.highlight
-        && dataEquivalent(cursorData.get(), o.cursorData.get())
-        && indent == o.indent
-        && m_effectiveZoom == o.m_effectiveZoom
-        && widows == o.widows
-        && orphans == o.orphans
-        && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor
-        && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor
-        && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentColor
-        && m_visitedLinkTextStrokeColorIsCurrentColor == o.m_visitedLinkTextStrokeColorIsCurrentColor
-        && m_visitedLinkTextFillColorIsCurrentColor == o.m_visitedLinkTextFillColorIsCurrentColor
-        && m_visitedLinkTextEmphasisColorIsCurrentColor == o.m_visitedLinkTextEmphasisColorIsCurrentColor
-        && textSecurity == o.textSecurity
-        && userModify == o.userModify
-        && wordBreak == o.wordBreak
-        && overflowWrap == o.overflowWrap
-        && lineBreak == o.lineBreak
-        && userSelect == o.userSelect
-        && speak == o.speak
-        && hyphens == o.hyphens
-        && hyphenationLimitBefore == o.hyphenationLimitBefore
-        && hyphenationLimitAfter == o.hyphenationLimitAfter
-        && hyphenationLimitLines == o.hyphenationLimitLines
-        && textEmphasisFill == o.textEmphasisFill
-        && textEmphasisMark == o.textEmphasisMark
-        && textEmphasisPosition == o.textEmphasisPosition
-        && m_textAlignLast == o.m_textAlignLast
-        && m_textJustify == o.m_textJustify
-        && m_textOrientation == o.m_textOrientation
-        && m_textCombine == o.m_textCombine
-        && m_textIndentLine == o.m_textIndentLine
-        && m_textIndentType == o.m_textIndentType
-        && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
-        && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAttribute
-        && m_respectImageOrientation == o.m_respectImageOrientation
-        && m_snapHeightPosition == o.m_snapHeightPosition
-        && hyphenationString == o.hyphenationString
-        && m_snapHeightUnit == o.m_snapHeightUnit
-        && textEmphasisCustomMark == o.textEmphasisCustomMark
-        && quotesDataEquivalent(o)
-        && m_tabSize == o.m_tabSize
-        && m_imageRendering == o.m_imageRendering
-        && m_textUnderlinePosition == o.m_textUnderlinePosition
-        && m_rubyPosition == o.m_rubyPosition
-        && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
-        && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations)
-        && dataEquivalent(variables, o.variables)
-        && m_textSizeAdjust == o.m_textSizeAdjust;
-}
-
-bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
-{
-    return dataEquivalent(textShadow.get(), o.textShadow.get());
-}
+const RGBA32 Color::black;
+const RGBA32 Color::transparent;
 
-bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
+RGBA32 makeRGB(int r, int g, int b)
 {
-    return dataEquivalent(quotes, o.quotes);
+    //return 0xFF000000 | clampTo(r, 0, 255) << 16 | clampTo(g, 0, 255) << 8 | clampTo(b, 0, 255);
+    return 0xFF000000 | r << 16 | g << 8 | b;
 }
 
 } // namespace blink