| Index: Source/core/editing/ApplyStyleCommand.h
|
| diff --git a/Source/core/editing/ApplyStyleCommand.h b/Source/core/editing/ApplyStyleCommand.h
|
| index fc6834f227c7d12e82200000b7bd672fa2d972e8..082f9802d4a47ddcc7ec044a1b553024db99810e 100644
|
| --- a/Source/core/editing/ApplyStyleCommand.h
|
| +++ b/Source/core/editing/ApplyStyleCommand.h
|
| @@ -34,6 +34,7 @@ namespace blink {
|
|
|
| class CSSPrimitiveValue;
|
| class EditingStyle;
|
| +class HTMLSpanElement;
|
| class StyleChange;
|
|
|
| enum ShouldIncludeTypingStyle {
|
| @@ -89,7 +90,7 @@ private:
|
| void applyInlineStyleToPushDown(Node*, EditingStyle*);
|
| void pushDownInlineStyleAroundNode(EditingStyle*, Node*);
|
| void removeInlineStyle(EditingStyle* , const Position& start, const Position& end);
|
| - bool nodeFullySelected(Node*, const Position& start, const Position& end) const;
|
| + bool elementFullySelected(HTMLElement&, const Position& start, const Position& end) const;
|
|
|
| // style-application helpers
|
| void applyBlockStyle(EditingStyle*);
|
| @@ -99,7 +100,7 @@ private:
|
| void applyInlineStyleToNodeRange(EditingStyle*, PassRefPtrWillBeRawPtr<Node> startNode, PassRefPtrWillBeRawPtr<Node> pastEndNode);
|
| void addBlockStyle(const StyleChange&, HTMLElement*);
|
| void addInlineStyleIfNeeded(EditingStyle*, PassRefPtrWillBeRawPtr<Node> start, PassRefPtrWillBeRawPtr<Node> end, EAddStyledElement = AddStyledElement);
|
| - Position positionToComputeInlineStyleChange(PassRefPtrWillBeRawPtr<Node>, RefPtrWillBeMember<Node>& dummyElement);
|
| + Position positionToComputeInlineStyleChange(PassRefPtrWillBeRawPtr<Node>, RefPtrWillBeMember<HTMLSpanElement>& dummyElement);
|
| void applyInlineStyleChange(PassRefPtrWillBeRawPtr<Node> startNode, PassRefPtrWillBeRawPtr<Node> endNode, StyleChange&, EAddStyledElement);
|
| void splitTextAtStart(const Position& start, const Position& end);
|
| void splitTextAtEnd(const Position& start, const Position& end);
|
| @@ -116,7 +117,7 @@ private:
|
| void joinChildTextNodes(ContainerNode*, const Position& start, const Position& end);
|
|
|
| HTMLElement* splitAncestorsWithUnicodeBidi(Node*, bool before, WritingDirection allowedDirection);
|
| - void removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsplitAncestor);
|
| + void removeEmbeddingUpToEnclosingBlock(Node*, HTMLElement* unsplitAncestor);
|
|
|
| void updateStartEnd(const Position& newStart, const Position& newEnd);
|
| Position startPosition();
|
| @@ -137,7 +138,7 @@ enum ShouldStyleAttributeBeEmpty { AllowNonEmptyStyleAttribute, StyleAttributeSh
|
| bool isEmptyFontTag(const Element*, ShouldStyleAttributeBeEmpty = StyleAttributeShouldBeEmpty);
|
| bool isLegacyAppleStyleSpan(const Node*);
|
| bool isStyleSpanOrSpanWithOnlyStyleAttribute(const Element*);
|
| -PassRefPtrWillBeRawPtr<HTMLElement> createStyleSpanElement(Document&);
|
| +PassRefPtrWillBeRawPtr<HTMLSpanElement> createStyleSpanElement(Document&);
|
|
|
| } // namespace blink
|
|
|
|
|