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

Side by Side Diff: Source/core/rendering/style/RenderStyle.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 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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 if (inherited_flags._visibility != other->inherited_flags._visibility 605 if (inherited_flags._visibility != other->inherited_flags._visibility
606 || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printC olorAdjust 606 || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printC olorAdjust
607 || inherited_flags._insideLink != other->inherited_flags._insideLink 607 || inherited_flags._insideLink != other->inherited_flags._insideLink
608 || surround->border != other->surround->border 608 || surround->border != other->surround->border
609 || *m_background.get() != *other->m_background.get() 609 || *m_background.get() != *other->m_background.get()
610 || rareInheritedData->userModify != other->rareInheritedData->userModify 610 || rareInheritedData->userModify != other->rareInheritedData->userModify
611 || rareInheritedData->userSelect != other->rareInheritedData->userSelect 611 || rareInheritedData->userSelect != other->rareInheritedData->userSelect
612 || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDr ag 612 || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDr ag
613 || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_b orderFit 613 || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_b orderFit
614 || rareNonInheritedData->m_objectFit != other->rareNonInheritedData->m_o bjectFit 614 || rareNonInheritedData->m_objectFit != other->rareNonInheritedData->m_o bjectFit
615 || rareNonInheritedData->m_objectPosition != other->rareNonInheritedData ->m_objectPosition
615 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_im ageRendering) 616 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_im ageRendering)
616 return StyleDifferenceRepaint; 617 return StyleDifferenceRepaint;
617 618
618 // FIXME: The current spec is being reworked to remove dependencies betw een exclusions and affected 619 // FIXME: The current spec is being reworked to remove dependencies betw een exclusions and affected
619 // content. There's a proposal to use floats instead. In that case, wrap -shape should actually relayout 620 // content. There's a proposal to use floats instead. In that case, wrap -shape should actually relayout
620 // the parent container. For sure, I will have to revisit this code, but for now I've added this in order 621 // the parent container. For sure, I will have to revisit this code, but for now I've added this in order
621 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu ally differ. 622 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu ally differ.
622 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991 623 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991
623 if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData- >m_shapeOutside) 624 if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData- >m_shapeOutside)
624 return StyleDifferenceRepaint; 625 return StyleDifferenceRepaint;
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 surround.access()->border.m_image.setOutset(outset); 1565 surround.access()->border.m_image.setOutset(outset);
1565 } 1566 }
1566 1567
1567 ShapeValue* RenderStyle::initialShapeInside() 1568 ShapeValue* RenderStyle::initialShapeInside()
1568 { 1569 {
1569 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu tsideValue())); 1570 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu tsideValue()));
1570 return sOutsideValue.get(); 1571 return sOutsideValue.get();
1571 } 1572 }
1572 1573
1573 } // namespace WebCore 1574 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698