summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/renderer/render_thread.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 2e85097..56b1348 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -275,10 +275,12 @@ RenderThread* RenderThread::current() {
int32 RenderThread::RoutingIDForCurrentContext() {
int32 routing_id = MSG_ROUTING_CONTROL;
if (v8::Context::InContext()) {
- RenderView* view =
- RenderView::FromWebView(WebFrame::frameForCurrentContext()->view());
- if (view)
- routing_id = view->routing_id();
+ WebFrame* frame = WebFrame::frameForCurrentContext();
+ if (frame) {
+ RenderView* view = RenderView::FromWebView(frame->view());
+ if (view)
+ routing_id = view->routing_id();
+ }
} else {
DLOG(WARNING) << "Not called within a script context!";
}