Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 555 | 555 |
| 556 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { | 556 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { |
| 557 if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData ->m_appearance | 557 if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData ->m_appearance |
| 558 || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn heritedData->marginBeforeCollapse | 558 || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn heritedData->marginBeforeCollapse |
| 559 || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh eritedData->marginAfterCollapse | 559 || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh eritedData->marginAfterCollapse |
| 560 || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData ->lineClamp | 560 || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData ->lineClamp |
| 561 || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD ata->textOverflow | 561 || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD ata->textOverflow |
| 562 || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited Data->m_shapeMargin | 562 || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited Data->m_shapeMargin |
| 563 || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData-> m_order | 563 || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData-> m_order |
| 564 || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD ata->m_grid.get() | 564 || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD ata->m_grid.get() |
| 565 || m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInheri tedData->m_gridItem.get() | |
| 566 || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD ata->hasFilters()) | 565 || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD ata->hasFilters()) |
| 567 return true; | 566 return true; |
| 568 | 567 |
| 568 const StyleGridItemData* gridItemDataA = m_rareNonInheritedData->m_gridI tem.get(); | |
| 569 const StyleGridItemData* gridItemDataB = m_rareNonInheritedData->m_gridI tem.get(); | |
|
cbiesinger
2016/08/19 18:55:13
This needs an "other"...
jfernandez
2016/08/19 20:41:21
Done.
| |
| 570 if (!(gridItemDataA == gridItemDataB) || (gridItemDataA && gridItemDataA && *gridItemDataA == *gridItemDataB)) | |
|
cbiesinger
2016/08/19 18:55:13
gridItemDataA && gridItemDataA <-- needs to be B
jfernandez
2016/08/19 20:41:22
Right.
| |
| 571 return true; | |
| 572 | |
| 569 if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar eNonInheritedData->m_deprecatedFlexibleBox.get() | 573 if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar eNonInheritedData->m_deprecatedFlexibleBox.get() |
| 570 && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other. m_rareNonInheritedData->m_deprecatedFlexibleBox.get()) | 574 && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other. m_rareNonInheritedData->m_deprecatedFlexibleBox.get()) |
| 571 return true; | 575 return true; |
| 572 | 576 |
| 573 if (m_rareNonInheritedData->m_flexibleBox.get() != other.m_rareNonInheri tedData->m_flexibleBox.get() | 577 if (m_rareNonInheritedData->m_flexibleBox.get() != other.m_rareNonInheri tedData->m_flexibleBox.get() |
| 574 && *m_rareNonInheritedData->m_flexibleBox.get() != *other.m_rareNonI nheritedData->m_flexibleBox.get()) | 578 && *m_rareNonInheritedData->m_flexibleBox.get() != *other.m_rareNonI nheritedData->m_flexibleBox.get()) |
| 575 return true; | 579 return true; |
| 576 | 580 |
| 577 if (m_rareNonInheritedData->m_multiCol.get() != other.m_rareNonInherited Data->m_multiCol.get() | 581 if (m_rareNonInheritedData->m_multiCol.get() != other.m_rareNonInherited Data->m_multiCol.get() |
| 578 && *m_rareNonInheritedData->m_multiCol.get() != *other.m_rareNonInhe ritedData->m_multiCol.get()) | 582 && *m_rareNonInheritedData->m_multiCol.get() != *other.m_rareNonInhe ritedData->m_multiCol.get()) |
| (...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1988 if (value < 0) | 1992 if (value < 0) |
| 1989 fvalue -= 0.5f; | 1993 fvalue -= 0.5f; |
| 1990 else | 1994 else |
| 1991 fvalue += 0.5f; | 1995 fvalue += 0.5f; |
| 1992 } | 1996 } |
| 1993 | 1997 |
| 1994 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 1998 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 1995 } | 1999 } |
| 1996 | 2000 |
| 1997 } // namespace blink | 2001 } // namespace blink |
| OLD | NEW |