diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/inspector/ScriptCallFrame.h | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/inspector/ScriptCallFrame.h')
| -rw-r--r-- | WebCore/inspector/ScriptCallFrame.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebCore/inspector/ScriptCallFrame.h b/WebCore/inspector/ScriptCallFrame.h index 60d77e1..2c025dc 100644 --- a/WebCore/inspector/ScriptCallFrame.h +++ b/WebCore/inspector/ScriptCallFrame.h @@ -32,7 +32,7 @@ #define ScriptCallFrame_h #include "PlatformString.h" -#include <wtf/PassRefPtr.h> +#include <wtf/Forward.h> namespace WebCore { @@ -40,11 +40,11 @@ class InspectorObject; class ScriptCallFrame { public: - ScriptCallFrame(const String& functionName, const String& urlString, unsigned lineNumber); + ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column = 0); ~ScriptCallFrame(); const String& functionName() const { return m_functionName; } - const String& sourceURL() const { return m_sourceURL; } + const String& sourceURL() const { return m_scriptName; } unsigned lineNumber() const { return m_lineNumber; } bool isEqual(const ScriptCallFrame&) const; @@ -52,8 +52,9 @@ public: private: String m_functionName; - String m_sourceURL; + String m_scriptName; unsigned m_lineNumber; + unsigned m_column; }; } // namespace WebCore |