Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/dom/Position.h

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 
 namespace WebCore {
 
 class CSSComputedStyleDeclaration;
 class Element;
 class InlineBox;
 class Node;
 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
 // member functions. We should find better homes for these functions.
 
 class Position {
 public:
     RefPtr<Node> container;
     int posOffset; // to be renamed to offset when we get rid of offset()
 
     Position() : posOffset(0) { }
     Position(PassRefPtr<Node> c, int o) : container(c), posOffset(o) { }
 
     void clear() { container.clear(); posOffset = 0; }
 
     Node* node() const { return container.get(); }
     int offset() const { return posOffset; }
     Element* documentElement() const;
 
     bool isNull() const { return !container; }
     bool isNotNull() const { return container; }
 
     Element* element() const;
     PassRefPtr<CSSComputedStyleDeclaration> computedStyle() const;
 
     // 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;
     bool atEnd() const;
 
     // FIXME: Make these non-member functions and put them somewhere in the editing directory.
     // These aren't really basic "position" operations. More high level editing helper functions.
     Position leadingWhitespacePosition(EAffinity, bool considerNonCollapsibleWhitespace = false) const;
     Position trailingWhitespacePosition(EAffinity, bool considerNonCollapsibleWhitespace = false) const;
     
@@ skipping 41 matching lines @@
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::Position&);
 void showTree(const WebCore::Position*);
 #endif
 
 #endif // Position_h