From 7949bc1dd2768fd48f51112864c59c7c6929b8cb Mon Sep 17 00:00:00 2001 From: "darin@apple.com" Date: Tue, 17 Mar 2009 18:16:33 +0000 Subject: [PATCH] 2009-03-17 Darin Adler Fix crash seen right away when running run-webkit-tests. * inspector/ConsoleMessage.cpp: (WebCore::ConsoleMessage::isEqual): Restore assertion to its behavior pre-refactoring. Also tweaked formatting a bit. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41775 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 8 ++++++++ WebCore/inspector/ConsoleMessage.cpp | 23 +++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 6ab4f26..9ca75d6 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2009-03-17 Darin Adler + + Fix crash seen right away when running run-webkit-tests. + + * inspector/ConsoleMessage.cpp: + (WebCore::ConsoleMessage::isEqual): Restore assertion to its behavior pre-refactoring. + Also tweaked formatting a bit. + 2009-03-17 Alexey Proskuryakov Reviewed by Darin Adler. 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 -- 1.8.3.1