Changeset 69799 in webkit

Timestamp:

Oct 14, 2010 12:52:41 PM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-10-14 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: encapsulate ScriptState into ConsoleMessage instead of passing it as additional parameter
​https://bugs.webkit.org/show_bug.cgi?id=47675

No new tests. This refactoring is covered by existing inspector tests.

• bindings/js/JSConsoleCustom.cpp:
• bindings/js/ScriptCallFrame.cpp:
• bindings/js/ScriptCallFrame.h: (WebCore::ScriptCallFrame::functionName): (WebCore::ScriptCallFrame::sourceURL): (WebCore::ScriptCallFrame::lineNumber): (WebCore::ScriptCallFrame::argumentCount):
• inspector/ConsoleMessage.cpp: (WebCore::ConsoleMessage::isEqual):
• inspector/ConsoleMessage.h:
• inspector/InspectorController.cpp: (WebCore::InspectorController::addMessageToConsole): (WebCore::InspectorController::addConsoleMessage): (WebCore::InspectorController::startGroup): (WebCore::InspectorController::endGroup):
• inspector/InspectorController.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSConsoleCustom.cpp (modified) (1 diff)
• bindings/js/ScriptCallFrame.cpp (modified) (1 diff)
• bindings/js/ScriptCallFrame.h (modified) (1 diff)
• inspector/ConsoleMessage.cpp (modified) (1 diff)
• inspector/ConsoleMessage.h (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (5 diffs)
• inspector/InspectorController.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-14  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: encapsulate ScriptState into ConsoleMessage instead of passing it as additional parameter
+        https://bugs.webkit.org/show_bug.cgi?id=47675
+
+        No new tests. This refactoring is covered by existing inspector tests.
+
+        * bindings/js/JSConsoleCustom.cpp:
+        * bindings/js/ScriptCallFrame.cpp:
+        * bindings/js/ScriptCallFrame.h:
+        (WebCore::ScriptCallFrame::functionName):
+        (WebCore::ScriptCallFrame::sourceURL):
+        (WebCore::ScriptCallFrame::lineNumber):
+        (WebCore::ScriptCallFrame::argumentCount):
+        * inspector/ConsoleMessage.cpp:
+        (WebCore::ConsoleMessage::isEqual):
+        * inspector/ConsoleMessage.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::addMessageToConsole):
+        (WebCore::InspectorController::addConsoleMessage):
+        (WebCore::InspectorController::startGroup):
+        (WebCore::InspectorController::endGroup):
+        * inspector/InspectorController.h:
+
 2010-10-14  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/bindings/js/JSConsoleCustom.cpp

@@ -30 +30 @@
 #include "Console.h"
 #include "JSScriptProfile.h"
-#include "ScriptCallStack.h"
 #include "ScriptProfile.h"
 #include <runtime/JSArray.h>

trunk/WebCore/bindings/js/ScriptCallFrame.cpp

@@ -32 +32 @@
 #include "ScriptCallFrame.h"
 
-#include <interpreter/CallFrame.h>
+#include <runtime/ArgList.h>
 #include <runtime/UString.h>
 

trunk/WebCore/bindings/js/ScriptCallFrame.h

@@ -32 +32 @@
 #define ScriptCallFrame_h
 
-#include <runtime/ArgList.h>
+#include "PlatformString.h"
 #include "ScriptValue.h"
 #include <wtf/Vector.h>
 
 namespace JSC {
-    class ExecState;
-    class InternalFunction;
+class ExecState;
+class UString;
 }
 
 namespace WebCore {
 
-    // FIXME: Implement retrieving line number and source URL and storing here
-    // for all call frames, not just the first one.
-    // See <https://bugs.webkit.org/show_bug.cgi?id=22556> and
-    // <https://bugs.webkit.org/show_bug.cgi?id=21180>
-    class ScriptCallFrame  {
-    public:
-        ScriptCallFrame(const JSC::UString& functionName, const JSC::UString& urlString, int lineNumber, JSC::ExecState*, unsigned skipArgumentCount);
-        ~ScriptCallFrame();
+class ScriptCallFrame  {
+public:
+    ScriptCallFrame(const JSC::UString& functionName, const JSC::UString& urlString, int lineNumber, JSC::ExecState*, unsigned skipArgumentCount);
+    ~ScriptCallFrame();
 
-        const String& functionName() const { return m_functionName; }
-        const String& sourceURL() const { return m_sourceURL; }
-        unsigned lineNumber() const { return m_lineNumber; }
+    const String& functionName() const { return m_functionName; }
+    const String& sourceURL() const { return m_sourceURL; }
+    unsigned lineNumber() const { return m_lineNumber; }
 
-        // argument retrieval methods
-        const ScriptValue& argumentAt(unsigned) const;
-        unsigned argumentCount() const { return m_arguments.size(); }
+    // argument retrieval methods
+    const ScriptValue& argumentAt(unsigned) const;
+    unsigned argumentCount() const { return m_arguments.size(); }
 
-    private:
-        String m_functionName;
-        String m_sourceURL;
-        unsigned m_lineNumber;
+private:
+    String m_functionName;
+    String m_sourceURL;
+    unsigned m_lineNumber;
 
-        Vector<ScriptValue> m_arguments;
-    };
+    Vector<ScriptValue> m_arguments;
+};
 
 } // namespace WebCore

