Skip to content

GitLab

T
tangled
Commit a2448fe4 authored by yosin@chromium.org's avatar yosin@chromium.org
Browse files
Options

Fix reference type style in VisibleUnits.{cpp,h} 

This patch changes reference type style to follow other files in Blink, e.g.
move |&| just after type name without a space for improving code health.

This patch is a preparation of making selection to handle granularity for web
component, http://crrev.com/1277863002

BUG=513568
TEST=n/a; No behavior changes

Review URL: https://codereview.chromium.org/1310493003

git-svn-id: svn://svn.chromium.org/blink/trunk@201307 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e1918110
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 60 deletions
third_party/WebKit/Source/core/editing/VisibleUnits.cpp
View file @ a2448fe4
......@@ -662,7 +662,7 @@ static unsigned startWordBoundary(const UChar* characters, unsigned length, unsi
return start;
}
VisiblePosition startOfWord(const VisiblePosition &c, EWordSide side)
VisiblePosition startOfWord(const VisiblePosition& c, EWordSide side)
{
// FIXME: This returns a null VP for c at the start of the document
// and side == LeftWordIfOnBoundary
......@@ -690,7 +690,7 @@ static unsigned endWordBoundary(const UChar* characters, unsigned length, unsign
return findWordEndBoundary(characters, length, offset);
}
VisiblePosition endOfWord(const VisiblePosition &c, EWordSide side)
VisiblePosition endOfWord(const VisiblePosition& c, EWordSide side)
{
VisiblePosition p = c;
if (side == LeftWordIfOnBoundary) {
......@@ -717,7 +717,7 @@ static unsigned previousWordPositionBoundary(const UChar* characters, unsigned l
return findNextWordFromIndex(characters, length, offset, false);
}
VisiblePosition previousWordPosition(const VisiblePosition &c)
VisiblePosition previousWordPosition(const VisiblePosition& c)
{
VisiblePosition prev = previousBoundary(c, previousWordPositionBoundary);
return c.honorEditingBoundaryAtOrBefore(prev);
......@@ -733,7 +733,7 @@ static unsigned nextWordPositionBoundary(const UChar* characters, unsigned lengt
return findNextWordFromIndex(characters, length, offset, true);
}
VisiblePosition nextWordPosition(const VisiblePosition &c)
VisiblePosition nextWordPosition(const VisiblePosition& c)
{
VisiblePosition next = nextBoundary(c, nextWordPositionBoundary);
return c.honorEditingBoundaryAtOrAfter(next);
......@@ -959,17 +959,17 @@ bool inSameLine(const VisiblePosition& position1, const VisiblePosition& positio
return inSameLine(position1.toPositionWithAffinity(), position2.toPositionWithAffinity());
}
bool isStartOfLine(const VisiblePosition &p)
bool isStartOfLine(const VisiblePosition& p)
{
return p.isNotNull() && p.deepEquivalent() == startOfLine(p).deepEquivalent();
}
bool isEndOfLine(const VisiblePosition &p)
bool isEndOfLine(const VisiblePosition& p)
{
return p.isNotNull() && p.deepEquivalent() == endOfLine(p).deepEquivalent();
}
bool isLogicalEndOfLine(const VisiblePosition &p)
bool isLogicalEndOfLine(const VisiblePosition& p)
{
return p.isNotNull() && p.deepEquivalent() == logicalEndOfLine(p).deepEquivalent();
}
......@@ -988,7 +988,7 @@ static inline LayoutPoint absoluteLineDirectionPointToLocalPointInBlock(RootInli
return LayoutPoint(root->blockDirectionPointInLine(), lineDirectionPoint - absoluteBlockPoint.y());
}
VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, LayoutUnit lineDirectionPoint, EditableType editableType)
VisiblePosition previousLinePosition(const VisiblePosition& visiblePosition, LayoutUnit lineDirectionPoint, EditableType editableType)
{
Position p = visiblePosition.deepEquivalent();
Node* node = p.anchorNode();
......@@ -1041,7 +1041,7 @@ VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, Lay
return VisiblePosition(firstPositionInNode(rootElement));
}
VisiblePosition nextLinePosition(const VisiblePosition &visiblePosition, LayoutUnit lineDirectionPoint, EditableType editableType)
VisiblePosition nextLinePosition(const VisiblePosition& visiblePosition, LayoutUnit lineDirectionPoint, EditableType editableType)
{
Position p = visiblePosition.deepEquivalent();
Node* node = p.anchorNode();
......@@ -1106,7 +1106,7 @@ static unsigned startSentenceBoundary(const UChar* characters, unsigned length,
return iterator->preceding(length);
}
VisiblePosition startOfSentence(const VisiblePosition &c)
VisiblePosition startOfSentence(const VisiblePosition& c)
{
return previousBoundary(c, startSentenceBoundary);
}
......@@ -1118,7 +1118,7 @@ static unsigned endSentenceBoundary(const UChar* characters, unsigned length, un
}
// FIXME: This includes the space after the punctuation that marks the end of the sentence.
VisiblePosition endOfSentence(const VisiblePosition &c)
VisiblePosition endOfSentence(const VisiblePosition& c)
{
return nextBoundary(c, endSentenceBoundary);
}
......@@ -1131,7 +1131,7 @@ static unsigned previousSentencePositionBoundary(const UChar* characters, unsign
return iterator->preceding(length);
}
VisiblePosition previousSentencePosition(const VisiblePosition &c)
VisiblePosition previousSentencePosition(const VisiblePosition& c)
{
VisiblePosition prev = previousBoundary(c, previousSentencePositionBoundary);
return c.honorEditingBoundaryAtOrBefore(prev);
......@@ -1145,7 +1145,7 @@ static unsigned nextSentencePositionBoundary(const UChar* characters, unsigned l
return iterator->following(0);
}
VisiblePosition nextSentencePosition(const VisiblePosition &c)
VisiblePosition nextSentencePosition(const VisiblePosition& c)
{
VisiblePosition next = nextBoundary(c, nextSentencePositionBoundary);
return c.honorEditingBoundaryAtOrAfter(next);
......@@ -1226,7 +1226,7 @@ VisiblePosition startOfParagraph(const VisiblePosition& c, EditingBoundaryCrossi
return VisiblePosition(Position(node, type));
}
VisiblePosition endOfParagraph(const VisiblePosition &c, EditingBoundaryCrossingRule boundaryCrossingRule)
VisiblePosition endOfParagraph(const VisiblePosition& c, EditingBoundaryCrossingRule boundaryCrossingRule)
{
if (c.isNull())
return VisiblePosition();
......@@ -1314,17 +1314,17 @@ VisiblePosition startOfNextParagraph(const VisiblePosition& visiblePosition)
return afterParagraphEnd;
}
bool inSameParagraph(const VisiblePosition &a, const VisiblePosition &b, EditingBoundaryCrossingRule boundaryCrossingRule)
bool inSameParagraph(const VisiblePosition& a, const VisiblePosition& b, EditingBoundaryCrossingRule boundaryCrossingRule)
{
return a.isNotNull() && startOfParagraph(a, boundaryCrossingRule).deepEquivalent() == startOfParagraph(b, boundaryCrossingRule).deepEquivalent();
}
bool isStartOfParagraph(const VisiblePosition &pos, EditingBoundaryCrossingRule boundaryCrossingRule)
bool isStartOfParagraph(const VisiblePosition& pos, EditingBoundaryCrossingRule boundaryCrossingRule)
{
return pos.isNotNull() && pos.deepEquivalent() == startOfParagraph(pos, boundaryCrossingRule).deepEquivalent();
}
bool isEndOfParagraph(const VisiblePosition &pos, EditingBoundaryCrossingRule boundaryCrossingRule)
bool isEndOfParagraph(const VisiblePosition& pos, EditingBoundaryCrossingRule boundaryCrossingRule)
{
return pos.isNotNull() && pos.deepEquivalent() == endOfParagraph(pos, boundaryCrossingRule).deepEquivalent();
}
......@@ -1369,17 +1369,17 @@ VisiblePosition endOfBlock(const VisiblePosition& visiblePosition, EditingBounda
return endBlock ? VisiblePosition(lastPositionInNode(endBlock)) : VisiblePosition();
}
bool inSameBlock(const VisiblePosition &a, const VisiblePosition &b)
bool inSameBlock(const VisiblePosition& a, const VisiblePosition& b)
{
return !a.isNull() && enclosingBlock(a.deepEquivalent().computeContainerNode()) == enclosingBlock(b.deepEquivalent().computeContainerNode());
}
bool isStartOfBlock(const VisiblePosition &pos)
bool isStartOfBlock(const VisiblePosition& pos)
{
return pos.isNotNull() && pos.deepEquivalent() == startOfBlock(pos, CanCrossEditingBoundary).deepEquivalent();
}
bool isEndOfBlock(const VisiblePosition &pos)
bool isEndOfBlock(const VisiblePosition& pos)
{
return pos.isNotNull() && pos.deepEquivalent() == endOfBlock(pos, CanCrossEditingBoundary).deepEquivalent();
}
......@@ -1394,7 +1394,7 @@ VisiblePosition startOfDocument(const Node* node)
return VisiblePosition(firstPositionInNode(node->document().documentElement()));
}
VisiblePosition startOfDocument(const VisiblePosition &c)
VisiblePosition startOfDocument(const VisiblePosition& c)
{
return startOfDocument(c.deepEquivalent().anchorNode());
}
......@@ -1408,17 +1408,17 @@ VisiblePosition endOfDocument(const Node* node)
return VisiblePosition(lastPositionInNode(doc));
}
VisiblePosition endOfDocument(const VisiblePosition &c)
VisiblePosition endOfDocument(const VisiblePosition& c)
{
return endOfDocument(c.deepEquivalent().anchorNode());
}
bool isStartOfDocument(const VisiblePosition &p)
bool isStartOfDocument(const VisiblePosition& p)
{
return p.isNotNull() && p.previous(CanCrossEditingBoundary).isNull();
}
bool isEndOfDocument(const VisiblePosition &p)
bool isEndOfDocument(const VisiblePosition& p)
{
return p.isNotNull() && p.next(CanCrossEditingBoundary).isNull();
}
......@@ -1443,7 +1443,7 @@ VisiblePosition endOfEditableContent(const VisiblePosition& visiblePosition)
return VisiblePosition(lastPositionInNode(highestRoot));
}
bool isEndOfEditableOrNonEditableContent(const VisiblePosition &p)
bool isEndOfEditableOrNonEditableContent(const VisiblePosition& p)
{
return p.isNotNull() && p.next().isNull();
}
......
third_party/WebKit/Source/core/editing/VisibleUnits.h
View file @ a2448fe4
......@@ -77,41 +77,41 @@ struct InlineBoxPosition {
// endsOfNodeAreVisuallyDistinctPositions(boundary).
// FIXME: This function should never be called when the line box tree is dirty.
// See https://bugs.webkit.org/show_bug.cgi?id=97264
CORE_EXPORT Position mostBackwardCaretPosition(const Position &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostBackwardCaretPosition(const PositionInComposedTree &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT Position mostForwardCaretPosition(const Position &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT Position mostBackwardCaretPosition(const Position&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostBackwardCaretPosition(const PositionInComposedTree&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT Position mostForwardCaretPosition(const Position&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT bool isVisuallyEquivalentCandidate(const Position&);
CORE_EXPORT bool isVisuallyEquivalentCandidate(const PositionInComposedTree&);
// words
CORE_EXPORT VisiblePosition startOfWord(const VisiblePosition &, EWordSide = RightWordIfOnBoundary);
CORE_EXPORT VisiblePosition endOfWord(const VisiblePosition &, EWordSide = RightWordIfOnBoundary);
VisiblePosition previousWordPosition(const VisiblePosition &);
VisiblePosition nextWordPosition(const VisiblePosition &);
CORE_EXPORT VisiblePosition startOfWord(const VisiblePosition&, EWordSide = RightWordIfOnBoundary);
CORE_EXPORT VisiblePosition endOfWord(const VisiblePosition&, EWordSide = RightWordIfOnBoundary);
VisiblePosition previousWordPosition(const VisiblePosition&);
VisiblePosition nextWordPosition(const VisiblePosition&);
VisiblePosition rightWordPosition(const VisiblePosition&, bool skipsSpaceWhenMovingRight);
VisiblePosition leftWordPosition(const VisiblePosition&, bool skipsSpaceWhenMovingRight);
// sentences
CORE_EXPORT VisiblePosition startOfSentence(const VisiblePosition &);
CORE_EXPORT VisiblePosition endOfSentence(const VisiblePosition &);
VisiblePosition previousSentencePosition(const VisiblePosition &);
VisiblePosition nextSentencePosition(const VisiblePosition &);
CORE_EXPORT VisiblePosition startOfSentence(const VisiblePosition&);
CORE_EXPORT VisiblePosition endOfSentence(const VisiblePosition&);
VisiblePosition previousSentencePosition(const VisiblePosition&);
VisiblePosition nextSentencePosition(const VisiblePosition&);
// lines
VisiblePosition startOfLine(const VisiblePosition &);
VisiblePosition endOfLine(const VisiblePosition &);
VisiblePosition startOfLine(const VisiblePosition&);
VisiblePosition endOfLine(const VisiblePosition&);
CORE_EXPORT VisiblePosition previousLinePosition(const VisiblePosition&, LayoutUnit lineDirectionPoint, EditableType = ContentIsEditable);
CORE_EXPORT VisiblePosition nextLinePosition(const VisiblePosition&, LayoutUnit lineDirectionPoint, EditableType = ContentIsEditable);
CORE_EXPORT bool inSameLine(const VisiblePosition &, const VisiblePosition &);
CORE_EXPORT bool inSameLine(const PositionWithAffinity&, const PositionWithAffinity &);
CORE_EXPORT bool inSameLine(const VisiblePosition&, const VisiblePosition&);
CORE_EXPORT bool inSameLine(const PositionWithAffinity&, const PositionWithAffinity&);
CORE_EXPORT bool inSameLine(const PositionInComposedTreeWithAffinity&, const PositionInComposedTreeWithAffinity&);
bool isStartOfLine(const VisiblePosition &);
bool isEndOfLine(const VisiblePosition &);
VisiblePosition logicalStartOfLine(const VisiblePosition &);
VisiblePosition logicalEndOfLine(const VisiblePosition &);
bool isLogicalEndOfLine(const VisiblePosition &);
bool isStartOfLine(const VisiblePosition&);
bool isEndOfLine(const VisiblePosition&);
VisiblePosition logicalStartOfLine(const VisiblePosition&);
VisiblePosition logicalEndOfLine(const VisiblePosition&);
bool isLogicalEndOfLine(const VisiblePosition&);
VisiblePosition leftBoundaryOfLine(const VisiblePosition&, TextDirection);
VisiblePosition rightBoundaryOfLine(const VisiblePosition&, TextDirection);
......@@ -119,26 +119,26 @@ VisiblePosition rightBoundaryOfLine(const VisiblePosition&, TextDirection);
VisiblePosition startOfParagraph(const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
VisiblePosition endOfParagraph(const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
VisiblePosition startOfNextParagraph(const VisiblePosition&);
VisiblePosition previousParagraphPosition(const VisiblePosition &, LayoutUnit x);
VisiblePosition nextParagraphPosition(const VisiblePosition &, LayoutUnit x);
bool isStartOfParagraph(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
bool isEndOfParagraph(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
bool inSameParagraph(const VisiblePosition &, const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
VisiblePosition previousParagraphPosition(const VisiblePosition&, LayoutUnit x);
VisiblePosition nextParagraphPosition(const VisiblePosition&, LayoutUnit x);
bool isStartOfParagraph(const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
bool isEndOfParagraph(const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
bool inSameParagraph(const VisiblePosition&, const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
// blocks (true paragraphs; line break elements don't break blocks)
VisiblePosition startOfBlock(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
VisiblePosition endOfBlock(const VisiblePosition &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
bool inSameBlock(const VisiblePosition &, const VisiblePosition &);
bool isStartOfBlock(const VisiblePosition &);
bool isEndOfBlock(const VisiblePosition &);
VisiblePosition startOfBlock(const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
VisiblePosition endOfBlock(const VisiblePosition&, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
bool inSameBlock(const VisiblePosition&, const VisiblePosition&);
bool isStartOfBlock(const VisiblePosition&);
bool isEndOfBlock(const VisiblePosition&);
// document
VisiblePosition startOfDocument(const Node*);
VisiblePosition endOfDocument(const Node*);
VisiblePosition startOfDocument(const VisiblePosition &);
VisiblePosition endOfDocument(const VisiblePosition &);
bool isStartOfDocument(const VisiblePosition &);
bool isEndOfDocument(const VisiblePosition &);
VisiblePosition startOfDocument(const VisiblePosition&);
VisiblePosition endOfDocument(const VisiblePosition&);
bool isStartOfDocument(const VisiblePosition&);
bool isEndOfDocument(const VisiblePosition&);
// editable content
VisiblePosition startOfEditableContent(const VisiblePosition&);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment