[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 14:38:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ec0d8ea4f3b2c13edfa1ca3c71438c829cefc18c
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 14 19:52:41 2010 +0000
2010-10-14 Yury Semikhatsky <yurys at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69799 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cde1b0b..3077014 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-14 Yury Semikhatsky <yurys at 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 at rim.com>
Reviewed by Gavin Barraclough.
diff --git a/WebCore/bindings/js/JSConsoleCustom.cpp b/WebCore/bindings/js/JSConsoleCustom.cpp
index 3ad34a3..f0419c7 100644
--- a/WebCore/bindings/js/JSConsoleCustom.cpp
+++ b/WebCore/bindings/js/JSConsoleCustom.cpp
@@ -29,7 +29,6 @@
#include "Console.h"
#include "JSScriptProfile.h"
-#include "ScriptCallStack.h"
#include "ScriptProfile.h"
#include <runtime/JSArray.h>
diff --git a/WebCore/bindings/js/ScriptCallFrame.cpp b/WebCore/bindings/js/ScriptCallFrame.cpp
index a3d98ac..2f74b96 100644
--- a/WebCore/bindings/js/ScriptCallFrame.cpp
+++ b/WebCore/bindings/js/ScriptCallFrame.cpp
@@ -31,7 +31,7 @@
#include "config.h"
#include "ScriptCallFrame.h"
-#include <interpreter/CallFrame.h>
+#include <runtime/ArgList.h>
#include <runtime/UString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/ScriptCallFrame.h b/WebCore/bindings/js/ScriptCallFrame.h
index 89fe2be..31aec7e 100644
--- a/WebCore/bindings/js/ScriptCallFrame.h
+++ b/WebCore/bindings/js/ScriptCallFrame.h
@@ -31,41 +31,37 @@
#ifndef ScriptCallFrame_h
#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
diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index 58ca8d3..67930cd 100644
--- a/WebCore/inspector/ConsoleMessage.cpp
+++ b/WebCore/inspector/ConsoleMessage.cpp
@@ -155,22 +155,20 @@ void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend* frontend)
}
#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)
size_t frameCount = msg->m_frames.size();
diff --git a/WebCore/inspector/ConsoleMessage.h b/WebCore/inspector/ConsoleMessage.h
index 4d8f0a2..6c3f2c7 100644
--- a/WebCore/inspector/ConsoleMessage.h
+++ b/WebCore/inspector/ConsoleMessage.h
@@ -55,7 +55,7 @@ public:
void updateRepeatCountInConsole(InspectorFrontend* frontend);
#endif
void incrementCount() { ++m_repeatCount; }
- bool isEqual(ScriptState*, ConsoleMessage* msg) const;
+ bool isEqual(ConsoleMessage* msg) const;
MessageSource source() const { return m_source; }
const String& message() const { return m_message; }
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 1652714..f637f4d 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -86,6 +86,7 @@
#include "ScriptProfile.h"
#include "ScriptProfiler.h"
#include "ScriptSourceCode.h"
+#include "ScriptState.h"
#include "SecurityOrigin.h"
#include "Settings.h"
#include "SharedBuffer.h"
@@ -360,7 +361,7 @@ void InspectorController::addMessageToConsole(MessageSource source, MessageType
return;
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));
}
void InspectorController::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
@@ -368,15 +369,15 @@ void InspectorController::addMessageToConsole(MessageSource source, MessageType
if (!enabled())
return;
- addConsoleMessage(0, new ConsoleMessage(source, type, level, message, lineNumber, sourceID, m_groupLevel));
+ addConsoleMessage(new ConsoleMessage(source, type, level, message, lineNumber, sourceID, m_groupLevel));
}
-void InspectorController::addConsoleMessage(ScriptState* scriptState, PassOwnPtr<ConsoleMessage> consoleMessage)
+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)
m_previousMessage->updateRepeatCountInConsole(m_frontend.get());
@@ -410,7 +411,7 @@ void InspectorController::startGroup(MessageSource source, ScriptCallStack* call
{
++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));
}
void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL)
@@ -420,7 +421,7 @@ void InspectorController::endGroup(MessageSource source, unsigned lineNumber, co
--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));
}
void InspectorController::markTimeline(const String& message)
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 327acad..af6b5cf 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -34,7 +34,6 @@
#include "Cookie.h"
#include "Page.h"
#include "PlatformString.h"
-#include "ScriptState.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/ListHashSet.h>
@@ -315,7 +314,7 @@ private:
void focusNode();
- void addConsoleMessage(ScriptState*, PassOwnPtr<ConsoleMessage>);
+ void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
void addResource(InspectorResource*);
void removeResource(InspectorResource*);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list