Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: third_party/WebKit/WebCore/dom/Position.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/WebCore/dom/Node.idl ('k') | third_party/WebKit/WebCore/dom/Position.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/dom/Position.h
===================================================================
--- third_party/WebKit/WebCore/dom/Position.h (revision 9383)
+++ third_party/WebKit/WebCore/dom/Position.h (working copy)
@@ -40,11 +40,7 @@
class Range;
class RenderObject;
-enum PositionMoveType {
- CodePoint, // Move by a single code point.
- Character, // Move to the next Unicode character break.
- BackwardDeletion // Subject to platform conventions.
-};
+enum EUsingComposedCharacters { NotUsingComposedCharacters = false, UsingComposedCharacters = true };
// FIXME: Reduce the number of operations we have on a Position.
// This should be more like a humble struct, without so many different
@@ -73,10 +69,9 @@
// Move up or down the DOM by one position.
// Offsets are computed using render text for nodes that have renderers - but note that even when
// using composed characters, the result may be inside a single user-visible character if a ligature is formed.
- Position previous(PositionMoveType = CodePoint) const;
- Position next(PositionMoveType = CodePoint) const;
+ Position previous(EUsingComposedCharacters usingComposedCharacters=NotUsingComposedCharacters) const;
+ Position next(EUsingComposedCharacters usingComposedCharacters=NotUsingComposedCharacters) const;
static int uncheckedPreviousOffset(const Node*, int current);
- static int uncheckedPreviousOffsetForBackwardDeletion(const Node*, int current);
static int uncheckedNextOffset(const Node*, int current);
bool atStart() const;
« no previous file with comments | « third_party/WebKit/WebCore/dom/Node.idl ('k') | third_party/WebKit/WebCore/dom/Position.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698