third_party/WebKit/WebCore/editing/DeleteSelectionCommand.h - Issue 10670: Do another merge using nifty new merge script (CL for that coming soon).

Side by Side Diff: third_party/WebKit/WebCore/editing/DeleteSelectionCommand.h

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 1 month 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) 2005, 2006, 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 void clearTransientState();	65 void clearTransientState();

66 virtual void removeNode(Node*);	66 virtual void removeNode(Node*);

67 virtual void deleteTextFromNode(Text*, int, int);	67 virtual void deleteTextFromNode(Text*, int, int);

68	68

69 bool m_hasSelectionToDelete;	69 bool m_hasSelectionToDelete;

70 bool m_smartDelete;	70 bool m_smartDelete;

71 bool m_mergeBlocksAfterDelete;	71 bool m_mergeBlocksAfterDelete;

72 bool m_needPlaceholder;	72 bool m_needPlaceholder;

73 bool m_replace;	73 bool m_replace;

74 bool m_expandForSpecialElements;	74 bool m_expandForSpecialElements;

	75 bool m_pruneStartBlockIfNecessary;

75	76

76 // This data is transient and should be cleared at the end of the doApply fu nction.	77 // This data is transient and should be cleared at the end of the doApply fu nction.

77 Selection m_selectionToDelete;	78 Selection m_selectionToDelete;

78 Position m_upstreamStart;	79 Position m_upstreamStart;

79 Position m_downstreamStart;	80 Position m_downstreamStart;

80 Position m_upstreamEnd;	81 Position m_upstreamEnd;

81 Position m_downstreamEnd;	82 Position m_downstreamEnd;

82 Position m_endingPosition;	83 Position m_endingPosition;

83 Position m_leadingWhitespace;	84 Position m_leadingWhitespace;

84 Position m_trailingWhitespace;	85 Position m_trailingWhitespace;

85 RefPtr<Node> m_startBlock;	86 RefPtr<Node> m_startBlock;

86 RefPtr<Node> m_endBlock;	87 RefPtr<Node> m_endBlock;

87 RefPtr<CSSMutableStyleDeclaration> m_typingStyle;	88 RefPtr<CSSMutableStyleDeclaration> m_typingStyle;

88 RefPtr<CSSMutableStyleDeclaration> m_deleteIntoBlockquoteStyle;	89 RefPtr<CSSMutableStyleDeclaration> m_deleteIntoBlockquoteStyle;

89 RefPtr<Node> m_startRoot;	90 RefPtr<Node> m_startRoot;

90 RefPtr<Node> m_endRoot;	91 RefPtr<Node> m_endRoot;

91 RefPtr<Node> m_startTableRow;	92 RefPtr<Node> m_startTableRow;

92 RefPtr<Node> m_endTableRow;	93 RefPtr<Node> m_endTableRow;

93 };	94 };

94	95

95 } // namespace WebCore	96 } // namespace WebCore

96	97

97 #endif // DeleteSelectionCommand_h	98 #endif // DeleteSelectionCommand_h

OLD	NEW

« no previous file with comments | « third_party/WebKit/WebCore/WebCoreSources.bkl ('k') | third_party/WebKit/WebCore/editing/DeleteSelectionCommand.cpp » ('j') | no next file with comments »