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

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

Issue 698613002: Remove border-fit. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 495
496 if (rareInheritedData.get() != other.rareInheritedData.get()) { 496 if (rareInheritedData.get() != other.rareInheritedData.get()) {
497 if (rareInheritedData->userModify != other.rareInheritedData->userModify 497 if (rareInheritedData->userModify != other.rareInheritedData->userModify
498 || rareInheritedData->userSelect != other.rareInheritedData->userSel ect 498 || rareInheritedData->userSelect != other.rareInheritedData->userSel ect
499 || rareInheritedData->m_imageRendering != other.rareInheritedData->m _imageRendering) 499 || rareInheritedData->m_imageRendering != other.rareInheritedData->m _imageRendering)
500 return true; 500 return true;
501 } 501 }
502 502
503 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { 503 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
504 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr ag 504 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr ag
505 || rareNonInheritedData->m_borderFit != other.rareNonInheritedData-> m_borderFit
506 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData-> m_objectFit 505 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData-> m_objectFit
507 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD ata->m_objectPosition 506 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD ata->m_objectPosition
508 || !dataEquivalent(rareNonInheritedData->m_shapeOutside, other.rareN onInheritedData->m_shapeOutside) 507 || !dataEquivalent(rareNonInheritedData->m_shapeOutside, other.rareN onInheritedData->m_shapeOutside)
509 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn heritedData->m_clipPath)) 508 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn heritedData->m_clipPath))
510 return true; 509 return true;
511 } 510 }
512 511
513 return false; 512 return false;
514 } 513 }
515 514
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 // right 1385 // right
1387 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1386 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1388 if (radiiSum > rect.height()) 1387 if (radiiSum > rect.height())
1389 factor = std::min(rect.height() / radiiSum, factor); 1388 factor = std::min(rect.height() / radiiSum, factor);
1390 1389
1391 ASSERT(factor <= 1); 1390 ASSERT(factor <= 1);
1392 return factor; 1391 return factor;
1393 } 1392 }
1394 1393
1395 } // namespace blink 1394 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698