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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 299353004: Oilpan: move editing objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make test wrapper class finalized Created 6 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
« no previous file with comments | « Source/core/editing/ApplyBlockElementCommand.cpp ('k') | Source/core/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 30 matching lines...) Expand all
41 IgnoreTypingStyle 41 IgnoreTypingStyle
42 }; 42 };
43 43
44 class ApplyStyleCommand FINAL : public CompositeEditCommand { 44 class ApplyStyleCommand FINAL : public CompositeEditCommand {
45 public: 45 public:
46 enum EPropertyLevel { PropertyDefault, ForceBlockProperties }; 46 enum EPropertyLevel { PropertyDefault, ForceBlockProperties };
47 enum InlineStyleRemovalMode { RemoveIfNeeded, RemoveAlways, RemoveNone }; 47 enum InlineStyleRemovalMode { RemoveIfNeeded, RemoveAlways, RemoveNone };
48 enum EAddStyledElement { AddStyledElement, DoNotAddStyledElement }; 48 enum EAddStyledElement { AddStyledElement, DoNotAddStyledElement };
49 typedef bool (*IsInlineElementToRemoveFunction)(const Element*); 49 typedef bool (*IsInlineElementToRemoveFunction)(const Element*);
50 50
51 static PassRefPtr<ApplyStyleCommand> create(Document& document, const Editin gStyle* style, EditAction action = EditActionChangeAttributes, EPropertyLevel le vel = PropertyDefault) 51 static PassRefPtrWillBeRawPtr<ApplyStyleCommand> create(Document& document, const EditingStyle* style, EditAction action = EditActionChangeAttributes, EProp ertyLevel level = PropertyDefault)
52 { 52 {
53 return adoptRef(new ApplyStyleCommand(document, style, action, level)); 53 return adoptRefWillBeNoop(new ApplyStyleCommand(document, style, action, level));
54 } 54 }
55 static PassRefPtr<ApplyStyleCommand> create(Document& document, const Editin gStyle* style, const Position& start, const Position& end, EditAction action = E ditActionChangeAttributes, EPropertyLevel level = PropertyDefault) 55 static PassRefPtrWillBeRawPtr<ApplyStyleCommand> create(Document& document, const EditingStyle* style, const Position& start, const Position& end, EditActio n action = EditActionChangeAttributes, EPropertyLevel level = PropertyDefault)
56 { 56 {
57 return adoptRef(new ApplyStyleCommand(document, style, start, end, actio n, level)); 57 return adoptRefWillBeNoop(new ApplyStyleCommand(document, style, start, end, action, level));
58 } 58 }
59 static PassRefPtr<ApplyStyleCommand> create(PassRefPtr<Element> element, boo l removeOnly = false, EditAction action = EditActionChangeAttributes) 59 static PassRefPtrWillBeRawPtr<ApplyStyleCommand> create(PassRefPtrWillBeRawP tr<Element> element, bool removeOnly = false, EditAction action = EditActionChan geAttributes)
60 { 60 {
61 return adoptRef(new ApplyStyleCommand(element, removeOnly, action)); 61 return adoptRefWillBeNoop(new ApplyStyleCommand(element, removeOnly, act ion));
62 } 62 }
63 static PassRefPtr<ApplyStyleCommand> create(Document& document, const Editin gStyle* style, IsInlineElementToRemoveFunction isInlineElementToRemoveFunction, EditAction action = EditActionChangeAttributes) 63 static PassRefPtrWillBeRawPtr<ApplyStyleCommand> create(Document& document, const EditingStyle* style, IsInlineElementToRemoveFunction isInlineElementToRemo veFunction, EditAction action = EditActionChangeAttributes)
64 { 64 {
65 return adoptRef(new ApplyStyleCommand(document, style, isInlineElementTo RemoveFunction, action)); 65 return adoptRefWillBeNoop(new ApplyStyleCommand(document, style, isInlin eElementToRemoveFunction, action));
66 } 66 }
67 67
68 virtual void trace(Visitor*) OVERRIDE;
69
68 private: 70 private:
69 ApplyStyleCommand(Document&, const EditingStyle*, EditAction, EPropertyLevel ); 71 ApplyStyleCommand(Document&, const EditingStyle*, EditAction, EPropertyLevel );
70 ApplyStyleCommand(Document&, const EditingStyle*, const Position& start, con st Position& end, EditAction, EPropertyLevel); 72 ApplyStyleCommand(Document&, const EditingStyle*, const Position& start, con st Position& end, EditAction, EPropertyLevel);
71 ApplyStyleCommand(PassRefPtr<Element>, bool removeOnly, EditAction); 73 ApplyStyleCommand(PassRefPtrWillBeRawPtr<Element>, bool removeOnly, EditActi on);
72 ApplyStyleCommand(Document&, const EditingStyle*, bool (*isInlineElementToRe move)(const Element*), EditAction); 74 ApplyStyleCommand(Document&, const EditingStyle*, bool (*isInlineElementToRe move)(const Element*), EditAction);
73 75
74 virtual void doApply() OVERRIDE; 76 virtual void doApply() OVERRIDE;
75 virtual EditAction editingAction() const OVERRIDE; 77 virtual EditAction editingAction() const OVERRIDE;
76 78
77 // style-removal helpers 79 // style-removal helpers
78 bool isStyledInlineElementToRemove(Element*) const; 80 bool isStyledInlineElementToRemove(Element*) const;
79 bool shouldApplyInlineStyleToRun(EditingStyle*, Node* runStart, Node* pastEn dNode); 81 bool shouldApplyInlineStyleToRun(EditingStyle*, Node* runStart, Node* pastEn dNode);
80 void removeConflictingInlineStyleFromRun(EditingStyle*, RefPtr<Node>& runSta rt, RefPtr<Node>& runEnd, PassRefPtr<Node> pastEndNode); 82 void removeConflictingInlineStyleFromRun(EditingStyle*, RefPtrWillBeMember<N ode>& runStart, RefPtrWillBeMember<Node>& runEnd, PassRefPtrWillBeRawPtr<Node> p astEndNode);
81 bool removeInlineStyleFromElement(EditingStyle*, PassRefPtrWillBeRawPtr<HTML Element>, InlineStyleRemovalMode = RemoveIfNeeded, EditingStyle* extractedStyle = 0); 83 bool removeInlineStyleFromElement(EditingStyle*, PassRefPtrWillBeRawPtr<HTML Element>, InlineStyleRemovalMode = RemoveIfNeeded, EditingStyle* extractedStyle = 0);
82 inline bool shouldRemoveInlineStyleFromElement(EditingStyle* style, HTMLElem ent* element) {return removeInlineStyleFromElement(style, element, RemoveNone);} 84 inline bool shouldRemoveInlineStyleFromElement(EditingStyle* style, HTMLElem ent* element) {return removeInlineStyleFromElement(style, element, RemoveNone);}
83 void replaceWithSpanOrRemoveIfWithoutAttributes(HTMLElement*); 85 void replaceWithSpanOrRemoveIfWithoutAttributes(HTMLElement*);
84 bool removeImplicitlyStyledElement(EditingStyle*, HTMLElement*, InlineStyleR emovalMode, EditingStyle* extractedStyle); 86 bool removeImplicitlyStyledElement(EditingStyle*, HTMLElement*, InlineStyleR emovalMode, EditingStyle* extractedStyle);
85 bool removeCSSStyle(EditingStyle*, HTMLElement*, InlineStyleRemovalMode = Re moveIfNeeded, EditingStyle* extractedStyle = 0); 87 bool removeCSSStyle(EditingStyle*, HTMLElement*, InlineStyleRemovalMode = Re moveIfNeeded, EditingStyle* extractedStyle = 0);
86 HTMLElement* highestAncestorWithConflictingInlineStyle(EditingStyle*, Node*) ; 88 HTMLElement* highestAncestorWithConflictingInlineStyle(EditingStyle*, Node*) ;
87 void applyInlineStyleToPushDown(Node*, EditingStyle*); 89 void applyInlineStyleToPushDown(Node*, EditingStyle*);
88 void pushDownInlineStyleAroundNode(EditingStyle*, Node*); 90 void pushDownInlineStyleAroundNode(EditingStyle*, Node*);
89 void removeInlineStyle(EditingStyle* , const Position& start, const Position & end); 91 void removeInlineStyle(EditingStyle* , const Position& start, const Position & end);
90 bool nodeFullySelected(Node*, const Position& start, const Position& end) co nst; 92 bool nodeFullySelected(Node*, const Position& start, const Position& end) co nst;
91 93
92 // style-application helpers 94 // style-application helpers
93 void applyBlockStyle(EditingStyle*); 95 void applyBlockStyle(EditingStyle*);
94 void applyRelativeFontStyleChange(EditingStyle*); 96 void applyRelativeFontStyleChange(EditingStyle*);
95 void applyInlineStyle(EditingStyle*); 97 void applyInlineStyle(EditingStyle*);
96 void fixRangeAndApplyInlineStyle(EditingStyle*, const Position& start, const Position& end); 98 void fixRangeAndApplyInlineStyle(EditingStyle*, const Position& start, const Position& end);
97 void applyInlineStyleToNodeRange(EditingStyle*, PassRefPtr<Node> startNode, PassRefPtr<Node> pastEndNode); 99 void applyInlineStyleToNodeRange(EditingStyle*, PassRefPtrWillBeRawPtr<Node> startNode, PassRefPtrWillBeRawPtr<Node> pastEndNode);
98 void addBlockStyle(const StyleChange&, HTMLElement*); 100 void addBlockStyle(const StyleChange&, HTMLElement*);
99 void addInlineStyleIfNeeded(EditingStyle*, PassRefPtr<Node> start, PassRefPt r<Node> end, EAddStyledElement = AddStyledElement); 101 void addInlineStyleIfNeeded(EditingStyle*, PassRefPtrWillBeRawPtr<Node> star t, PassRefPtrWillBeRawPtr<Node> end, EAddStyledElement = AddStyledElement);
100 Position positionToComputeInlineStyleChange(PassRefPtr<Node>, RefPtr<Node>& dummyElement); 102 Position positionToComputeInlineStyleChange(PassRefPtrWillBeRawPtr<Node>, Re fPtrWillBeMember<Node>& dummyElement);
101 void applyInlineStyleChange(PassRefPtr<Node> startNode, PassRefPtr<Node> end Node, StyleChange&, EAddStyledElement); 103 void applyInlineStyleChange(PassRefPtrWillBeRawPtr<Node> startNode, PassRefP trWillBeRawPtr<Node> endNode, StyleChange&, EAddStyledElement);
102 void splitTextAtStart(const Position& start, const Position& end); 104 void splitTextAtStart(const Position& start, const Position& end);
103 void splitTextAtEnd(const Position& start, const Position& end); 105 void splitTextAtEnd(const Position& start, const Position& end);
104 void splitTextElementAtStart(const Position& start, const Position& end); 106 void splitTextElementAtStart(const Position& start, const Position& end);
105 void splitTextElementAtEnd(const Position& start, const Position& end); 107 void splitTextElementAtEnd(const Position& start, const Position& end);
106 bool shouldSplitTextElement(Element*, EditingStyle*); 108 bool shouldSplitTextElement(Element*, EditingStyle*);
107 bool isValidCaretPositionInTextNode(const Position& position); 109 bool isValidCaretPositionInTextNode(const Position& position);
108 bool mergeStartWithPreviousIfIdentical(const Position& start, const Position & end); 110 bool mergeStartWithPreviousIfIdentical(const Position& start, const Position & end);
109 bool mergeEndWithNextIfIdentical(const Position& start, const Position& end) ; 111 bool mergeEndWithNextIfIdentical(const Position& start, const Position& end) ;
110 void cleanupUnstyledAppleStyleSpans(Node* dummySpanAncestor); 112 void cleanupUnstyledAppleStyleSpans(Node* dummySpanAncestor);
111 113
112 void surroundNodeRangeWithElement(PassRefPtr<Node> start, PassRefPtr<Node> e nd, PassRefPtr<Element>); 114 void surroundNodeRangeWithElement(PassRefPtrWillBeRawPtr<Node> start, PassRe fPtrWillBeRawPtr<Node> end, PassRefPtrWillBeRawPtr<Element>);
113 float computedFontSize(Node*); 115 float computedFontSize(Node*);
114 void joinChildTextNodes(Node*, const Position& start, const Position& end); 116 void joinChildTextNodes(Node*, const Position& start, const Position& end);
115 117
116 HTMLElement* splitAncestorsWithUnicodeBidi(Node*, bool before, WritingDirect ion allowedDirection); 118 HTMLElement* splitAncestorsWithUnicodeBidi(Node*, bool before, WritingDirect ion allowedDirection);
117 void removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsplitAncestor); 119 void removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsplitAncestor);
118 120
119 void updateStartEnd(const Position& newStart, const Position& newEnd); 121 void updateStartEnd(const Position& newStart, const Position& newEnd);
120 Position startPosition(); 122 Position startPosition();
121 Position endPosition(); 123 Position endPosition();
122 124
123 RefPtr<EditingStyle> m_style; 125 RefPtrWillBeMember<EditingStyle> m_style;
124 EditAction m_editingAction; 126 EditAction m_editingAction;
125 EPropertyLevel m_propertyLevel; 127 EPropertyLevel m_propertyLevel;
126 Position m_start; 128 Position m_start;
127 Position m_end; 129 Position m_end;
128 bool m_useEndingSelection; 130 bool m_useEndingSelection;
129 RefPtr<Element> m_styledInlineElement; 131 RefPtrWillBeMember<Element> m_styledInlineElement;
130 bool m_removeOnly; 132 bool m_removeOnly;
131 IsInlineElementToRemoveFunction m_isInlineElementToRemoveFunction; 133 IsInlineElementToRemoveFunction m_isInlineElementToRemoveFunction;
132 }; 134 };
133 135
134 enum ShouldStyleAttributeBeEmpty { AllowNonEmptyStyleAttribute, StyleAttributeSh ouldBeEmpty }; 136 enum ShouldStyleAttributeBeEmpty { AllowNonEmptyStyleAttribute, StyleAttributeSh ouldBeEmpty };
135 bool isEmptyFontTag(const Element*, ShouldStyleAttributeBeEmpty = StyleAttribute ShouldBeEmpty); 137 bool isEmptyFontTag(const Element*, ShouldStyleAttributeBeEmpty = StyleAttribute ShouldBeEmpty);
136 bool isLegacyAppleStyleSpan(const Node*); 138 bool isLegacyAppleStyleSpan(const Node*);
137 bool isStyleSpanOrSpanWithOnlyStyleAttribute(const Element*); 139 bool isStyleSpanOrSpanWithOnlyStyleAttribute(const Element*);
138 PassRefPtrWillBeRawPtr<HTMLElement> createStyleSpanElement(Document&); 140 PassRefPtrWillBeRawPtr<HTMLElement> createStyleSpanElement(Document&);
139 141
140 } // namespace WebCore 142 } // namespace WebCore
141 143
142 #endif 144 #endif
OLDNEW
« no previous file with comments | « Source/core/editing/ApplyBlockElementCommand.cpp ('k') | Source/core/editing/ApplyStyleCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698