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

third_party/WebKit/WebCore/editing/htmlediting.h

 /*
  * Copyright (C) 2004, 2006 Apple Computer, 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 76 matching lines @@
 bool isTabSpanTextNode(const Node*);
 Node* tabSpanNode(const Node*);
 Position positionBeforeTabSpan(const Position&);
 PassRefPtr<Element> createTabSpanElement(Document*);
 PassRefPtr<Element> createTabSpanElement(Document*, PassRefPtr<Node> tabTextNode);
 PassRefPtr<Element> createTabSpanElement(Document*, const String& tabText);
 
 bool isNodeRendered(const Node*);
 bool isMailBlockquote(const Node*);
 Node* nearestMailBlockquote(const Node*);
+unsigned numEnclosingMailBlockquotes(const Position&);
 int caretMinOffset(const Node*);
 int caretMaxOffset(const Node*);
 
 //------------------------------------------------------------------------------------------
 
 bool isTableStructureNode(const Node*);
 PassRefPtr<Element> createBlockPlaceholderElement(Document*);
 
 bool isFirstVisiblePositionInSpecialElement(const Position&);
 Position positionBeforeContainingSpecialElement(const Position&, Node** containingSpecialElement=0);
@@ skipping 18 matching lines @@
 
 bool lineBreakExistsAtPosition(const VisiblePosition&);
 
 Selection selectionForParagraphIteration(const Selection&);
 
 int indexForVisiblePosition(VisiblePosition&);
 
 }
 
 #endif