Bug 1368397 part 3 - Rename Selection::addTableCellRange() to Selection::AddTableCellRange() r?mats draft
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 29 May 2017 13:31:11 +0900
changeset 586283 8101682f6aea13e08670bd192da41ee2f7acff33
parent 586282 e9c11cccb73c9e52eb5edda24602d4fc5ff0927d
child 586284 54d4e21e5ddaa2347ff1b80016d9fed8ba6b799b
push id61355
push usermasayuki@d-toybox.com
push dateTue, 30 May 2017 04:35:58 +0000
reviewersmats
bugs1368397
milestone55.0a1
Bug 1368397 part 3 - Rename Selection::addTableCellRange() to Selection::AddTableCellRange() r?mats MozReview-Commit-ID: 2koKrL8pyKT
layout/generic/Selection.h
layout/generic/nsSelection.cpp
--- a/layout/generic/Selection.h
+++ b/layout/generic/Selection.h
@@ -348,17 +348,19 @@ private:
                                      bool aSelected);
   nsresult SelectFrames(nsPresContext* aPresContext,
                         nsRange* aRange,
                         bool aSelect);
   nsresult GetTableCellLocationFromRange(nsRange* aRange,
                                          int32_t* aSelectionType,
                                          int32_t* aRow,
                                          int32_t* aCol);
-  nsresult     addTableCellRange(nsRange *aRange, bool *aDidAddRange, int32_t *aOutIndex);
+  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,
                             nsINode* aEndNode, int32_t aEndOffset,
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -3260,17 +3260,17 @@ Selection::GetTableCellLocationFromRange
     return result;
   if (!cellLayout)
     return NS_ERROR_FAILURE;
 
   return cellLayout->GetCellIndexes(*aRow, *aCol);
 }
 
 nsresult
-Selection::addTableCellRange(nsRange* aRange, bool* aDidAddRange,
+Selection::AddTableCellRange(nsRange* aRange, bool* aDidAddRange,
                              int32_t* aOutIndex)
 {  
   if (!aDidAddRange || !aOutIndex)
     return NS_ERROR_NULL_POINTER;
 
   *aDidAddRange = false;
   *aOutIndex = -1;
 
@@ -5045,17 +5045,17 @@ Selection::AddRangeInternal(nsRange& aRa
     // associated with context object. Otherwise, this method must do nothing."
     return;
   }
 
   // This inserts a table cell range in proper document order
   // and returns NS_OK if range doesn't contain just one table cell
   bool didAddRange;
   int32_t rangeIndex;
-  nsresult result = addTableCellRange(&aRange, &didAddRange, &rangeIndex);
+  nsresult result = AddTableCellRange(&aRange, &didAddRange, &rangeIndex);
   if (NS_FAILED(result)) {
     aRv.Throw(result);
     return;
   }
 
   if (!didAddRange) {
     result = AddItem(&aRange, &rangeIndex);
     if (NS_FAILED(result)) {