[DevTools] Changed checks in InspectorConsoleWindow::autogenerateMetadata

Source/core/inspector/InspectorConsoleMessage.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009, 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 27 matching lines @@
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptAsyncCallStack.h"
 #include "core/inspector/ScriptCallFrame.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
-InspectorConsoleMessage::InspectorConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message)
+InspectorConsoleMessage::InspectorConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
     , m_scriptState(0)
     , m_url()
     , m_line(0)
     , m_column(0)
     , m_requestId(IdentifiersFactory::requestId(0))
     , m_timestamp(WTF::currentTime())
 {
-    autogenerateMetadata(canGenerateCallStack);
+    autogenerateMetadata();
 }
 
-InspectorConsoleMessage::InspectorConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, ScriptState* scriptState, unsigned long requestIdentifier)
+InspectorConsoleMessage::InspectorConsoleMessage(bool shouldGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, ScriptState* scriptState, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
     , m_scriptState(scriptState)
     , m_url(url)
     , m_line(line)
     , m_column(column)
     , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
     , m_timestamp(WTF::currentTime())
 {
-    autogenerateMetadata(canGenerateCallStack, scriptState);
+    autogenerateMetadata(shouldGenerateCallStack);
 }
 
 InspectorConsoleMessage::InspectorConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
     , m_scriptState(0)
     , m_arguments(nullptr)
+    , m_callStack(callStack)
     , m_line(0)
     , m_column(0)
     , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
     , m_timestamp(WTF::currentTime())
 {
-    if (callStack && callStack->size()) {
-        const ScriptCallFrame& frame = callStack->at(0);
-        m_url = frame.sourceURL();
-        m_line = frame.lineNumber();
-        m_column = frame.columnNumber();
-    }
-    m_callStack = callStack;
+    autogenerateMetadata(false);
 }
 
-InspectorConsoleMessage::InspectorConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, ScriptState* scriptState, unsigned long requestIdentifier)
+InspectorConsoleMessage::InspectorConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, ScriptState* scriptState, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
     , m_scriptState(scriptState)
     , m_arguments(arguments)
     , m_url()
     , m_line(0)
     , m_column(0)
     , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
     , m_timestamp(WTF::currentTime())
 {
-    autogenerateMetadata(canGenerateCallStack, scriptState);
+    autogenerateMetadata();
 }
 
 InspectorConsoleMessage::~InspectorConsoleMessage()
 {
 }
 
-void InspectorConsoleMessage::autogenerateMetadata(bool canGenerateCallStack, ScriptState* scriptState)
+void InspectorConsoleMessage::autogenerateMetadata(bool shouldGenerateCallStack)
 {
     if (m_type == EndGroupMessageType)
         return;
 
-    if (scriptState)
-        m_callStack = createScriptCallStackForConsole();
-    else if (canGenerateCallStack)
-        m_callStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
-    else
-        return;
+    if (shouldGenerateCallStack)
+        m_callStack = createScriptCallStackForConsole(ScriptCallStack::maxCallStackSizeToCapture, true);
 
     if (m_callStack && m_callStack->size()) {
         const ScriptCallFrame& frame = m_callStack->at(0);
         m_url = frame.sourceURL();
         m_line = frame.lineNumber();
         m_column = frame.columnNumber();
         return;
     }
 
     m_callStack.clear();
@@ skipping 114 matching lines @@
 }
 
 unsigned InspectorConsoleMessage::argumentCount()
 {
     if (m_arguments)
         return m_arguments->argumentCount();
     return 0;
 }
 
 } // namespace blink