Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1003)

Side by Side Diff: Source/core/rendering/RenderImage.cpp

Issue 22839023: Add support for the object-position CSS property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 return false; 509 return false;
510 if (!contentBoxRect().contains(localRect)) 510 if (!contentBoxRect().contains(localRect))
511 return false; 511 return false;
512 EFillBox backgroundClip = style()->backgroundClip(); 512 EFillBox backgroundClip = style()->backgroundClip();
513 // Background paints under borders. 513 // Background paints under borders.
514 if (backgroundClip == BorderFillBox && style()->hasBorder() && !borderObscur esBackground()) 514 if (backgroundClip == BorderFillBox && style()->hasBorder() && !borderObscur esBackground())
515 return false; 515 return false;
516 // Background shows in padding area. 516 // Background shows in padding area.
517 if ((backgroundClip == BorderFillBox || backgroundClip == PaddingFillBox) && style()->hasPadding()) 517 if ((backgroundClip == BorderFillBox || backgroundClip == PaddingFillBox) && style()->hasPadding())
518 return false; 518 return false;
519 // Object-position may leave parts of the content box empty, regardless of t he value of object-fit.
520 if (style()->objectPosition() != RenderStyle::initialObjectPosition())
521 return false;
519 // Object-fit may leave parts of the content box empty. 522 // Object-fit may leave parts of the content box empty.
520 ObjectFit objectFit = style()->objectFit(); 523 ObjectFit objectFit = style()->objectFit();
521 if (objectFit != ObjectFitFill && objectFit != ObjectFitCover) 524 if (objectFit != ObjectFitFill && objectFit != ObjectFitCover)
522 return false; 525 return false;
523 // Check for image with alpha. 526 // Check for image with alpha.
524 return m_imageResource->cachedImage() && m_imageResource->cachedImage()->cur rentFrameKnownToBeOpaque(this); 527 return m_imageResource->cachedImage() && m_imageResource->cachedImage()->cur rentFrameKnownToBeOpaque(this);
525 } 528 }
526 529
527 bool RenderImage::computeBackgroundIsKnownToBeObscured() 530 bool RenderImage::computeBackgroundIsKnownToBeObscured()
528 { 531 {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 return 0; 620 return 0;
618 621
619 ImageResource* cachedImage = m_imageResource->cachedImage(); 622 ImageResource* cachedImage = m_imageResource->cachedImage();
620 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) 623 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))
621 return static_cast<SVGImage*>(cachedImage->image())->embeddedContentBox( ); 624 return static_cast<SVGImage*>(cachedImage->image())->embeddedContentBox( );
622 625
623 return 0; 626 return 0;
624 } 627 }
625 628
626 } // namespace WebCore 629 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698