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

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

Issue 16690004: [CSS Regions] Rename region-overflow to region-fragment (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch Created 7 years, 6 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 return StyleDifferenceLayout; 374 return StyleDifferenceLayout;
375 375
376 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { 376 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
377 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m _appearance 377 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m _appearance
378 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher itedData->marginBeforeCollapse 378 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher itedData->marginBeforeCollapse
379 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri tedData->marginAfterCollapse 379 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri tedData->marginAfterCollapse
380 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l ineClamp 380 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l ineClamp
381 || rareNonInheritedData->textOverflow != other->rareNonInheritedData ->textOverflow) 381 || rareNonInheritedData->textOverflow != other->rareNonInheritedData ->textOverflow)
382 return StyleDifferenceLayout; 382 return StyleDifferenceLayout;
383 383
384 if (rareNonInheritedData->m_regionOverflow != other->rareNonInheritedDat a->m_regionOverflow) 384 if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedDat a->m_regionFragment)
385 return StyleDifferenceLayout; 385 return StyleDifferenceLayout;
386 386
387 if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_w rapFlow 387 if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_w rapFlow
388 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat a->m_wrapThrough 388 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat a->m_wrapThrough
389 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat a->m_shapeMargin 389 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat a->m_shapeMargin
390 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa ta->m_shapePadding) 390 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa ta->m_shapePadding)
391 return StyleDifferenceLayout; 391 return StyleDifferenceLayout;
392 392
393 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNo nInheritedData->m_deprecatedFlexibleBox.get() 393 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNo nInheritedData->m_deprecatedFlexibleBox.get()
394 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->r areNonInheritedData->m_deprecatedFlexibleBox.get()) 394 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->r areNonInheritedData->m_deprecatedFlexibleBox.get())
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 info.addMember(rareInheritedData, "rareInheritedData"); 1571 info.addMember(rareInheritedData, "rareInheritedData");
1572 // FIXME: inherited contains StyleImage and Font fields that might need to b e instrumented. 1572 // FIXME: inherited contains StyleImage and Font fields that might need to b e instrumented.
1573 info.addMember(inherited, "inherited"); 1573 info.addMember(inherited, "inherited");
1574 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); 1574 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles");
1575 info.addMember(m_svgStyle, "svgStyle"); 1575 info.addMember(m_svgStyle, "svgStyle");
1576 info.addMember(inherited_flags, "inherited_flags"); 1576 info.addMember(inherited_flags, "inherited_flags");
1577 info.addMember(noninherited_flags, "noninherited_flags"); 1577 info.addMember(noninherited_flags, "noninherited_flags");
1578 } 1578 }
1579 1579
1580 } // namespace WebCore 1580 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698