| 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 m_surround = other.m_surround; | 360 m_surround = other.m_surround; |
| 361 m_rareNonInheritedData = other.m_rareNonInheritedData; | 361 m_rareNonInheritedData = other.m_rareNonInheritedData; |
| 362 | 362 |
| 363 // The flags are copied one-by-one because m_nonInheritedData.m_contains a | 363 // The flags are copied one-by-one because m_nonInheritedData.m_contains a |
| 364 // bunch of stuff other than real style data. | 364 // bunch of stuff other than real style data. |
| 365 // See comments for each skipped flag below. | 365 // See comments for each skipped flag below. |
| 366 m_nonInheritedData.m_effectiveDisplay = | 366 m_nonInheritedData.m_effectiveDisplay = |
| 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 = | |
| 371 other.m_nonInheritedData.m_overflowAnchor; | |
| 372 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; | 370 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; |
| 373 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; | 371 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; |
| 374 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; | 372 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; |
| 375 m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear; | 373 m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear; |
| 376 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; | 374 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; |
| 377 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout; | 375 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout; |
| 378 m_nonInheritedData.m_hasViewportUnits = | 376 m_nonInheritedData.m_hasViewportUnits = |
| 379 other.m_nonInheritedData.m_hasViewportUnits; | 377 other.m_nonInheritedData.m_hasViewportUnits; |
| 380 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; | 378 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; |
| 381 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; | 379 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; |
| (...skipping 2098 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 |