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

Side by Side Diff: third_party/WebKit/Source/core/editing/EditingStyle.h

Issue 1986563002: Apply vertical-align style of <sub> and <sup> to child elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update the test case Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 void replaceFontSizeByKeywordIfPossible(const ComputedStyle*, CSSComputedSty leDeclaration*); 156 void replaceFontSizeByKeywordIfPossible(const ComputedStyle*, CSSComputedSty leDeclaration*);
157 void extractFontSizeDelta(); 157 void extractFontSizeDelta();
158 TriState triStateOfStyle(CSSStyleDeclaration* styleToCompare, ShouldIgnoreTe xtOnlyProperties) const; 158 TriState triStateOfStyle(CSSStyleDeclaration* styleToCompare, ShouldIgnoreTe xtOnlyProperties) const;
159 bool conflictsWithInlineStyleOfElement(HTMLElement*, EditingStyle* extracted Style, Vector<CSSPropertyID>* conflictingProperties) const; 159 bool conflictsWithInlineStyleOfElement(HTMLElement*, EditingStyle* extracted Style, Vector<CSSPropertyID>* conflictingProperties) const;
160 void mergeInlineAndImplicitStyleOfElement(Element*, CSSPropertyOverrideMode, PropertiesToInclude); 160 void mergeInlineAndImplicitStyleOfElement(Element*, CSSPropertyOverrideMode, PropertiesToInclude);
161 void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode); 161 void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
162 162
163 Member<MutableStylePropertySet> m_mutableStyle; 163 Member<MutableStylePropertySet> m_mutableStyle;
164 bool m_isMonospaceFont; 164 bool m_isMonospaceFont;
165 float m_fontSizeDelta; 165 float m_fontSizeDelta;
166 bool m_isVerticalAlign;
yosin_UTC9 2016/05/17 01:15:48 nit: Let's use inline initializer to avoid initial
joone 2016/05/17 23:01:33 Ok, I will prepare for the patches.
166 167
167 friend class HTMLElementEquivalent; 168 friend class HTMLElementEquivalent;
168 friend class HTMLAttributeEquivalent; 169 friend class HTMLAttributeEquivalent;
169 }; 170 };
170 171
171 class StyleChange { 172 class StyleChange {
172 DISALLOW_NEW(); 173 DISALLOW_NEW();
173 public: 174 public:
174 StyleChange() 175 StyleChange()
175 : m_applyBold(false) 176 : m_applyBold(false)
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 String m_applyFontSize; 230 String m_applyFontSize;
230 }; 231 };
231 232
232 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly. 233 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly.
233 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID); 234 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);
234 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID); 235 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID);
235 236
236 } // namespace blink 237 } // namespace blink
237 238
238 #endif // EditingStyle_h 239 #endif // EditingStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698