[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
pfeldman at chromium.org
pfeldman at chromium.org
Thu Feb 4 21:28:03 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 47fecbb373ebab4ea3526419ca01eb55a4f6e099
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 26 14:02:18 2010 +0000
2010-01-26 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: added null check into the timeline agent getter.
* inspector/InspectorTimelineAgent.h:
(WebCore::InspectorTimelineAgent::retrieve):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 447d4e5..409ae5e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-26 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed: added null check into the timeline agent getter.
+
+ * inspector/InspectorTimelineAgent.h:
+ (WebCore::InspectorTimelineAgent::retrieve):
+
2010-01-26 Steve Block <steveblock at google.com>
Reviewed by Adam Barth.
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index a88bad3..fd86ba7 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -133,7 +133,7 @@ namespace WebCore {
inline InspectorTimelineAgent* InspectorTimelineAgent::retrieve(ScriptExecutionContext* context)
{
- if (context->isDocument())
+ if (context && context->isDocument())
return static_cast<Document*>(context)->inspectorTimelineAgent();
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list