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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.cpp

Issue 430333002: Do not expose auto as value of widows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Set initial to 1 Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/web/tests/WebViewTest.cpp » ('j') | 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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 static_assert(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small"); 54 static_assert(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small");
55 55
56 StyleRareInheritedData::StyleRareInheritedData() 56 StyleRareInheritedData::StyleRareInheritedData()
57 : listStyleImage(RenderStyle::initialListStyleImage()) 57 : listStyleImage(RenderStyle::initialListStyleImage())
58 , textStrokeWidth(RenderStyle::initialTextStrokeWidth()) 58 , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
59 , indent(RenderStyle::initialTextIndent()) 59 , indent(RenderStyle::initialTextIndent())
60 , m_effectiveZoom(RenderStyle::initialZoom()) 60 , m_effectiveZoom(RenderStyle::initialZoom())
61 , widows(RenderStyle::initialWidows()) 61 , widows(RenderStyle::initialWidows())
62 , orphans(RenderStyle::initialOrphans()) 62 , orphans(RenderStyle::initialOrphans())
63 , m_hasAutoWidows(true)
64 , m_hasAutoOrphans(true) 63 , m_hasAutoOrphans(true)
65 , m_textStrokeColorIsCurrentColor(true) 64 , m_textStrokeColorIsCurrentColor(true)
66 , m_textFillColorIsCurrentColor(true) 65 , m_textFillColorIsCurrentColor(true)
67 , m_textEmphasisColorIsCurrentColor(true) 66 , m_textEmphasisColorIsCurrentColor(true)
68 , m_visitedLinkTextStrokeColorIsCurrentColor(true) 67 , m_visitedLinkTextStrokeColorIsCurrentColor(true)
69 , m_visitedLinkTextFillColorIsCurrentColor(true) 68 , m_visitedLinkTextFillColorIsCurrentColor(true)
70 , m_visitedLinkTextEmphasisColorIsCurrentColor(true) 69 , m_visitedLinkTextEmphasisColorIsCurrentColor(true)
71 , textSecurity(RenderStyle::initialTextSecurity()) 70 , textSecurity(RenderStyle::initialTextSecurity())
72 , userModify(READ_ONLY) 71 , userModify(READ_ONLY)
73 , wordBreak(RenderStyle::initialWordBreak()) 72 , wordBreak(RenderStyle::initialWordBreak())
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 , m_visitedLinkTextStrokeColor(o.m_visitedLinkTextStrokeColor) 106 , m_visitedLinkTextStrokeColor(o.m_visitedLinkTextStrokeColor)
108 , m_visitedLinkTextFillColor(o.m_visitedLinkTextFillColor) 107 , m_visitedLinkTextFillColor(o.m_visitedLinkTextFillColor)
109 , m_visitedLinkTextEmphasisColor(o.m_visitedLinkTextEmphasisColor) 108 , m_visitedLinkTextEmphasisColor(o.m_visitedLinkTextEmphasisColor)
110 , textShadow(o.textShadow) 109 , textShadow(o.textShadow)
111 , highlight(o.highlight) 110 , highlight(o.highlight)
112 , cursorData(o.cursorData) 111 , cursorData(o.cursorData)
113 , indent(o.indent) 112 , indent(o.indent)
114 , m_effectiveZoom(o.m_effectiveZoom) 113 , m_effectiveZoom(o.m_effectiveZoom)
115 , widows(o.widows) 114 , widows(o.widows)
116 , orphans(o.orphans) 115 , orphans(o.orphans)
117 , m_hasAutoWidows(o.m_hasAutoWidows)
118 , m_hasAutoOrphans(o.m_hasAutoOrphans) 116 , m_hasAutoOrphans(o.m_hasAutoOrphans)
119 , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor) 117 , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor)
120 , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor) 118 , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor)
121 , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor) 119 , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor)
122 , m_visitedLinkTextStrokeColorIsCurrentColor(o.m_visitedLinkTextStrokeColorI sCurrentColor) 120 , m_visitedLinkTextStrokeColorIsCurrentColor(o.m_visitedLinkTextStrokeColorI sCurrentColor)
123 , m_visitedLinkTextFillColorIsCurrentColor(o.m_visitedLinkTextFillColorIsCur rentColor) 121 , m_visitedLinkTextFillColorIsCurrentColor(o.m_visitedLinkTextFillColorIsCur rentColor)
124 , m_visitedLinkTextEmphasisColorIsCurrentColor(o.m_visitedLinkTextEmphasisCo lorIsCurrentColor) 122 , m_visitedLinkTextEmphasisColorIsCurrentColor(o.m_visitedLinkTextEmphasisCo lorIsCurrentColor)
125 , textSecurity(o.textSecurity) 123 , textSecurity(o.textSecurity)
126 , userModify(o.userModify) 124 , userModify(o.userModify)
127 , wordBreak(o.wordBreak) 125 , wordBreak(o.wordBreak)
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 && m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor 167 && m_visitedLinkTextFillColor == o.m_visitedLinkTextFillColor
170 && m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor 168 && m_visitedLinkTextEmphasisColor == o.m_visitedLinkTextEmphasisColor
171 && tapHighlightColor == o.tapHighlightColor 169 && tapHighlightColor == o.tapHighlightColor
172 && shadowDataEquivalent(o) 170 && shadowDataEquivalent(o)
173 && highlight == o.highlight 171 && highlight == o.highlight
174 && dataEquivalent(cursorData.get(), o.cursorData.get()) 172 && dataEquivalent(cursorData.get(), o.cursorData.get())
175 && indent == o.indent 173 && indent == o.indent
176 && m_effectiveZoom == o.m_effectiveZoom 174 && m_effectiveZoom == o.m_effectiveZoom
177 && widows == o.widows 175 && widows == o.widows
178 && orphans == o.orphans 176 && orphans == o.orphans
179 && m_hasAutoWidows == o.m_hasAutoWidows
180 && m_hasAutoOrphans == o.m_hasAutoOrphans 177 && m_hasAutoOrphans == o.m_hasAutoOrphans
181 && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor 178 && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor
182 && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor 179 && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor
183 && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentCo lor 180 && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentCo lor
184 && m_visitedLinkTextStrokeColorIsCurrentColor == o.m_visitedLinkTextStro keColorIsCurrentColor 181 && m_visitedLinkTextStrokeColorIsCurrentColor == o.m_visitedLinkTextStro keColorIsCurrentColor
185 && m_visitedLinkTextFillColorIsCurrentColor == o.m_visitedLinkTextFillCo lorIsCurrentColor 182 && m_visitedLinkTextFillColorIsCurrentColor == o.m_visitedLinkTextFillCo lorIsCurrentColor
186 && m_visitedLinkTextEmphasisColorIsCurrentColor == o.m_visitedLinkTextEm phasisColorIsCurrentColor 183 && m_visitedLinkTextEmphasisColorIsCurrentColor == o.m_visitedLinkTextEm phasisColorIsCurrentColor
187 && textSecurity == o.textSecurity 184 && textSecurity == o.textSecurity
188 && userModify == o.userModify 185 && userModify == o.userModify
189 && wordBreak == o.wordBreak 186 && wordBreak == o.wordBreak
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 { 218 {
222 return dataEquivalent(textShadow.get(), o.textShadow.get()); 219 return dataEquivalent(textShadow.get(), o.textShadow.get());
223 } 220 }
224 221
225 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 222 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
226 { 223 {
227 return dataEquivalent(quotes, o.quotes); 224 return dataEquivalent(quotes, o.quotes);
228 } 225 }
229 226
230 } // namespace blink 227 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698