| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 8 * Copyright (C) 2010 Google Inc. All rights reserved. | 8 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. | 9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. |
| 10 * | 10 * |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 if (style()->objectPosition() != ComputedStyle::initialObjectPosition()) | 240 if (style()->objectPosition() != ComputedStyle::initialObjectPosition()) |
| 241 return false; | 241 return false; |
| 242 // Object-fit may leave parts of the content box empty. | 242 // Object-fit may leave parts of the content box empty. |
| 243 ObjectFit objectFit = style()->getObjectFit(); | 243 ObjectFit objectFit = style()->getObjectFit(); |
| 244 if (objectFit != ObjectFitFill && objectFit != ObjectFitCover) | 244 if (objectFit != ObjectFitFill && objectFit != ObjectFitCover) |
| 245 return false; | 245 return false; |
| 246 if (!m_imageResource->cachedImage()) | 246 if (!m_imageResource->cachedImage()) |
| 247 return false; | 247 return false; |
| 248 // Check for image with alpha. | 248 // Check for image with alpha. |
| 249 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "
data", InspectorPaintImageEvent::data(this, *m_imageResource->cachedImage())); | 249 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "
data", InspectorPaintImageEvent::data(this, *m_imageResource->cachedImage())); |
| 250 return m_imageResource->cachedImage()->image()->currentFrameKnownToBeOpaque(
Image::PreCacheMetadata); | 250 return m_imageResource->cachedImage()->getImage()->currentFrameKnownToBeOpaq
ue(Image::PreCacheMetadata); |
| 251 } | 251 } |
| 252 | 252 |
| 253 bool LayoutImage::computeBackgroundIsKnownToBeObscured() const | 253 bool LayoutImage::computeBackgroundIsKnownToBeObscured() const |
| 254 { | 254 { |
| 255 if (!hasBackground()) | 255 if (!hasBackground()) |
| 256 return false; | 256 return false; |
| 257 | 257 |
| 258 LayoutRect paintedExtent; | 258 LayoutRect paintedExtent; |
| 259 if (!getBackgroundPaintedExtent(paintedExtent)) | 259 if (!getBackgroundPaintedExtent(paintedExtent)) |
| 260 return false; | 260 return false; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 return true; | 311 return true; |
| 312 return embeddedContentBox(); | 312 return embeddedContentBox(); |
| 313 } | 313 } |
| 314 | 314 |
| 315 LayoutBox* LayoutImage::embeddedContentBox() const | 315 LayoutBox* LayoutImage::embeddedContentBox() const |
| 316 { | 316 { |
| 317 if (!m_imageResource) | 317 if (!m_imageResource) |
| 318 return nullptr; | 318 return nullptr; |
| 319 | 319 |
| 320 ImageResource* cachedImage = m_imageResource->cachedImage(); | 320 ImageResource* cachedImage = m_imageResource->cachedImage(); |
| 321 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) | 321 if (cachedImage && cachedImage->getImage() && cachedImage->getImage()->isSVG
Image()) |
| 322 return toSVGImage(cachedImage->image())->embeddedContentBox(); | 322 return toSVGImage(cachedImage->getImage())->embeddedContentBox(); |
| 323 | 323 |
| 324 return nullptr; | 324 return nullptr; |
| 325 } | 325 } |
| 326 | 326 |
| 327 } // namespace blink | 327 } // namespace blink |
| OLD | NEW |