Modified: trunk/Source/WebCore/ChangeLog (93442 => 93443)
--- trunk/Source/WebCore/ChangeLog 2011-08-19 22:12:28 UTC (rev 93442)
+++ trunk/Source/WebCore/ChangeLog 2011-08-19 22:20:19 UTC (rev 93443)
@@ -1,3 +1,33 @@
+2011-08-19 Van Lam <[email protected]>
+
+ Rename VisiblePosition::honorEditableBoundary* to VisiblePosition::honorEditingBoundary*
+ https://bugs.webkit.org/show_bug.cgi?id=66499
+
+ Reviewed by Ryosuke Niwa.
+
+ Renamed VisiblePosition::honorEditableBoundary* to
+ honorEditingBoundary.
+
+ * editing/VisiblePosition.cpp:
+ (WebCore::VisiblePosition::next):
+ (WebCore::VisiblePosition::previous):
+ (WebCore::VisiblePosition::left):
+ (WebCore::VisiblePosition::right):
+ (WebCore::VisiblePosition::honorEditingBoundaryAtOrBefore):
+ (WebCore::VisiblePosition::honorEditingBoundaryAtOrAfter):
+ * editing/VisiblePosition.h:
+ * editing/visible_units.cpp:
+ (WebCore::previousWordPosition):
+ (WebCore::nextWordPosition):
+ (WebCore::startOfLine):
+ (WebCore::endOfLine):
+ (WebCore::previousSentencePosition):
+ (WebCore::nextSentencePosition):
+ (WebCore::logicalStartOfLine):
+ (WebCore::logicalEndOfLine):
+ (WebCore::leftWordPosition):
+ (WebCore::rightWordPosition):
+
2011-08-19 James Robinson <[email protected]>
REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chromium Mac
Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (93442 => 93443)
--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2011-08-19 22:12:28 UTC (rev 93442)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2011-08-19 22:20:19 UTC (rev 93443)
@@ -70,7 +70,7 @@
if (rule == CanCrossEditingBoundary)
return next;
- return honorEditableBoundaryAtOrAfter(next);
+ return honorEditingBoundaryAtOrAfter(next);
}
VisiblePosition VisiblePosition::previous(EditingBoundaryCrossingRule rule) const
@@ -100,7 +100,7 @@
if (rule == CanCrossEditingBoundary)
return prev;
- return honorEditableBoundaryAtOrBefore(prev);
+ return honorEditingBoundaryAtOrBefore(prev);
}
Position VisiblePosition::leftVisuallyDistinctCandidate() const
@@ -251,7 +251,7 @@
return left;
// FIXME: This may need to do something different from "before".
- return honorEditableBoundaryAtOrBefore(left);
+ return honorEditingBoundaryAtOrBefore(left);
}
Position VisiblePosition::rightVisuallyDistinctCandidate() const
@@ -403,10 +403,10 @@
return right;
// FIXME: This may need to do something different from "after".
- return honorEditableBoundaryAtOrAfter(right);
+ return honorEditingBoundaryAtOrAfter(right);
}
-VisiblePosition VisiblePosition::honorEditableBoundaryAtOrBefore(const VisiblePosition &pos) const
+VisiblePosition VisiblePosition::honorEditingBoundaryAtOrBefore(const VisiblePosition &pos) const
{
if (pos.isNull())
return pos;
@@ -432,7 +432,7 @@
return lastEditablePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot);
}
-VisiblePosition VisiblePosition::honorEditableBoundaryAtOrAfter(const VisiblePosition &pos) const
+VisiblePosition VisiblePosition::honorEditingBoundaryAtOrAfter(const VisiblePosition &pos) const
{
if (pos.isNull())
return pos;
Modified: trunk/Source/WebCore/editing/VisiblePosition.h (93442 => 93443)
--- trunk/Source/WebCore/editing/VisiblePosition.h 2011-08-19 22:12:28 UTC (rev 93442)
+++ trunk/Source/WebCore/editing/VisiblePosition.h 2011-08-19 22:20:19 UTC (rev 93443)
@@ -70,8 +70,8 @@
// next() and previous() will increment/decrement by a character cluster.
VisiblePosition next(EditingBoundaryCrossingRule = CanCrossEditingBoundary) const;
VisiblePosition previous(EditingBoundaryCrossingRule = CanCrossEditingBoundary) const;
- VisiblePosition honorEditableBoundaryAtOrBefore(const VisiblePosition&) const;
- VisiblePosition honorEditableBoundaryAtOrAfter(const VisiblePosition&) const;
+ VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition&) const;
+ VisiblePosition honorEditingBoundaryAtOrAfter(const VisiblePosition&) const;
VisiblePosition left(bool stayInEditableContent = false) const;
VisiblePosition right(bool stayInEditableContent = false) const;
Modified: trunk/Source/WebCore/editing/visible_units.cpp (93442 => 93443)
--- trunk/Source/WebCore/editing/visible_units.cpp 2011-08-19 22:12:28 UTC (rev 93442)
+++ trunk/Source/WebCore/editing/visible_units.cpp 2011-08-19 22:20:19 UTC (rev 93443)
@@ -292,7 +292,7 @@
VisiblePosition previousWordPosition(const VisiblePosition &c)
{
VisiblePosition prev = previousBoundary(c, previousWordPositionBoundary);
- return c.honorEditableBoundaryAtOrBefore(prev);
+ return c.honorEditingBoundaryAtOrBefore(prev);
}
static unsigned nextWordPositionBoundary(const UChar* characters, unsigned length, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
@@ -308,7 +308,7 @@
VisiblePosition nextWordPosition(const VisiblePosition &c)
{
VisiblePosition next = nextBoundary(c, nextWordPositionBoundary);
- return c.honorEditableBoundaryAtOrAfter(next);
+ return c.honorEditingBoundaryAtOrAfter(next);
}
bool isStartOfWord(const VisiblePosition& p)
@@ -373,7 +373,7 @@
{
VisiblePosition visPos = startPositionForLine(c);
- return c.honorEditableBoundaryAtOrBefore(visPos);
+ return c.honorEditingBoundaryAtOrBefore(visPos);
}
static VisiblePosition endPositionForLine(const VisiblePosition& c)
@@ -442,7 +442,7 @@
visPos = endPositionForLine(visPos);
}
- return c.honorEditableBoundaryAtOrAfter(visPos);
+ return c.honorEditingBoundaryAtOrAfter(visPos);
}
bool inSameLine(const VisiblePosition &a, const VisiblePosition &b)
@@ -705,7 +705,7 @@
VisiblePosition previousSentencePosition(const VisiblePosition &c)
{
VisiblePosition prev = previousBoundary(c, previousSentencePositionBoundary);
- return c.honorEditableBoundaryAtOrBefore(prev);
+ return c.honorEditingBoundaryAtOrBefore(prev);
}
static unsigned nextSentencePositionBoundary(const UChar* characters, unsigned length, unsigned, BoundarySearchContextAvailability, bool&)
@@ -719,7 +719,7 @@
VisiblePosition nextSentencePosition(const VisiblePosition &c)
{
VisiblePosition next = nextBoundary(c, nextSentencePositionBoundary);
- return c.honorEditableBoundaryAtOrAfter(next);
+ return c.honorEditingBoundaryAtOrAfter(next);
}
VisiblePosition startOfParagraph(const VisiblePosition& c, EditingBoundaryCrossingRule boundaryCrossingRule)
@@ -1067,7 +1067,7 @@
if (!editableRoot->contains(visPos.deepEquivalent().containerNode()))
return firstPositionInNode(editableRoot);
}
- return c.honorEditableBoundaryAtOrBefore(visPos);
+ return c.honorEditingBoundaryAtOrBefore(visPos);
}
static VisiblePosition logicalEndPositionForLine(const VisiblePosition& c)
@@ -1130,7 +1130,7 @@
if (!editableRoot->contains(visPos.deepEquivalent().containerNode()))
return lastPositionInNode(editableRoot);
}
- return c.honorEditableBoundaryAtOrAfter(visPos);
+ return c.honorEditingBoundaryAtOrAfter(visPos);
}
VisiblePosition leftBoundaryOfLine(const VisiblePosition& c, TextDirection direction)
@@ -1679,7 +1679,7 @@
return VisiblePosition();
VisiblePosition leftWordBreak = leftWordPositionIgnoringEditingBoundary(visiblePosition);
- return visiblePosition.honorEditableBoundaryAtOrBefore(leftWordBreak);
+ return visiblePosition.honorEditingBoundaryAtOrBefore(leftWordBreak);
}
VisiblePosition rightWordPosition(const VisiblePosition& visiblePosition)
@@ -1688,7 +1688,7 @@
return VisiblePosition();
VisiblePosition rightWordBreak = rightWordPositionIgnoringEditingBoundary(visiblePosition);
- return visiblePosition.honorEditableBoundaryAtOrBefore(rightWordBreak);
+ return visiblePosition.honorEditingBoundaryAtOrBefore(rightWordBreak);
}
}
