| 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 | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
| 4 * reserved. | 4 * reserved. |
| 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 other.m_nonInheritedData.m_effectiveDisplay; | 367 other.m_nonInheritedData.m_effectiveDisplay; |
| 368 m_nonInheritedData.m_originalDisplay = | 368 m_nonInheritedData.m_originalDisplay = |
| 369 other.m_nonInheritedData.m_originalDisplay; | 369 other.m_nonInheritedData.m_originalDisplay; |
| 370 m_nonInheritedData.m_overflowAnchor = | 370 m_nonInheritedData.m_overflowAnchor = |
| 371 other.m_nonInheritedData.m_overflowAnchor; | 371 other.m_nonInheritedData.m_overflowAnchor; |
| 372 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; | 372 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; |
| 373 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; | 373 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; |
| 374 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; | 374 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; |
| 375 m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear; | 375 m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear; |
| 376 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; | 376 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; |
| 377 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout; | |
| 378 m_nonInheritedData.m_hasViewportUnits = | 377 m_nonInheritedData.m_hasViewportUnits = |
| 379 other.m_nonInheritedData.m_hasViewportUnits; | 378 other.m_nonInheritedData.m_hasViewportUnits; |
| 380 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; | 379 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; |
| 381 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; | 380 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; |
| 382 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; | 381 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; |
| 383 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; | 382 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; |
| 384 | 383 |
| 385 // Correctly set during selector matching: | 384 // Correctly set during selector matching: |
| 386 // m_nonInheritedData.m_styleType | 385 // m_nonInheritedData.m_styleType |
| 387 // m_nonInheritedData.m_pseudoBits | 386 // m_nonInheritedData.m_pseudoBits |
| (...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 getUnicodeBidi() != other.getUnicodeBidi() || | 820 getUnicodeBidi() != other.getUnicodeBidi() || |
| 822 floating() != other.floating() || | 821 floating() != other.floating() || |
| 823 m_nonInheritedData.m_originalDisplay != | 822 m_nonInheritedData.m_originalDisplay != |
| 824 other.m_nonInheritedData.m_originalDisplay) | 823 other.m_nonInheritedData.m_originalDisplay) |
| 825 return true; | 824 return true; |
| 826 | 825 |
| 827 if (isDisplayTableType(display())) { | 826 if (isDisplayTableType(display())) { |
| 828 if (borderCollapse() != other.borderCollapse() || | 827 if (borderCollapse() != other.borderCollapse() || |
| 829 emptyCells() != other.emptyCells() || | 828 emptyCells() != other.emptyCells() || |
| 830 captionSide() != other.captionSide() || | 829 captionSide() != other.captionSide() || |
| 831 m_nonInheritedData.m_tableLayout != | 830 tableLayout() != other.tableLayout()) |
| 832 other.m_nonInheritedData.m_tableLayout) | |
| 833 return true; | 831 return true; |
| 834 | 832 |
| 835 // In the collapsing border model, 'hidden' suppresses other borders, while | 833 // In the collapsing border model, 'hidden' suppresses other borders, while |
| 836 // 'none' does not, so these style differences can be width differences. | 834 // 'none' does not, so these style differences can be width differences. |
| 837 if ((borderCollapse() == EBorderCollapse::kCollapse) && | 835 if ((borderCollapse() == EBorderCollapse::kCollapse) && |
| 838 ((borderTopStyle() == BorderStyleHidden && | 836 ((borderTopStyle() == BorderStyleHidden && |
| 839 other.borderTopStyle() == BorderStyleNone) || | 837 other.borderTopStyle() == BorderStyleNone) || |
| 840 (borderTopStyle() == BorderStyleNone && | 838 (borderTopStyle() == BorderStyleNone && |
| 841 other.borderTopStyle() == BorderStyleHidden) || | 839 other.borderTopStyle() == BorderStyleHidden) || |
| 842 (borderBottomStyle() == BorderStyleHidden && | 840 (borderBottomStyle() == BorderStyleHidden && |
| (...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2480 if (value < 0) | 2478 if (value < 0) |
| 2481 fvalue -= 0.5f; | 2479 fvalue -= 0.5f; |
| 2482 else | 2480 else |
| 2483 fvalue += 0.5f; | 2481 fvalue += 0.5f; |
| 2484 } | 2482 } |
| 2485 | 2483 |
| 2486 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2484 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2487 } | 2485 } |
| 2488 | 2486 |
| 2489 } // namespace blink | 2487 } // namespace blink |
| OLD | NEW |