Bug 1368397 part 2 - Rename Selection::getTableCellLocationFromRange() to Selection::GetTableCellLocationFromRange() r=mats draft
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 29 May 2017 13:11:57 +0900
changeset 586282 e9c11cccb73c9e52eb5edda24602d4fc5ff0927d
parent 586281 f62bb3934293a1277402732a021e95779f259faa
child 586283 8101682f6aea13e08670bd192da41ee2f7acff33
push id61355
push usermasayuki@d-toybox.com
push dateTue, 30 May 2017 04:35:58 +0000
reviewersmats
bugs1368397
milestone55.0a1
Bug 1368397 part 2 - Rename Selection::getTableCellLocationFromRange() to Selection::GetTableCellLocationFromRange() r=mats MozReview-Commit-ID: 8P8Tq9u0xEz
layout/generic/Selection.h
layout/generic/nsSelection.cpp
--- a/layout/generic/Selection.h
+++ b/layout/generic/Selection.h
@@ -344,17 +344,20 @@ private:
                                             // mAnchorFocusRange
   void SelectFramesForContent(nsIContent* aContent, bool aSelected);
   nsresult SelectAllFramesForContent(nsIContentIterator* aInnerIter,
                                      nsIContent *aContent,
                                      bool aSelected);
   nsresult SelectFrames(nsPresContext* aPresContext,
                         nsRange* aRange,
                         bool aSelect);
-  nsresult     getTableCellLocationFromRange(nsRange *aRange, int32_t *aSelectionType, int32_t *aRow, int32_t *aCol);
+  nsresult GetTableCellLocationFromRange(nsRange* aRange,
+                                         int32_t* aSelectionType,
+                                         int32_t* aRow,
+                                         int32_t* aCol);
   nsresult     addTableCellRange(nsRange *aRange, bool *aDidAddRange, int32_t *aOutIndex);
 
   nsresult FindInsertionPoint(
       nsTArray<RangeData>* aElementArray,
       nsINode* aPointNode, int32_t aPointOffset,
       nsresult (*aComparator)(nsINode*,int32_t,nsRange*,int32_t*),
       int32_t* aPoint);
   bool EqualsRangeAtPoint(nsINode* aBeginNode, int32_t aBeginOffset,
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -3216,17 +3216,17 @@ nsFrameSelection::SelectCellElement(nsIC
 
   // Get child offset
   int32_t offset = parent->IndexOf(aCellElement);
 
   return CreateAndAddRange(parent, offset);
 }
 
 nsresult
-Selection::getTableCellLocationFromRange(nsRange* aRange,
+Selection::GetTableCellLocationFromRange(nsRange* aRange,
                                          int32_t* aSelectionType,
                                          int32_t* aRow, int32_t* aCol)
 {
   if (!aRange || !aSelectionType || !aRow || !aCol)
     return NS_ERROR_NULL_POINTER;
 
   *aSelectionType = nsISelectionPrivate::TABLESELECTION_NONE;
   *aRow = 0;
@@ -3279,17 +3279,17 @@ Selection::addTableCellRange(nsRange* aR
 
   if (!aRange)
     return NS_ERROR_NULL_POINTER;
 
   nsresult result;
 
   // Get if we are adding a cell selection and the row, col of cell if we are
   int32_t newRow, newCol, tableMode;
-  result = getTableCellLocationFromRange(aRange, &tableMode, &newRow, &newCol);
+  result = GetTableCellLocationFromRange(aRange, &tableMode, &newRow, &newCol);
   if (NS_FAILED(result)) return result;
   
   // If not adding a cell range, we are done here
   if (tableMode != nsISelectionPrivate::TABLESELECTION_CELL)
   {
     mFrameSelection->mSelectingTableCellMode = tableMode;
     // Don't fail if range isn't a selected cell, aDidAddRange tells caller if we didn't proceed
     return NS_OK;