Source/core/editing/EditingStyle.h - Issue 1195813003: Refactoring: Remove a boolean parameter from EditingStyle::wrappingStyleForSerialization

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

Issue 1195813003: Refactoring: Remove a boolean parameter from EditingStyle::wrappingStyleForSerialization (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: comment 80 chars in a line Created 5 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

OLD	NEW
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 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 bool extractConflictingImplicitStyleOfAttributes(HTMLElement, ShouldPreserv eWritingDirection, EditingStyle extractedStyle,	119 bool extractConflictingImplicitStyleOfAttributes(HTMLElement, ShouldPreserv eWritingDirection, EditingStyle extractedStyle,

120 Vector<QualifiedName>& conflictingAttributes, ShouldExtractMatchingS tyle) const;	120 Vector<QualifiedName>& conflictingAttributes, ShouldExtractMatchingS tyle) const;

121 bool styleIsPresentInComputedStyleOfNode(Node*) const;	121 bool styleIsPresentInComputedStyleOfNode(Node*) const;

122	122

123 static bool elementIsStyledSpanOrHTMLEquivalent(const HTMLElement*);	123 static bool elementIsStyledSpanOrHTMLEquivalent(const HTMLElement*);

124	124

125 void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNo tPreserveWritingDirection);	125 void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNo tPreserveWritingDirection);

126 void mergeTypingStyle(Document*);	126 void mergeTypingStyle(Document*);

127 enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues };	127 enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues };

128 void mergeInlineStyleOfElement(HTMLElement*, CSSPropertyOverrideMode, Proper tiesToInclude = AllProperties);	128 void mergeInlineStyleOfElement(HTMLElement*, CSSPropertyOverrideMode, Proper tiesToInclude = AllProperties);

129 static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(Co ntainerNode* context, bool shouldAnnotate);	129 static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForAnnotatedSeriali zation(ContainerNode* context);

	130 static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(Co ntainerNode* context);

130 void mergeStyleFromRules(Element*);	131 void mergeStyleFromRules(Element*);

131 void mergeStyleFromRulesForSerialization(Element*);	132 void mergeStyleFromRulesForSerialization(Element*);

132 void removeStyleFromRulesAndContext(Element, ContainerNode context);	133 void removeStyleFromRulesAndContext(Element, ContainerNode context);

133 void removePropertiesInElementDefaultStyle(Element*);	134 void removePropertiesInElementDefaultStyle(Element*);

134 void addAbsolutePositioningFromElement(const Element&);	135 void addAbsolutePositioningFromElement(const Element&);

135 void forceInline();	136 void forceInline();

136 int legacyFontSize(Document*) const;	137 int legacyFontSize(Document*) const;

137	138

138 float fontSizeDelta() const { return m_fontSizeDelta; }	139 float fontSizeDelta() const { return m_fontSizeDelta; }

139 bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }	140 bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227 String m_applyFontSize;	228 String m_applyFontSize;

228 };	229 };

229	230

230 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly.	231 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly.

231 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);	232 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);

232 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID);	233 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID);

233	234

234 } // namespace blink	235 } // namespace blink

235	236

236 #endif // EditingStyle_h	237 #endif // EditingStyle_h

OLD	NEW