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

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

Issue 239563002: [CSS Shapes] Remove FIXME referencing closed bug (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 || !m_background->visuallyEqual(*other.m_background) 632 || !m_background->visuallyEqual(*other.m_background)
633 || rareInheritedData->userModify != other.rareInheritedData->userModify 633 || rareInheritedData->userModify != other.rareInheritedData->userModify
634 || rareInheritedData->userSelect != other.rareInheritedData->userSelect 634 || rareInheritedData->userSelect != other.rareInheritedData->userSelect
635 || rareNonInheritedData->userDrag != other.rareNonInheritedData->userDra g 635 || rareNonInheritedData->userDrag != other.rareNonInheritedData->userDra g
636 || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->m_bo rderFit 636 || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->m_bo rderFit
637 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->m_ob jectFit 637 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->m_ob jectFit
638 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedData- >m_objectPosition 638 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedData- >m_objectPosition
639 || rareInheritedData->m_imageRendering != other.rareInheritedData->m_ima geRendering) 639 || rareInheritedData->m_imageRendering != other.rareInheritedData->m_ima geRendering)
640 return StyleDifferenceRepaint; 640 return StyleDifferenceRepaint;
641 641
642 // FIXME: The current spec is being reworked to remove dependencies betw een exclusions and affected
643 // content. There's a proposal to use floats instead. In that case, wrap -shape should actually relayout
644 // the parent container. For sure, I will have to revisit this code, but for now I've added this in order
645 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu ally differ.
646 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991
647 if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData-> m_shapeOutside) 642 if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData-> m_shapeOutside)
648 return StyleDifferenceRepaint; 643 return StyleDifferenceRepaint;
649 644
650 if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_cl ipPath) 645 if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_cl ipPath)
651 return StyleDifferenceRepaint; 646 return StyleDifferenceRepaint;
652 647
653 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { 648 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
654 if (rareNonInheritedData->m_transformStyle3D != other.rareNonInheritedDa ta->m_transformStyle3D 649 if (rareNonInheritedData->m_transformStyle3D != other.rareNonInheritedDa ta->m_transformStyle3D
655 || rareNonInheritedData->m_backfaceVisibility != other.rareNonInheri tedData->m_backfaceVisibility 650 || rareNonInheritedData->m_backfaceVisibility != other.rareNonInheri tedData->m_backfaceVisibility
656 || rareNonInheritedData->m_perspective != other.rareNonInheritedData ->m_perspective 651 || rareNonInheritedData->m_perspective != other.rareNonInheritedData ->m_perspective
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 // right 1655 // right
1661 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1656 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1662 if (radiiSum > rect.height()) 1657 if (radiiSum > rect.height())
1663 factor = std::min(rect.height() / radiiSum, factor); 1658 factor = std::min(rect.height() / radiiSum, factor);
1664 1659
1665 ASSERT(factor <= 1); 1660 ASSERT(factor <= 1);
1666 return factor; 1661 return factor;
1667 } 1662 }
1668 1663
1669 } // namespace WebCore 1664 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698