/*
* Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#define ConsoleMessage_h
#include "Console.h"
-#include "KURL.h"
#include "ScriptState.h"
+#include <wtf/Forward.h>
#include <wtf/Vector.h>
namespace WebCore {
class InjectedScriptHost;
class InspectorFrontend;
class InspectorObject;
+class ScriptArguments;
class ScriptCallFrame;
class ScriptCallStack;
class ScriptValue;
class ConsoleMessage : public Noncopyable {
public:
ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, unsigned li, const String& u, unsigned g);
- ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, ScriptCallStack*, unsigned g, bool storeTrace = false);
+ ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>, unsigned g);
-#if ENABLE(INSPECTOR)
void addToFrontend(InspectorFrontend*, InjectedScriptHost*);
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; }
private:
- class CallFrame {
- public:
- explicit CallFrame(const ScriptCallFrame& frame);
- CallFrame();
- bool isEqual(const CallFrame& o) const;
-#if ENABLE(INSPECTOR)
- PassRefPtr<InspectorObject> buildInspectorObject() const;
-#endif
-
- private:
- String m_functionName;
- KURL m_sourceURL;
- unsigned m_lineNumber;
- };
-
MessageSource m_source;
MessageType m_type;
MessageLevel m_level;
String m_message;
-#if ENABLE(INSPECTOR)
- Vector<ScriptValue> m_arguments;
- ScriptStateProtectedPtr m_scriptState;
-#endif
- Vector<CallFrame> m_frames;
+ OwnPtr<ScriptArguments> m_arguments;
+ OwnPtr<ScriptCallStack> m_callStack;
unsigned m_line;
String m_url;
unsigned m_groupLevel;