diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/css/CSSGradientValue.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/css/CSSGradientValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSGradientValue.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSGradientValue.cpp b/Source/WebCore/css/CSSGradientValue.cpp index 8040c6c..fde4a4e 100644 --- a/Source/WebCore/css/CSSGradientValue.cpp +++ b/Source/WebCore/css/CSSGradientValue.cpp @@ -43,7 +43,8 @@ namespace WebCore { Image* CSSGradientValue::image(RenderObject* renderer, const IntSize& size) { - ASSERT(m_clients.contains(renderer)); + if (!m_clients.contains(renderer)) + return 0; // Need to look up our size. Create a string of width*height to use as a hash key. // FIXME: hashing based only on size is not sufficient. Color stops may use context-sensitive units (like em) |