diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-11-19 09:58:03 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-11-19 09:58:03 +0100 |
commit | 879e2ea7d15510ec5f94d6d7a005b157b115f69f (patch) | |
tree | 73aedd0bffe7ab39387229a9417aa50cecbbf0aa /src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h | |
parent | 8fc2eec5b3282665f76f1e0313a03608bf4e7bc1 (diff) | |
parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) |
Merge remote branch 'origin/4.6' into lighthouse
Conflicts:
configure
src/plugins/graphicssystems/graphicssystems.pro
Diffstat (limited to 'src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h index e86b0ebd34..47cdac2452 100644 --- a/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.h @@ -44,7 +44,12 @@ namespace WebCore { return adoptRef(new JavaScriptCallFrame(debuggerCallFrame, caller, sourceID, line)); } - void invalidate() { m_isValid = false; } + void invalidate() + { + m_isValid = false; + m_debuggerCallFrame = 0; + } + bool isValid() const { return m_isValid; } JavaScriptCallFrame* caller(); @@ -56,6 +61,7 @@ namespace WebCore { m_debuggerCallFrame = debuggerCallFrame; m_line = line; m_sourceID = sourceID; + m_isValid = true; } String functionName() const; |