Bug 1069490 - Part 3: Set columnNumber when processing console messages. r=bz
authorEric Rahm <erahm@mozilla.com>
Mon, 22 Sep 2014 11:28:55 -0700
changeset 206582 55363f62f7ad2c189b7fd86c5df7140d3c28966e
parent 206581 b0dd65a5d40b6b7031c8a773b03f410159ef3ecd
child 206583 31ff3ab5c143e064e27d5a815d7e76086965a350
push id27532
push userkwierso@gmail.com
push dateTue, 23 Sep 2014 01:57:26 +0000
treeherdermozilla-central@790f41c631cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1069490
milestone35.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 1069490 - Part 3: Set columnNumber when processing console messages. r=bz
dom/base/Console.cpp
--- a/dom/base/Console.cpp
+++ b/dom/base/Console.cpp
@@ -759,16 +759,22 @@ StackFrameToStackEntry(nsIStackFrame* aS
   NS_ENSURE_SUCCESS(rv, rv);
 
   int32_t lineNumber;
   rv = aStackFrame->GetLineNumber(&lineNumber);
   NS_ENSURE_SUCCESS(rv, rv);
 
   aStackEntry.mLineNumber = lineNumber;
 
+  int32_t columnNumber;
+  rv = aStackFrame->GetColumnNumber(&columnNumber);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  aStackEntry.mColumnNumber = columnNumber;
+
   rv = aStackFrame->GetName(aStackEntry.mFunctionName);
   NS_ENSURE_SUCCESS(rv, rv);
 
   aStackEntry.mLanguage = aLanguage;
   return NS_OK;
 }
 
 static
@@ -1057,16 +1063,17 @@ Console::ProcessCallData(ConsoleCallData
     // If we are in a JSM, the window doesn't exist.
     event.mID.Value().SetAsString() = NS_LITERAL_STRING("jsm");
     event.mInnerID.Value().SetAsString() = frame.mFilename;
   }
 
   event.mLevel = aData->mMethodString;
   event.mFilename = frame.mFilename;
   event.mLineNumber = frame.mLineNumber;
+  event.mColumnNumber = frame.mColumnNumber;
   event.mFunctionName = frame.mFunctionName;
   event.mTimeStamp = aData->mTimeStamp;
   event.mPrivate = aData->mPrivate;
 
   switch (aData->mMethodName) {
     case MethodLog:
     case MethodInfo:
     case MethodWarn: