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

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

Issue 1173223003: Refactoring: Remove addDisplayInline parameter of StyledMarkupAccumulator::appendElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tkent'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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/editing/StyledMarkupAccumulator.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) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.
4 * Copyright (C) 2011 Igalia S.L. 4 * Copyright (C) 2011 Igalia S.L.
5 * Copyright (C) 2011 Motorola Mobility. All rights reserved. 5 * Copyright (C) 2011 Motorola Mobility. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get() ; } 57 Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get() ; }
58 void setHighestNodeToBeSerialized(Node* highestNodeToBeSerialized) { m_highe stNodeToBeSerialized = highestNodeToBeSerialized; } 58 void setHighestNodeToBeSerialized(Node* highestNodeToBeSerialized) { m_highe stNodeToBeSerialized = highestNodeToBeSerialized; }
59 void setWrappingStyle(PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyle) { m_wrappingStyle = wrappingStyle; } 59 void setWrappingStyle(PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyle) { m_wrappingStyle = wrappingStyle; }
60 60
61 void wrapWithStyleNode(StylePropertySet*); 61 void wrapWithStyleNode(StylePropertySet*);
62 String takeResults(); 62 String takeResults();
63 63
64 void pushMarkup(const String&); 64 void pushMarkup(const String&);
65 RefPtrWillBeMember<EditingStyle> createInlineStyle(Element&); 65 RefPtrWillBeMember<EditingStyle> createInlineStyle(Element&);
66 66
67 void appendElement(StringBuilder&, Element&, bool addDisplayInline, PassRefP trWillBeRawPtr<EditingStyle>); 67 void appendElement(StringBuilder&, const Element&);
68 void appendElementWithInlineStyle(StringBuilder&, const Element&, PassRefPtr WillBeRawPtr<EditingStyle>);
68 void appendStartMarkup(StringBuilder&, Node&); 69 void appendStartMarkup(StringBuilder&, Node&);
69 70
71 bool shouldApplyWrappingStyle(const Node&) const;
72
70 private: 73 private:
71 void appendText(StringBuilder&, Text&); 74 void appendText(StringBuilder&, Text&);
72 75
73 String renderedText(Text&); 76 String renderedText(Text&);
74 String stringValueForRange(const Text&); 77 String stringValueForRange(const Text&);
75 bool shouldApplyWrappingStyle(const Node&) const;
76 bool shouldAnnotate() const; 78 bool shouldAnnotate() const;
77 79
78 void appendElement(Element&, PassRefPtrWillBeRawPtr<EditingStyle>); 80 void appendElement(const Element&, PassRefPtrWillBeRawPtr<EditingStyle>);
79 void appendEndMarkup(StringBuilder&, const Element&); 81 void appendEndMarkup(StringBuilder&, const Element&);
80 82
81 MarkupFormatter m_formatter; 83 MarkupFormatter m_formatter;
82 const TextOffset m_start; 84 const TextOffset m_start;
83 const TextOffset m_end; 85 const TextOffset m_end;
84 const RefPtrWillBeMember<Document> m_document; 86 const RefPtrWillBeMember<Document> m_document;
85 const EAnnotateForInterchange m_shouldAnnotate; 87 const EAnnotateForInterchange m_shouldAnnotate;
86 RawPtrWillBeMember<Node> m_highestNodeToBeSerialized; 88 RawPtrWillBeMember<Node> m_highestNodeToBeSerialized;
87 RefPtrWillBeMember<EditingStyle> m_wrappingStyle; 89 RefPtrWillBeMember<EditingStyle> m_wrappingStyle;
88 StringBuilder m_result; 90 StringBuilder m_result;
89 Vector<String> m_reversedPrecedingMarkup; 91 Vector<String> m_reversedPrecedingMarkup;
90 }; 92 };
91 93
92 } // namespace blink 94 } // namespace blink
93 95
94 #endif // StyledMarkupAccumulator_h 96 #endif // StyledMarkupAccumulator_h
OLDNEW
« 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