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

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

Issue 134473008: Remove CSS regions support, keeping a bare minimum to support "region-based" multicol. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 return Reattach; 173 return Reattach;
174 174
175 if (!oldStyle && !newStyle) 175 if (!oldStyle && !newStyle)
176 return NoChange; 176 return NoChange;
177 177
178 if (oldStyle->display() != newStyle->display() 178 if (oldStyle->display() != newStyle->display()
179 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI RST_LETTER) 179 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI RST_LETTER)
180 || oldStyle->columnSpan() != newStyle->columnSpan() 180 || oldStyle->columnSpan() != newStyle->columnSpan()
181 || oldStyle->specifiesAutoColumns() != newStyle->specifiesAutoColumns() 181 || oldStyle->specifiesAutoColumns() != newStyle->specifiesAutoColumns()
182 || !oldStyle->contentDataEquivalent(newStyle) 182 || !oldStyle->contentDataEquivalent(newStyle)
183 || oldStyle->hasTextCombine() != newStyle->hasTextCombine() 183 || oldStyle->hasTextCombine() != newStyle->hasTextCombine())
184 || oldStyle->flowThread() != newStyle->flowThread()
185 || oldStyle->regionThread() != newStyle->regionThread())
186 return Reattach; 184 return Reattach;
187 185
188 if (*oldStyle == *newStyle) 186 if (*oldStyle == *newStyle)
189 return comparePseudoStyles(oldStyle, newStyle); 187 return comparePseudoStyles(oldStyle, newStyle);
190 188
191 if (oldStyle->inheritedNotEqual(newStyle) 189 if (oldStyle->inheritedNotEqual(newStyle)
192 || oldStyle->hasExplicitlyInheritedProperties() 190 || oldStyle->hasExplicitlyInheritedProperties()
193 || newStyle->hasExplicitlyInheritedProperties()) 191 || newStyle->hasExplicitlyInheritedProperties())
194 return Inherit; 192 return Inherit;
195 193
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 || borderRightWidth() != other->borderRightWidth()) 410 || borderRightWidth() != other->borderRightWidth())
413 return StyleDifferenceLayout; 411 return StyleDifferenceLayout;
414 } 412 }
415 413
416 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { 414 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
417 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m _appearance 415 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m _appearance
418 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher itedData->marginBeforeCollapse 416 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher itedData->marginBeforeCollapse
419 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri tedData->marginAfterCollapse 417 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri tedData->marginAfterCollapse
420 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l ineClamp 418 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l ineClamp
421 || rareNonInheritedData->textOverflow != other->rareNonInheritedData ->textOverflow 419 || rareNonInheritedData->textOverflow != other->rareNonInheritedData ->textOverflow
422 || rareNonInheritedData->m_regionFragment != other->rareNonInherited Data->m_regionFragment
423 || rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData-> m_wrapFlow 420 || rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData-> m_wrapFlow
424 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat a->m_wrapThrough 421 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat a->m_wrapThrough
425 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat a->m_shapeMargin 422 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat a->m_shapeMargin
426 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa ta->m_shapePadding 423 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa ta->m_shapePadding
427 || rareNonInheritedData->m_order != other->rareNonInheritedData->m_o rder 424 || rareNonInheritedData->m_order != other->rareNonInheritedData->m_o rder
428 || rareNonInheritedData->m_alignContent != other->rareNonInheritedDa ta->m_alignContent 425 || rareNonInheritedData->m_alignContent != other->rareNonInheritedDa ta->m_alignContent
429 || rareNonInheritedData->m_alignItems != other->rareNonInheritedData ->m_alignItems 426 || rareNonInheritedData->m_alignItems != other->rareNonInheritedData ->m_alignItems
430 || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData- >m_alignSelf 427 || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData- >m_alignSelf
431 || rareNonInheritedData->m_justifyContent != other->rareNonInherited Data->m_justifyContent 428 || rareNonInheritedData->m_justifyContent != other->rareNonInherited Data->m_justifyContent
432 || rareNonInheritedData->m_grid.get() != other->rareNonInheritedData ->m_grid.get() 429 || rareNonInheritedData->m_grid.get() != other->rareNonInheritedData ->m_grid.get()
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 } 1591 }
1595 1592
1596 void RenderStyle::setBorderImageOutset(const BorderImageLengthBox& outset) 1593 void RenderStyle::setBorderImageOutset(const BorderImageLengthBox& outset)
1597 { 1594 {
1598 if (surround->border.m_image.outset() == outset) 1595 if (surround->border.m_image.outset() == outset)
1599 return; 1596 return;
1600 surround.access()->border.m_image.setOutset(outset); 1597 surround.access()->border.m_image.setOutset(outset);
1601 } 1598 }
1602 1599
1603 } // namespace WebCore 1600 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698