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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 22482004: Add support for the object-fit CSS property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Oops, sorry! Forgot to update UseCounter.cpp Created 7 years, 4 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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 606
607 if (inherited_flags._visibility != other->inherited_flags._visibility 607 if (inherited_flags._visibility != other->inherited_flags._visibility
608 || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printC olorAdjust 608 || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printC olorAdjust
609 || inherited_flags._insideLink != other->inherited_flags._insideLink 609 || inherited_flags._insideLink != other->inherited_flags._insideLink
610 || surround->border != other->surround->border 610 || surround->border != other->surround->border
611 || *m_background.get() != *other->m_background.get() 611 || *m_background.get() != *other->m_background.get()
612 || rareInheritedData->userModify != other->rareInheritedData->userModify 612 || rareInheritedData->userModify != other->rareInheritedData->userModify
613 || rareInheritedData->userSelect != other->rareInheritedData->userSelect 613 || rareInheritedData->userSelect != other->rareInheritedData->userSelect
614 || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDr ag 614 || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDr ag
615 || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_b orderFit 615 || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_b orderFit
616 || rareNonInheritedData->m_objectFit != other->rareNonInheritedData->m_o bjectFit
616 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_im ageRendering) 617 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_im ageRendering)
617 return StyleDifferenceRepaint; 618 return StyleDifferenceRepaint;
618 619
619 // FIXME: The current spec is being reworked to remove dependencies betw een exclusions and affected 620 // FIXME: The current spec is being reworked to remove dependencies betw een exclusions and affected
620 // content. There's a proposal to use floats instead. In that case, wrap -shape should actually relayout 621 // content. There's a proposal to use floats instead. In that case, wrap -shape should actually relayout
621 // the parent container. For sure, I will have to revisit this code, but for now I've added this in order 622 // the parent container. For sure, I will have to revisit this code, but for now I've added this in order
622 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu ally differ. 623 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu ally differ.
623 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991 624 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991
624 if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData- >m_shapeOutside) 625 if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData- >m_shapeOutside)
625 return StyleDifferenceRepaint; 626 return StyleDifferenceRepaint;
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 surround.access()->border.m_image.setOutset(outset); 1566 surround.access()->border.m_image.setOutset(outset);
1566 } 1567 }
1567 1568
1568 ShapeValue* RenderStyle::initialShapeInside() 1569 ShapeValue* RenderStyle::initialShapeInside()
1569 { 1570 {
1570 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu tsideValue())); 1571 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu tsideValue()));
1571 return sOutsideValue.get(); 1572 return sOutsideValue.get();
1572 } 1573 }
1573 1574
1574 } // namespace WebCore 1575 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698