Bug 1368397 part 2 - Rename Selection::getTableCellLocationFromRange() to Selection::GetTableCellLocationFromRange() r=mats
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 29 May 2017 13:11:57 +0900
changeset 361219 1c70ad20e58bbbb87aba0711b080e8a11dc6aaed
parent 361218 2e878bf1e7beb911c8414632b85fcba8da5cdf61
child 361220 89baf48da239b058bea8c5851566d2c79a956345
push id90813
push usercbook@mozilla.com
push dateTue, 30 May 2017 09:53:44 +0000
treeherdermozilla-inbound@b5c3bb245c4e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1368397
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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;