Source/WebCore/editing/htmlediting.h - Issue 10451004: Merge 116653

Side by Side Diff: Source/WebCore/editing/htmlediting.h

Issue 10451004: Merge 116653 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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:

« no previous file with comments | « Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp ('k') | Source/WebCore/editing/htmlediting.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2004, 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 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 // Functions returning Node	54 // Functions returning Node

55	55

56 Node* highestAncestor(Node*);	56 Node* highestAncestor(Node*);

57 Node* highestEditableRoot(const Position&, EditableType = ContentIsEditable);	57 Node* highestEditableRoot(const Position&, EditableType = ContentIsEditable);

58	58

59 Node* highestEnclosingNodeOfType(const Position&, bool (nodeIsOfType)(const Nod e),	59 Node* highestEnclosingNodeOfType(const Position&, bool (nodeIsOfType)(const Nod e),

60 EditingBoundaryCrossingRule = CannotCrossEditingBoundary, Node* stayWithin = 0);	60 EditingBoundaryCrossingRule = CannotCrossEditingBoundary, Node* stayWithin = 0);

61 Node* highestNodeToRemoveInPruning(Node*);	61 Node* highestNodeToRemoveInPruning(Node*);

62 Node* lowestEditableAncestor(Node*);	62 Node* lowestEditableAncestor(Node*);

63	63

64 Node* enclosingBlock(Node*, EditingBoundaryCrossingRule = CannotCrossEditingBoun dary);	64 Element* enclosingBlock(Node*, EditingBoundaryCrossingRule = CannotCrossEditingB oundary);

65 Node* enclosingTableCell(const Position&);	65 Node* enclosingTableCell(const Position&);

66 Node* enclosingEmptyListItem(const VisiblePosition&);	66 Node* enclosingEmptyListItem(const VisiblePosition&);

67 Node* enclosingAnchorElement(const Position&);	67 Node* enclosingAnchorElement(const Position&);

68 Node* enclosingNodeWithTag(const Position&, const QualifiedName&);	68 Node* enclosingNodeWithTag(const Position&, const QualifiedName&);

69 Node* enclosingNodeOfType(const Position&, bool (nodeIsOfType)(const Node), Ed itingBoundaryCrossingRule = CannotCrossEditingBoundary);	69 Node* enclosingNodeOfType(const Position&, bool (nodeIsOfType)(const Node), Ed itingBoundaryCrossingRule = CannotCrossEditingBoundary);

70	70

71 Node* tabSpanNode(const Node*);	71 Node* tabSpanNode(const Node*);

72 Node* isLastPositionBeforeTable(const VisiblePosition&);	72 Node* isLastPositionBeforeTable(const VisiblePosition&);

73 Node* isFirstPositionAfterTable(const VisiblePosition&);	73 Node* isFirstPositionAfterTable(const VisiblePosition&);

74	74

(...skipping 178 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
253 // FIXME: this is required until 6853027 is fixed and text checking can do t his for us.	253 // FIXME: this is required until 6853027 is fixed and text checking can do t his for us.

254 return character == '\'' \|\| character == rightSingleQuotationMark \|\| charact er == hebrewPunctuationGershayim;	254 return character == '\'' \|\| character == rightSingleQuotationMark \|\| charact er == hebrewPunctuationGershayim;

255 }	255 }

256	256

257 String stringWithRebalancedWhitespace(const String&, bool startIsStartOfParagrap h, bool endIsEndOfParagraph);	257 String stringWithRebalancedWhitespace(const String&, bool startIsStartOfParagrap h, bool endIsEndOfParagraph);

258 const String& nonBreakingSpaceString();	258 const String& nonBreakingSpaceString();

259	259

260 }	260 }

261	261

262 #endif	262 #endif

OLD	NEW