Bug 1059888 - Fix a few DEBUG_TABLE_SELECTION compile errors, NPOTB. r=dholbert
authorMats Palmgren <mats@mozilla.com>
Thu, 28 Aug 2014 10:07:00 -0400
changeset 223904 a0ce53c1cc7a32ac504e80a54477e88b00ba6ef1
parent 223903 eaffaa176816432664e445c6b1cbe669cd19f13b
child 223905 87ac83b75957344a0e97a4b6f41da4fd642b48e0
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1059888
milestone34.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 1059888 - Fix a few DEBUG_TABLE_SELECTION compile errors, NPOTB. r=dholbert
layout/generic/nsSelection.cpp
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -2122,17 +2122,18 @@ nsFrameSelection::HandleTableSelection(n
     // We are drag-selecting
     if (aTarget != nsISelectionPrivate::TABLESELECTION_TABLE)
     {
       // If dragging in the same cell as last event, do nothing
       if (mEndSelectedCell == childContent)
         return NS_OK;
 
 #ifdef DEBUG_TABLE_SELECTION
-printf(" mStartSelectedCell = %x, mEndSelectedCell = %x, childContent = %x \n", mStartSelectedCell, mEndSelectedCell, childContent);
+      printf(" mStartSelectedCell = %p, mEndSelectedCell = %p, childContent = %p \n",
+             mStartSelectedCell.get(), mEndSelectedCell.get(), childContent);
 #endif
       // aTarget can be any "cell mode",
       //  so we can easily drag-select rows and columns 
       // Once we are in row or column mode,
       //  we can drift into any cell to stay in that mode
       //  even if aTarget = TABLESELECTION_CELL
 
       if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW ||
@@ -2292,17 +2293,18 @@ printf("aTarget == %d\n", aTarget);
         // Always do this AFTER RemoveAllRanges
         mSelectingTableCellMode = aTarget;
         return SelectRowOrColumn(childContent, aTarget);
       }
     }
     else
     {
 #ifdef DEBUG_TABLE_SELECTION
-printf("HandleTableSelection: Mouse UP event. mDragSelectingCells=%d, mStartSelectedCell=%d\n", mDragSelectingCells, mStartSelectedCell);
+      printf("HandleTableSelection: Mouse UP event. mDragSelectingCells=%d, mStartSelectedCell=%p\n",
+             mDragSelectingCells, mStartSelectedCell.get());
 #endif
       // First check if we are extending a block selection
       int32_t rangeCount;
       result = mDomSelections[index]->GetRangeCount(&rangeCount);
       if (NS_FAILED(result)) 
         return result;
 
       if (rangeCount > 0 && aMouseEvent->IsShift() && 
@@ -2326,17 +2328,18 @@ printf("HandleTableSelection: Mouse UP e
 #ifdef XP_MACOSX
       doMouseUpAction = aMouseEvent->IsMeta();
 #else
       doMouseUpAction = aMouseEvent->IsControl();
 #endif
       if (!doMouseUpAction)
       {
 #ifdef DEBUG_TABLE_SELECTION
-printf("HandleTableSelection: Ending cell selection on mouseup: mAppendStartSelectedCell=%d\n", mAppendStartSelectedCell);
+        printf("HandleTableSelection: Ending cell selection on mouseup: mAppendStartSelectedCell=%p\n",
+               mAppendStartSelectedCell.get());
 #endif
         return NS_OK;
       }
       // Unselect a cell only if it wasn't
       //  just selected on mousedown
       if( childContent == mUnselectCellOnMouseUp)
       {
         // Scan ranges to find the cell to unselect (the selection range to remove)