diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/css/StyleMedia.cpp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/css/StyleMedia.cpp')
| -rw-r--r-- | WebCore/css/StyleMedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/css/StyleMedia.cpp b/WebCore/css/StyleMedia.cpp index 6cb662f..8971d35 100644 --- a/WebCore/css/StyleMedia.cpp +++ b/WebCore/css/StyleMedia.cpp @@ -56,7 +56,8 @@ bool StyleMedia::matchMedium(const String& query) const Document* document = m_frame->document(); ASSERT(document); Element* documentElement = document->documentElement(); - ASSERT(documentElement); + if (!documentElement) + return false; CSSStyleSelector* styleSelector = document->styleSelector(); if (!styleSelector) |