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

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

Issue 538613003: Don't always full invalidate on change of align-content, align-items and align-self. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update test expectations Created 6 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
« no previous file with comments | « LayoutTests/fast/repaint/align-self-change-no-flex-expected.txt ('k') | 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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { 434 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
435 if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_ appearance 435 if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_ appearance
436 || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheri tedData->marginBeforeCollapse 436 || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheri tedData->marginBeforeCollapse
437 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit edData->marginAfterCollapse 437 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit edData->marginAfterCollapse
438 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li neClamp 438 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li neClamp
439 || rareNonInheritedData->textOverflow != other.rareNonInheritedData- >textOverflow 439 || rareNonInheritedData->textOverflow != other.rareNonInheritedData- >textOverflow
440 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m _wrapFlow 440 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m _wrapFlow
441 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData ->m_wrapThrough 441 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData ->m_wrapThrough
442 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData ->m_shapeMargin 442 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData ->m_shapeMargin
443 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or der 443 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or der
444 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat a->m_alignContent
445 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData- >m_alignItems
446 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData-> m_alignSelf
447 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD ata->m_justifyContent 444 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD ata->m_justifyContent
448 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData- >m_grid.get() 445 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData- >m_grid.get()
449 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD ata->m_gridItem.get() 446 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD ata->m_gridItem.get()
450 || rareNonInheritedData->m_textCombine != other.rareNonInheritedData ->m_textCombine 447 || rareNonInheritedData->m_textCombine != other.rareNonInheritedData ->m_textCombine
451 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData- >hasFilters()) 448 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData- >hasFilters())
452 return true; 449 return true;
453 450
454 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNon InheritedData->m_deprecatedFlexibleBox.get() 451 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNon InheritedData->m_deprecatedFlexibleBox.get()
455 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.ra reNonInheritedData->m_deprecatedFlexibleBox.get()) 452 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.ra reNonInheritedData->m_deprecatedFlexibleBox.get())
456 return true; 453 return true;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 return true; 608 return true;
612 609
613 if (surround.get() != other.surround.get()) { 610 if (surround.get() != other.surround.get()) {
614 if (surround->margin != other.surround->margin) 611 if (surround->margin != other.surround->margin)
615 return true; 612 return true;
616 613
617 if (surround->padding != other.surround->padding) 614 if (surround->padding != other.surround->padding)
618 return true; 615 return true;
619 } 616 }
620 617
618 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
619 if (rareNonInheritedData->m_alignContent != other.rareNonInheritedData-> m_alignContent
620 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData- >m_alignItems
621 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData-> m_alignSelf)
622 return true;
623 }
624
621 return false; 625 return false;
622 } 626 }
623 627
624 bool RenderStyle::diffNeedsPaintInvalidationLayer(const RenderStyle& other) cons t 628 bool RenderStyle::diffNeedsPaintInvalidationLayer(const RenderStyle& other) cons t
625 { 629 {
626 if (position() != StaticPosition && (visual->clip != other.visual->clip || v isual->hasAutoClip != other.visual->hasAutoClip)) 630 if (position() != StaticPosition && (visual->clip != other.visual->clip || v isual->hasAutoClip != other.visual->hasAutoClip))
627 return true; 631 return true;
628 632
629 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { 633 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
630 if (RuntimeEnabledFeatures::cssCompositingEnabled() 634 if (RuntimeEnabledFeatures::cssCompositingEnabled()
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1691 // right 1695 // right
1692 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1696 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1693 if (radiiSum > rect.height()) 1697 if (radiiSum > rect.height())
1694 factor = std::min(rect.height() / radiiSum, factor); 1698 factor = std::min(rect.height() / radiiSum, factor);
1695 1699
1696 ASSERT(factor <= 1); 1700 ASSERT(factor <= 1);
1697 return factor; 1701 return factor;
1698 } 1702 }
1699 1703
1700 } // namespace blink 1704 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/repaint/align-self-change-no-flex-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698