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

Unified Diff: Source/core/editing/StyledMarkupAccumulator.h

Issue 1177323005: Move StyledMarkupAccumulator::shouldApplyWrappingStyle to its serializer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: yosin's review 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/editing/StyledMarkupAccumulator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/StyledMarkupAccumulator.h
diff --git a/Source/core/editing/StyledMarkupAccumulator.h b/Source/core/editing/StyledMarkupAccumulator.h
index 6402ee4cda5edeb578e3fba576a8075b66f94862..52cc41e408451e00f347f3a76c5afa44f53bc199 100644
--- a/Source/core/editing/StyledMarkupAccumulator.h
+++ b/Source/core/editing/StyledMarkupAccumulator.h
@@ -44,33 +44,25 @@ class StyledMarkupAccumulator final {
WTF_MAKE_NONCOPYABLE(StyledMarkupAccumulator);
STACK_ALLOCATED();
public:
- StyledMarkupAccumulator(EAbsoluteURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document>, EAnnotateForInterchange, Node*);
+ StyledMarkupAccumulator(EAbsoluteURLs, const TextOffset& start, const TextOffset& end, const PassRefPtrWillBeRawPtr<Document>, EAnnotateForInterchange);
void appendEndTag(const Element&);
void appendInterchangeNewline();
void appendText(Text&);
- void appendTextWithInlineStyle(Text&);
-
- // TODO(hajimehoshi): These functions are called from the serializer, but
- // should not.
- Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get(); }
- void setHighestNodeToBeSerialized(Node* highestNodeToBeSerialized) { m_highestNodeToBeSerialized = highestNodeToBeSerialized; }
- EditingStyle* wrappingStyle() const { return m_wrappingStyle.get(); }
- void setWrappingStyle(PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyle) { m_wrappingStyle = wrappingStyle; }
+ void appendTextWithInlineStyle(Text&, PassRefPtrWillBeRawPtr<EditingStyle>);
void wrapWithStyleNode(StylePropertySet*);
String takeResults();
void pushMarkup(const String&);
- void appendElement(const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
+ void appendElement(const Element&);
void appendElement(StringBuilder&, const Element&);
+ void appendElementWithInlineStyle(const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
void appendElementWithInlineStyle(StringBuilder&, const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
void appendStartMarkup(Node&);
- bool shouldApplyWrappingStyle(const Node&) const;
-
private:
String renderedText(Text&);
String stringValueForRange(const Text&);
@@ -83,8 +75,6 @@ private:
const TextOffset m_end;
const RefPtrWillBeMember<Document> m_document;
const EAnnotateForInterchange m_shouldAnnotate;
- RawPtrWillBeMember<Node> m_highestNodeToBeSerialized;
- RefPtrWillBeMember<EditingStyle> m_wrappingStyle;
StringBuilder m_result;
Vector<String> m_reversedPrecedingMarkup;
};
« no previous file with comments | « no previous file | Source/core/editing/StyledMarkupAccumulator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698