Source/core/editing/StyledMarkupSerializer.h - Issue 1177323005: Move StyledMarkupAccumulator::shouldApplyWrappingStyle to its serializer

Side by Side Diff: Source/core/editing/StyledMarkupSerializer.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 unified diff | Download patch | Annotate | Revision Log

« Source/core/editing/StyledMarkupAccumulator.cpp ('K') | « Source/core/editing/StyledMarkupAccumulator.cpp ('k') | Source/core/editing/StyledMarkupSerializer.cpp » ('j') | Source/core/editing/StyledMarkupSerializer.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49	49

50 String createMarkup();	50 String createMarkup();

51	51

52 private:	52 private:

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

54 Node* serializeNodes(Node* startNode, Node* pastEnd, StyledMarkupAccumulator *);	54 Node* serializeNodes(Node* startNode, Node* pastEnd, StyledMarkupAccumulator *);

55 Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, StyledMa rkupAccumulator*);	55 Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, StyledMa rkupAccumulator*);

56 void wrapWithNode(StyledMarkupAccumulator&, ContainerNode&, PassRefPtrWillBe RawPtr<EditingStyle>);	56 void wrapWithNode(StyledMarkupAccumulator&, ContainerNode&, PassRefPtrWillBe RawPtr<EditingStyle>);

57 RefPtrWillBeRawPtr<EditingStyle> createInlineStyleIfNeeded(StyledMarkupAccum ulator&, Node&);	57 RefPtrWillBeRawPtr<EditingStyle> createInlineStyleIfNeeded(StyledMarkupAccum ulator&, Node&);

58 bool needsInlineStyle(const Element&);	58 bool needsInlineStyle(const Element&);

	59 void appendStartMarkup(StyledMarkupAccumulator&, Node&);

	60 bool shouldAnnotate() const { return m_shouldAnnotate == AnnotateForIntercha nge; }
	yosin_UTC9 2015/06/16 08:23:56 Can we have another CL for introducing \|shouldAnno Can we have another CL for introducing \|shouldAnnote()\|? hajimehoshi 2015/06/16 08:58:17 Done. (Now committing) Show quoted text On 2015/06/16 08:23:56, Yosi_UTC9 wrote: > Can we have another CL for introducing \|shouldAnnote()\|? Done. (Now committing)
	61 bool shouldApplyWrappingStyle(StyledMarkupAccumulator&, const Node&) const;

59	62

60 const PositionType m_start;	63 const PositionType m_start;

61 const PositionType m_end;	64 const PositionType m_end;

62 const EAbsoluteURLs m_shouldResolveURLs;	65 const EAbsoluteURLs m_shouldResolveURLs;

63 const EAnnotateForInterchange m_shouldAnnotate;	66 const EAnnotateForInterchange m_shouldAnnotate;

64 const RefPtrWillBeMember<Node> m_highestNodeToBeSerialized;	67 const RefPtrWillBeMember<Node> m_highestNodeToBeSerialized;

65 const ConvertBlocksToInlines m_convertBlocksToInlines;	68 const ConvertBlocksToInlines m_convertBlocksToInlines;

66 };	69 };

67	70

68 extern template class StyledMarkupSerializer<EditingStrategy>;	71 extern template class StyledMarkupSerializer<EditingStrategy>;

69	72

70 } // namespace blink	73 } // namespace blink

71	74

72 #endif // StyledMarkupSerializer_h	75 #endif // StyledMarkupSerializer_h

OLD	NEW