[DevTools] Report correct syntax error location for evaluated in console script

Source/core/inspector/InjectedScriptBase.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
     RefPtr<TypeBuilder::Debugger::ExceptionDetails> exceptionDetails = TypeBuilder::Debugger::ExceptionDetails::create().setText(text);
     String url;
     if (object->getString("url", &url))
         exceptionDetails->setUrl(url);
     int line = 0;
     if (object->getNumber("line", &line))
         exceptionDetails->setLine(line);
     int column = 0;
     if (object->getNumber("column", &column))
         exceptionDetails->setColumn(column);
+    int originScriptId = 0;
+    object->getNumber("scriptId", &originScriptId);
+
     RefPtr<JSONArray> stackTrace = object->getArray("stackTrace");
     if (stackTrace && stackTrace->length() > 0) {
         RefPtr<TypeBuilder::Array<TypeBuilder::Console::CallFrame> > frames = TypeBuilder::Array<TypeBuilder::Console::CallFrame>::create();
         for (unsigned i = 0; i < stackTrace->length(); ++i) {
             RefPtr<JSONObject> stackFrame = stackTrace->get(i)->asObject();
             int lineNumber = 0;
             stackFrame->getNumber("lineNumber", &lineNumber);
             int column = 0;
             stackFrame->getNumber("column", &column);
             int scriptId = 0;
             stackFrame->getNumber("scriptId", &scriptId);
+            if (i == 0 && scriptId == originScriptId)

[apavlov, 2014/10/03 09:54:43]

!i

[kozyatinskiy1, 2014/10/03 10:08:26]

Done.

+                originScriptId = 0;
+
             String sourceURL;
             stackFrame->getString("scriptNameOrSourceURL", &sourceURL);
             String functionName;
             stackFrame->getString("functionName", &functionName);
 
             RefPtr<TypeBuilder::Console::CallFrame> callFrame = TypeBuilder::Console::CallFrame::create()
                 .setFunctionName(functionName)
                 .setScriptId(String::number(scriptId))
                 .setUrl(sourceURL)
                 .setLineNumber(lineNumber)
                 .setColumnNumber(column);
 
             frames->addItem(callFrame.release());
         }
         exceptionDetails->setStackTrace(frames.release());
     }
+    if (originScriptId)
+        exceptionDetails->setScriptId(String::number(originScriptId));
     return exceptionDetails.release();
 }
 
 InjectedScriptBase::InjectedScriptBase(const String& name)
     : m_name(name)
     , m_inspectedStateAccessCheck(0)
 {
 }
 
 InjectedScriptBase::InjectedScriptBase(const String& name, ScriptValue injectedScriptObject, InspectedStateAccessCheck accessCheck)
@@ skipping 96 matching lines @@
         RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("exceptionDetails");
         if (objectExceptionDetails)
             *exceptionDetails = toExceptionDetails(objectExceptionDetails.release());
     }
     *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
     *wasThrown = wasThrownVal;
 }
 
 } // namespace blink