| 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 577 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 588     } | 588     } | 
| 589 | 589 | 
| 590     if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { | 590     if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { | 
| 591         if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData
      ->m_appearance | 591         if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData
      ->m_appearance | 
| 592             || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn
      heritedData->marginBeforeCollapse | 592             || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn
      heritedData->marginBeforeCollapse | 
| 593             || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh
      eritedData->marginAfterCollapse | 593             || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh
      eritedData->marginAfterCollapse | 
| 594             || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData
      ->lineClamp | 594             || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData
      ->lineClamp | 
| 595             || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD
      ata->textOverflow | 595             || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD
      ata->textOverflow | 
| 596             || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited
      Data->m_shapeMargin | 596             || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited
      Data->m_shapeMargin | 
| 597             || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData->
      m_order | 597             || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData->
      m_order | 
| 598             || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD
      ata->m_grid.get() |  | 
| 599             || m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInheri
      tedData->m_gridItem.get() |  | 
| 600             || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD
      ata->hasFilters()) | 598             || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD
      ata->hasFilters()) | 
| 601             return true; | 599             return true; | 
| 602 | 600 | 
|  | 601         if (m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedData
      ->m_grid.get() | 
|  | 602             && *m_rareNonInheritedData->m_grid.get() != *other.m_rareNonInherite
      dData->m_grid.get()) | 
|  | 603             return true; | 
|  | 604 | 
|  | 605         if (m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInherited
      Data->m_gridItem.get() | 
|  | 606             && *m_rareNonInheritedData->m_gridItem.get() != *other.m_rareNonInhe
      ritedData->m_gridItem.get()) | 
|  | 607             return true; | 
|  | 608 | 
| 603         if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar
      eNonInheritedData->m_deprecatedFlexibleBox.get() | 609         if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar
      eNonInheritedData->m_deprecatedFlexibleBox.get() | 
| 604             && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.
      m_rareNonInheritedData->m_deprecatedFlexibleBox.get()) | 610             && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.
      m_rareNonInheritedData->m_deprecatedFlexibleBox.get()) | 
| 605             return true; | 611             return true; | 
| 606 | 612 | 
| 607         if (m_rareNonInheritedData->m_flexibleBox.get() != other.m_rareNonInheri
      tedData->m_flexibleBox.get() | 613         if (m_rareNonInheritedData->m_flexibleBox.get() != other.m_rareNonInheri
      tedData->m_flexibleBox.get() | 
| 608             && *m_rareNonInheritedData->m_flexibleBox.get() != *other.m_rareNonI
      nheritedData->m_flexibleBox.get()) | 614             && *m_rareNonInheritedData->m_flexibleBox.get() != *other.m_rareNonI
      nheritedData->m_flexibleBox.get()) | 
| 609             return true; | 615             return true; | 
| 610 | 616 | 
| 611         if (m_rareNonInheritedData->m_multiCol.get() != other.m_rareNonInherited
      Data->m_multiCol.get() | 617         if (m_rareNonInheritedData->m_multiCol.get() != other.m_rareNonInherited
      Data->m_multiCol.get() | 
| 612             && *m_rareNonInheritedData->m_multiCol.get() != *other.m_rareNonInhe
      ritedData->m_multiCol.get()) | 618             && *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... | 
| 2022         if (value < 0) | 2028         if (value < 0) | 
| 2023             fvalue -= 0.5f; | 2029             fvalue -= 0.5f; | 
| 2024         else | 2030         else | 
| 2025             fvalue += 0.5f; | 2031             fvalue += 0.5f; | 
| 2026     } | 2032     } | 
| 2027 | 2033 | 
| 2028     return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2034     return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 
| 2029 } | 2035 } | 
| 2030 | 2036 | 
| 2031 } // namespace blink | 2037 } // namespace blink | 
| OLD | NEW | 
|---|