X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=WebCore%2Finspector%2FConsoleMessage.cpp;h=cd17eb20246177126f04cc2fb884c4375066d980;hp=9f394e63c1e879bee38b58e26ddbc3b5043b4bdf;hb=7949bc1dd2768fd48f51112864c59c7c6929b8cb;hpb=947ae233ded1f632d41c043ca331e83b25d06bd7 diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp index 9f394e63..cd17eb2 100644 --- a/WebCore/inspector/ConsoleMessage.cpp +++ b/WebCore/inspector/ConsoleMessage.cpp @@ -106,30 +106,33 @@ void ConsoleMessage::addToConsole(ScriptState* scriptState, const ScriptObject& bool ConsoleMessage::isEqual(ScriptState* state, ConsoleMessage* msg) const { - if (msg->m_wrappedArguments.size() != m_wrappedArguments.size() || - (!state && msg->m_wrappedArguments.size())) + if (msg->m_wrappedArguments.size() != m_wrappedArguments.size()) + return false; + if (!state && msg->m_wrappedArguments.size())) return false; - ASSERT_ARG(state, state); + ASSERT_ARG(state, state || msg->m_wrappedArguments.isEmpty()); - for (size_t i = 0; i < msg->m_wrappedArguments.size(); ++i) + for (size_t i = 0; i < msg->m_wrappedArguments.size(); ++i) { if (!m_wrappedArguments[i].isEqual(state, msg->m_wrappedArguments[i])) return false; + } size_t frameCount = msg->m_frames.size(); if (frameCount != m_frames.size()) return false; - for (size_t i = 0; i < frameCount; ++i) + for (size_t i = 0; i < frameCount; ++i) { if (m_frames[i] != msg->m_frames[i]) return false; + } return msg->m_source == m_source - && msg->m_level == m_level - && msg->m_message == m_message - && msg->m_line == m_line - && msg->m_url == m_url - && msg->m_groupLevel == m_groupLevel; + && msg->m_level == m_level + && msg->m_message == m_message + && msg->m_line == m_line + && msg->m_url == m_url + && msg->m_groupLevel == m_groupLevel; } } // namespace WebCore