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

Side by Side Diff: Source/core/style/ComputedStyle.cpp

Issue 1328673003: Remove -webkit-line-box-contain implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix up a few more tests. Created 5 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 | « Source/core/style/ComputedStyle.h ('k') | Source/core/style/StyleRareInheritedData.h » ('j') | 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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 || rareInheritedData->m_respectImageOrientation != other.rareInherit edData->m_respectImageOrientation 533 || rareInheritedData->m_respectImageOrientation != other.rareInherit edData->m_respectImageOrientation
534 || rareInheritedData->locale != other.rareInheritedData->locale 534 || rareInheritedData->locale != other.rareInheritedData->locale
535 || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_r ubyPosition 535 || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_r ubyPosition
536 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t extEmphasisMark 536 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t extEmphasisMark
537 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat a->textEmphasisPosition 537 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat a->textEmphasisPosition
538 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD ata->textEmphasisCustomMark 538 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD ata->textEmphasisCustomMark
539 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te xtJustify 539 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te xtJustify
540 || rareInheritedData->m_textOrientation != other.rareInheritedData-> m_textOrientation 540 || rareInheritedData->m_textOrientation != other.rareInheritedData-> m_textOrientation
541 || rareInheritedData->m_textCombine != other.rareInheritedData->m_te xtCombine 541 || rareInheritedData->m_textCombine != other.rareInheritedData->m_te xtCombine
542 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz e 542 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz e
543 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m _lineBoxContain
544 || rareInheritedData->listStyleImage != other.rareInheritedData->lis tStyleImage 543 || rareInheritedData->listStyleImage != other.rareInheritedData->lis tStyleImage
545 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te xtStrokeWidth) 544 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te xtStrokeWidth)
546 return true; 545 return true;
547 546
548 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge t())) 547 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge t()))
549 return true; 548 return true;
550 549
551 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge t())) 550 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge t()))
552 return true; 551 return true;
553 } 552 }
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 } 1798 }
1800 1799
1801 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1800 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1802 { 1801 {
1803 setEmptyState(other.emptyState()); 1802 setEmptyState(other.emptyState());
1804 if (other.hasExplicitlyInheritedProperties()) 1803 if (other.hasExplicitlyInheritedProperties())
1805 setHasExplicitlyInheritedProperties(); 1804 setHasExplicitlyInheritedProperties();
1806 } 1805 }
1807 1806
1808 } // namespace blink 1807 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/style/ComputedStyle.h ('k') | Source/core/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698