2009-03-17 Darin Adler <darin@apple.com>

        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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ab4f26..9ca75d6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-17  Darin Adler  <darin@apple.com>
+
+        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  <ap@webkit.org>
 
         Reviewed by Darin Adler.
 2009-03-17  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin Adler.

diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index 9f394e6..cd17eb2 100644 (file)
--- 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
 {
 
 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;
 
         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;
         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;
 
 
     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;
         if (m_frames[i] != msg->m_frames[i])
             return false;

+    }

 
     return msg->m_source == m_source
 
     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
 }
 
 } // namespace WebCore