Index: Source/core/css/MediaValuesCached.cpp |
diff --git a/Source/core/css/MediaValuesCached.cpp b/Source/core/css/MediaValuesCached.cpp |
index 60caa50af3008dcbc1deaafa788260fc6fd613c3..01e674230f2ae035c323c2fff9a9ff0f40efdfb1 100644 |
--- a/Source/core/css/MediaValuesCached.cpp |
+++ b/Source/core/css/MediaValuesCached.cpp |
@@ -34,7 +34,8 @@ PassRefPtr<MediaValues> MediaValuesCached::create(LocalFrame* frame) |
{ |
// FIXME - Added an assert here so we can better understand when a frame is present without its view(). |
ASSERT(!frame || frame->view()); |
- if (!frame || !frame->view()) |
+ // FIXME - Because of crbug.com/371084, document()->renderView() may be null here. |
+ if (!frame || !frame->view() || !frame->document() || !frame->document()->renderView()) |
return adoptRef(new MediaValuesCached()); |
return adoptRef(new MediaValuesCached(frame)); |
} |