trunk/WebCore/inspector/ConsoleMessage.cpp

@@ -156 +156 @@
 #endif // ENABLE(INSPECTOR)
 
-bool ConsoleMessage::isEqual(ScriptState* state, ConsoleMessage* msg) const
+bool ConsoleMessage::isEqual(ConsoleMessage* msg) const
 {
 #if ENABLE(INSPECTOR)
     if (msg->m_arguments.size() != m_arguments.size())
         return false;
-    if (!state && msg->m_arguments.size())
+    if (!msg->m_scriptState.get() && msg->m_arguments.size()) {
+        ASSERT_NOT_REACHED();
         return false;
+    }
 
-    ASSERT_ARG(state, state || msg->m_arguments.isEmpty());
-
-    for (size_t i = 0; i < msg->m_arguments.size(); ++i) {
-        if (!m_arguments[i].isEqual(state, msg->m_arguments[i]))
+    for (size_t i = 0; i < m_arguments.size(); ++i) {
+        if (!m_arguments[i].isEqual(msg->m_scriptState.get(), msg->m_arguments[i]))
             return false;
     }
-#else
-    UNUSED_PARAM(state);
 #endif // ENABLE(INSPECTOR)
 

trunk/WebCore/inspector/ConsoleMessage.h

@@ -56 +56 @@
 #endif
     void incrementCount() { ++m_repeatCount; }
-    bool isEqual(ScriptState*, ConsoleMessage* msg) const;
+    bool isEqual(ConsoleMessage* msg) const;
 
     MessageSource source() const { return m_source; }

trunk/WebCore/inspector/InspectorController.cpp

@@ -87 +87 @@
 #include "ScriptProfiler.h"
 #include "ScriptSourceCode.h"
+#include "ScriptState.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
@@ -361 +362 @@
 
     bool storeStackTrace = type == TraceMessageType || type == UncaughtExceptionMessageType || type == AssertMessageType;
-    addConsoleMessage(callStack->state(), new ConsoleMessage(source, type, level, message, callStack, m_groupLevel, storeStackTrace));
+    addConsoleMessage(new ConsoleMessage(source, type, level, message, callStack, m_groupLevel, storeStackTrace));
 }
 
@@ -369 +370 @@
         return;
 
-    addConsoleMessage(0, new ConsoleMessage(source, type, level, message, lineNumber, sourceID, m_groupLevel));
-}
-
-void InspectorController::addConsoleMessage(ScriptState* scriptState, PassOwnPtr<ConsoleMessage> consoleMessage)
+    addConsoleMessage(new ConsoleMessage(source, type, level, message, lineNumber, sourceID, m_groupLevel));
+}
+
+void InspectorController::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
 {
     ASSERT(enabled());
     ASSERT_ARG(consoleMessage, consoleMessage);
 
-    if (m_previousMessage && m_previousMessage->isEqual(scriptState, consoleMessage.get())) {
+    if (m_previousMessage && m_previousMessage->isEqual(consoleMessage.get())) {
         m_previousMessage->incrementCount();
         if (m_frontend)
@@ -411 +412 @@
     ++m_groupLevel;
 
-    addConsoleMessage(callStack->state(), new ConsoleMessage(source, collapsed ? StartGroupCollapsedMessageType : StartGroupMessageType, LogMessageLevel, String(), callStack, m_groupLevel));
+    addConsoleMessage(new ConsoleMessage(source, collapsed ? StartGroupCollapsedMessageType : StartGroupMessageType, LogMessageLevel, String(), callStack, m_groupLevel));
 }
 
@@ -421 +422 @@
     --m_groupLevel;
 
-    addConsoleMessage(0, new ConsoleMessage(source, EndGroupMessageType, LogMessageLevel, String(), lineNumber, sourceURL, m_groupLevel));
+    addConsoleMessage(new ConsoleMessage(source, EndGroupMessageType, LogMessageLevel, String(), lineNumber, sourceURL, m_groupLevel));
 }
 

trunk/WebCore/inspector/InspectorController.h

@@ -35 +35 @@
 #include "Page.h"
 #include "PlatformString.h"
-#include "ScriptState.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -316 +315 @@
     void focusNode();
 
-    void addConsoleMessage(ScriptState*, PassOwnPtr<ConsoleMessage>);
+    void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
 
     void addResource(InspectorResource*);