diff options
| author | fs <fs@opera.com> | 2015-12-14 13:19:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-14 21:21:02 +0000 |
| commit | 720cb8c490ebe7c6a8486c564e1c130339859ebd (patch) | |
| tree | 8dfbec0bcf9f0ea469caf2182eb4b556ba86181f | |
| parent | cb1a439304d9465d67a4c232c5e3a17c6ab7fc0c (diff) | |
| download | chromium_src-720cb8c490ebe7c6a8486c564e1c130339859ebd.zip chromium_src-720cb8c490ebe7c6a8486c564e1c130339859ebd.tar.gz chromium_src-720cb8c490ebe7c6a8486c564e1c130339859ebd.tar.bz2 | |
Fix ImageResource null-check in LayoutImage::foregroundIsKnownToBeOpaqueInRect
Make sure m_imageResource->cachedImage() is non-null before
dereferencing even for the use in the context of the TRACE_EVENT.
BUG=569624
Review URL: https://codereview.chromium.org/1527453003
Cr-Commit-Position: refs/heads/master@{#365097}
| -rw-r--r-- | third_party/WebKit/Source/core/layout/LayoutImage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/core/layout/LayoutImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImage.cpp index 87eedf8..0c85625 100644 --- a/third_party/WebKit/Source/core/layout/LayoutImage.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutImage.cpp @@ -244,9 +244,11 @@ bool LayoutImage::foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, ObjectFit objectFit = style()->objectFit(); if (objectFit != ObjectFitFill && objectFit != ObjectFitCover) return false; + if (!m_imageResource->cachedImage()) + return false; // Check for image with alpha. TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data", InspectorPaintImageEvent::data(this, *m_imageResource->cachedImage())); - return m_imageResource->cachedImage() && m_imageResource->cachedImage()->image()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata); + return m_imageResource->cachedImage()->image()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata); } bool LayoutImage::computeBackgroundIsKnownToBeObscured() const |