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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.cpp

Issue 761283002: Remove webkit-line-clamp (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 if (borderLeftWidth() != other.borderLeftWidth() 314 if (borderLeftWidth() != other.borderLeftWidth()
315 || borderTopWidth() != other.borderTopWidth() 315 || borderTopWidth() != other.borderTopWidth()
316 || borderBottomWidth() != other.borderBottomWidth() 316 || borderBottomWidth() != other.borderBottomWidth()
317 || borderRightWidth() != other.borderRightWidth()) 317 || borderRightWidth() != other.borderRightWidth())
318 return true; 318 return true;
319 } 319 }
320 320
321 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { 321 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
322 if (rareNonInheritedData->marginBeforeCollapse != other.rareNonInherited Data->marginBeforeCollapse 322 if (rareNonInheritedData->marginBeforeCollapse != other.rareNonInherited Data->marginBeforeCollapse
323 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit edData->marginAfterCollapse 323 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit edData->marginAfterCollapse
324 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li neClamp
325 || rareNonInheritedData->textOverflow != other.rareNonInheritedData- >textOverflow 324 || rareNonInheritedData->textOverflow != other.rareNonInheritedData- >textOverflow
326 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m _wrapFlow 325 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m _wrapFlow
327 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData ->m_wrapThrough 326 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData ->m_wrapThrough
328 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or der 327 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or der
329 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat a->m_alignContent 328 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat a->m_alignContent
330 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData- >m_alignItems 329 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData- >m_alignItems
331 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData-> m_alignSelf 330 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData-> m_alignSelf
332 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD ata->m_justifyContent 331 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD ata->m_justifyContent
333 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData- >hasFilters()) 332 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData- >hasFilters())
334 return true; 333 return true;
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 // right 1267 // right
1269 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1268 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1270 if (radiiSum > rect.height()) 1269 if (radiiSum > rect.height())
1271 factor = std::min(rect.height() / radiiSum, factor); 1270 factor = std::min(rect.height() / radiiSum, factor);
1272 1271
1273 ASSERT(factor <= 1); 1272 ASSERT(factor <= 1);
1274 return factor; 1273 return factor;
1275 } 1274 }
1276 1275
1277 } // namespace blink 1276 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698