Do another merge using nifty new merge script (CL for that coming soon).

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 838 matching lines @@
 
 Node *nearestMailBlockquote(const Node *node)
 {
     for (Node *n = const_cast<Node *>(node); n; n = n->parentNode()) {
         if (isMailBlockquote(n))
             return n;
     }
     return 0;
 }
 
+unsigned numEnclosingMailBlockquotes(const Position& p)
+{
+    unsigned num = 0;
+    for (Node* n = p.node(); n; n = n->parentNode())
+        if (isMailBlockquote(n))
+            num++;
+    
+    return num;
+}
+
 bool isMailBlockquote(const Node *node)
 {
     if (!node || !node->isElementNode() && !node->hasTagName(blockquoteTag))
         return false;
         
     return static_cast<const Element *>(node)->getAttribute("type") == "cite";
 }
 
 int caretMinOffset(const Node* n)
 {
@@ skipping 113 matching lines @@
     
     if (extent == node || extent->isDescendantOf(node)) {
         ASSERT(node->parentNode());
         updatedSelection.setExtent(Position(node->parentNode(), node->nodeIndex()));
     }
         
     return updatedSelection;
 }
 
 } // namespace WebCore