Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/editing/htmlediting.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 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 204 matching lines @@
             return p;
     }
     return Position();
 }
 
 Position nextVisuallyDistinctCandidate(const Position& position)
 {
     Position p = position;
     Position downstreamStart = p.downstream();
     while (!p.atEnd()) {
-        p = p.next(Character);
+        p = p.next(UsingComposedCharacters);
         if (p.isCandidate() && p.downstream() != downstreamStart)
             return p;
     }
     return Position();
 }
 
 Position previousCandidate(const Position& position)
 {
     PositionIterator p = position;
     while (!p.atStart()) {
         p.decrement();
         if (p.isCandidate())
             return p;
     }
     return Position();
 }
 
 Position previousVisuallyDistinctCandidate(const Position& position)
 {
     Position p = position;
     Position downstreamStart = p.downstream();
     while (!p.atStart()) {
-        p = p.previous(Character);
+        p = p.previous(UsingComposedCharacters);
         if (p.isCandidate() && p.downstream() != downstreamStart)
             return p;
     }
     return Position();
 }
 
 VisiblePosition firstEditablePositionAfterPositionInRoot(const Position& position, Node* highestRoot)
 {
     // position falls before highestRoot.
     if (comparePositions(position, Position(highestRoot, 0)) == -1 && highestRoot->isContentEditable())
@@ skipping 737 matching lines @@
         ASSERT(node->parentNode());
         updatedSelection.setExtent(Position(node->parentNode(), node->nodeIndex()));
     }
         
     return updatedSelection;
 }
 
 } // namespace WebCore