Source/core/editing/StyledMarkupAccumulator.h - Issue 1163673005: Refactoring: Remove StyledMarkupAccumulator::RangeFullySelectsNodes

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

Issue 1163673005: Refactoring: Remove StyledMarkupAccumulator::RangeFullySelectsNodes (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: 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

OLD	NEW
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 26 matching lines...) Expand all Loading...
37 namespace blink {	37 namespace blink {

38	38

39 class Document;	39 class Document;

40 class StylePropertySet;	40 class StylePropertySet;

41 class Text;	41 class Text;

42	42

43 class StyledMarkupAccumulator final {	43 class StyledMarkupAccumulator final {

44 WTF_MAKE_NONCOPYABLE(StyledMarkupAccumulator);	44 WTF_MAKE_NONCOPYABLE(StyledMarkupAccumulator);

45 STACK_ALLOCATED();	45 STACK_ALLOCATED();

46 public:	46 public:

47 enum RangeFullySelectsNode { DoesFullySelectNode, DoesNotFullySelectNode };	47 StyledMarkupAccumulator(EAbsoluteURLs, const TextOffset& start, const TextOf fset& end, const PassRefPtrWillBeRawPtr<Document>, EAnnotateForInterchange, Node *);
	yosin_UTC9 2015/06/09 01:18:11 Do you also remove convertBlocksToInlines paramete Do you also remove convertBlocksToInlines parameter? It seems description doesn't mention it.
48

49 StyledMarkupAccumulator(EAbsoluteURLs, const TextOffset& start, const TextOf fset& end, const PassRefPtrWillBeRawPtr<Document>, EAnnotateForInterchange, Node *, ConvertBlocksToInlines);

50

51 bool convertBlocksToInlines() const { return m_convertBlocksToInlines == Con vertBlocksToInlines::Convert; }

52	48

53 void appendString(const String&);	49 void appendString(const String&);

54 void appendStartTag(Node&);	50 void appendStartTag(Node&);

55 void appendEndTag(const Element&);	51 void appendEndTag(const Element&);

56	52

	53 void appendStartMarkup(StringBuilder&, Node&);

	54 void appendText(Text&);

	55 void appendElement(Element&, bool, PassRefPtrWillBeRawPtr<EditingStyle>);
	yosin_UTC9 2015/06/09 01:18:11 Could you add parameter name for bool parameter? Could you add parameter name for bool parameter? hajimehoshi 2015/06/10 10:45:08 Done. Show quoted text On 2015/06/09 01:18:11, Yosi_UTC9 wrote: > Could you add parameter name for bool parameter? Done.
	56 void appendElement(StringBuilder&, Element&, bool, PassRefPtrWillBeRawPtr<Ed itingStyle>);
	yosin_UTC9 2015/06/09 01:18:11 Could you add parameter name for bool parameter? Could you add parameter name for bool parameter? hajimehoshi 2015/06/10 10:45:08 Done. Show quoted text On 2015/06/09 01:18:11, Yosi_UTC9 wrote: > Could you add parameter name for bool parameter? Done.
	57

57 // TODO(hajimehoshi): These functions are called from the serializer, but	58 // TODO(hajimehoshi): These functions are called from the serializer, but

58 // should not.	59 // should not.

59 Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get() ; }	60 Node* highestNodeToBeSerialized() { return m_highestNodeToBeSerialized.get() ; }

60 void setHighestNodeToBeSerialized(Node* highestNodeToBeSerialized) { m_highe stNodeToBeSerialized = highestNodeToBeSerialized; }	61 void setHighestNodeToBeSerialized(Node* highestNodeToBeSerialized) { m_highe stNodeToBeSerialized = highestNodeToBeSerialized; }

61 void setWrappingStyle(PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyle) { m_wrappingStyle = wrappingStyle; }	62 void setWrappingStyle(PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyle) { m_wrappingStyle = wrappingStyle; }

62	63

63 void wrapWithNode(ContainerNode&, RangeFullySelectsNode = DoesFullySelectNod e);

64 void wrapWithStyleNode(StylePropertySet*);	64 void wrapWithStyleNode(StylePropertySet*);

65 String takeResults();	65 String takeResults();

66	66

	67 void pushMarkup(const String&);

	68 RefPtrWillBeMember<EditingStyle> createInlineStyle(Element&, bool);
	yosin_UTC9 2015/06/09 01:18:11 Could you add parameter name for second bool param Could you add parameter name for second bool parameter? hajimehoshi 2015/06/10 10:45:09 Done. Show quoted text On 2015/06/09 01:18:11, Yosi_UTC9 wrote: > Could you add parameter name for second bool parameter? Done.
	69

67 private:	70 private:

68 void appendText(StringBuilder&, Text&);

69

70 String renderedText(Text&);	71 String renderedText(Text&);

71 String stringValueForRange(const Text&);	72 String stringValueForRange(const Text&);

72	73

	74 void appendText(StringBuilder&, Text&);

	75

73 bool shouldApplyWrappingStyle(const Node&) const;	76 bool shouldApplyWrappingStyle(const Node&) const;

74	77

75 bool shouldAnnotate() const;	78 bool shouldAnnotate() const;

76	79

77 void appendElement(StringBuilder&, Element&);

78 void appendElement(StringBuilder&, Element&, bool, RangeFullySelectsNode);

79 void appendStartMarkup(StringBuilder&, Node&);

80 void appendEndMarkup(StringBuilder&, const Element&);	80 void appendEndMarkup(StringBuilder&, const Element&);

81	81

82 MarkupFormatter m_formatter;	82 MarkupFormatter m_formatter;

83 const TextOffset m_start;	83 const TextOffset m_start;

84 const TextOffset m_end;	84 const TextOffset m_end;

85 const RefPtrWillBeMember<Document> m_document;	85 const RefPtrWillBeMember<Document> m_document;

86 const EAnnotateForInterchange m_shouldAnnotate;	86 const EAnnotateForInterchange m_shouldAnnotate;

87 const ConvertBlocksToInlines m_convertBlocksToInlines;

88 RawPtrWillBeMember<Node> m_highestNodeToBeSerialized;	87 RawPtrWillBeMember<Node> m_highestNodeToBeSerialized;

89 RefPtrWillBeMember<EditingStyle> m_wrappingStyle;	88 RefPtrWillBeMember<EditingStyle> m_wrappingStyle;

90 StringBuilder m_result;	89 StringBuilder m_result;

91 Vector<String> m_reversedPrecedingMarkup;	90 Vector<String> m_reversedPrecedingMarkup;

92 };	91 };

93	92

94 } // namespace blink	93 } // namespace blink

95	94

96 #endif // StyledMarkupAccumulator_h	95 #endif // StyledMarkupAccumulator_h

OLD	NEW

« no previous file with comments | « no previous file | Source/core/editing/StyledMarkupAccumulator.cpp » ('j') | Source/core/editing/StyledMarkupSerializer.cpp » ('J')