diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/inspector/ScriptCallStack.cpp | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebCore/inspector/ScriptCallStack.cpp')
| -rw-r--r-- | WebCore/inspector/ScriptCallStack.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/inspector/ScriptCallStack.cpp b/WebCore/inspector/ScriptCallStack.cpp index 70229e5..31ec1c1 100644 --- a/WebCore/inspector/ScriptCallStack.cpp +++ b/WebCore/inspector/ScriptCallStack.cpp @@ -35,11 +35,6 @@ namespace WebCore { -PassRefPtr<ScriptCallStack> ScriptCallStack::create(Vector<ScriptCallFrame>& frames) -{ - return adoptRef(new ScriptCallStack(frames)); -} - ScriptCallStack::ScriptCallStack(Vector<ScriptCallFrame>& frames) { m_frames.swap(frames); @@ -49,13 +44,13 @@ ScriptCallStack::~ScriptCallStack() { } -const ScriptCallFrame &ScriptCallStack::at(size_t index) const +const ScriptCallFrame &ScriptCallStack::at(size_t index) { ASSERT(m_frames.size() > index); return m_frames[index]; } -size_t ScriptCallStack::size() const +size_t ScriptCallStack::size() { return m_frames.size(); } |