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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/WebCore/editing/ApplyStyleCommand.h

Issue 9958002: Merge 112012 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt ('k') | Source/WebCore/editing/ApplyStyleCommand.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) 2005, 2006, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 void pushDownInlineStyleAroundNode(EditingStyle*, Node*); 87 void pushDownInlineStyleAroundNode(EditingStyle*, Node*);
88 void removeInlineStyle(EditingStyle* , const Position& start, const Position & end); 88 void removeInlineStyle(EditingStyle* , const Position& start, const Position & end);
89 bool nodeFullySelected(Node*, const Position& start, const Position& end) co nst; 89 bool nodeFullySelected(Node*, const Position& start, const Position& end) co nst;
90 bool nodeFullyUnselected(Node*, const Position& start, const Position& end) const; 90 bool nodeFullyUnselected(Node*, const Position& start, const Position& end) const;
91 91
92 // style-application helpers 92 // style-application helpers
93 void applyBlockStyle(EditingStyle*); 93 void applyBlockStyle(EditingStyle*);
94 void applyRelativeFontStyleChange(EditingStyle*); 94 void applyRelativeFontStyleChange(EditingStyle*);
95 void applyInlineStyle(EditingStyle*); 95 void applyInlineStyle(EditingStyle*);
96 void fixRangeAndApplyInlineStyle(EditingStyle*, const Position& start, const Position& end); 96 void fixRangeAndApplyInlineStyle(EditingStyle*, const Position& start, const Position& end);
97 void applyInlineStyleToNodeRange(EditingStyle*, Node* startNode, Node* pastE ndNode); 97 void applyInlineStyleToNodeRange(EditingStyle*, PassRefPtr<Node> startNode, PassRefPtr<Node> pastEndNode);
98 void addBlockStyle(const StyleChange&, HTMLElement*); 98 void addBlockStyle(const StyleChange&, HTMLElement*);
99 void addInlineStyleIfNeeded(EditingStyle*, PassRefPtr<Node> start, PassRefPt r<Node> end, EAddStyledElement = AddStyledElement); 99 void addInlineStyleIfNeeded(EditingStyle*, PassRefPtr<Node> start, PassRefPt r<Node> end, EAddStyledElement = AddStyledElement);
100 void splitTextAtStart(const Position& start, const Position& end); 100 void splitTextAtStart(const Position& start, const Position& end);
101 void splitTextAtEnd(const Position& start, const Position& end); 101 void splitTextAtEnd(const Position& start, const Position& end);
102 void splitTextElementAtStart(const Position& start, const Position& end); 102 void splitTextElementAtStart(const Position& start, const Position& end);
103 void splitTextElementAtEnd(const Position& start, const Position& end); 103 void splitTextElementAtEnd(const Position& start, const Position& end);
104 bool shouldSplitTextElement(Element*, EditingStyle*); 104 bool shouldSplitTextElement(Element*, EditingStyle*);
105 bool isValidCaretPositionInTextNode(const Position& position); 105 bool isValidCaretPositionInTextNode(const Position& position);
106 bool mergeStartWithPreviousIfIdentical(const Position& start, const Position & end); 106 bool mergeStartWithPreviousIfIdentical(const Position& start, const Position & end);
107 bool mergeEndWithNextIfIdentical(const Position& start, const Position& end) ; 107 bool mergeEndWithNextIfIdentical(const Position& start, const Position& end) ;
(...skipping 21 matching lines...) Expand all
129 IsInlineElementToRemoveFunction m_isInlineElementToRemoveFunction; 129 IsInlineElementToRemoveFunction m_isInlineElementToRemoveFunction;
130 }; 130 };
131 131
132 bool isLegacyAppleStyleSpan(const Node*); 132 bool isLegacyAppleStyleSpan(const Node*);
133 bool isStyleSpanOrSpanWithOnlyStyleAttribute(const Element*); 133 bool isStyleSpanOrSpanWithOnlyStyleAttribute(const Element*);
134 PassRefPtr<HTMLElement> createStyleSpanElement(Document*); 134 PassRefPtr<HTMLElement> createStyleSpanElement(Document*);
135 135
136 } // namespace WebCore 136 } // namespace WebCore
137 137
138 #endif 138 #endif
OLDNEW
« no previous file with comments | « LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt ('k') | Source/WebCore/editing/ApplyStyleCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698