| 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 ComputedStyleBase::copyNonInheritedFromCached(other); | 338 ComputedStyleBase::copyNonInheritedFromCached(other); |
| 339 m_box = other.m_box; | 339 m_box = other.m_box; |
| 340 m_visual = other.m_visual; | 340 m_visual = other.m_visual; |
| 341 m_background = other.m_background; | 341 m_background = other.m_background; |
| 342 m_surround = other.m_surround; | 342 m_surround = other.m_surround; |
| 343 m_rareNonInheritedData = other.m_rareNonInheritedData; | 343 m_rareNonInheritedData = other.m_rareNonInheritedData; |
| 344 | 344 |
| 345 // The flags are copied one-by-one because m_nonInheritedData.m_contains a | 345 // The flags are copied one-by-one because m_nonInheritedData.m_contains a |
| 346 // bunch of stuff other than real style data. | 346 // bunch of stuff other than real style data. |
| 347 // See comments for each skipped flag below. | 347 // See comments for each skipped flag below. |
| 348 m_nonInheritedData.m_effectiveDisplay = | |
| 349 other.m_nonInheritedData.m_effectiveDisplay; | |
| 350 m_nonInheritedData.m_originalDisplay = | 348 m_nonInheritedData.m_originalDisplay = |
| 351 other.m_nonInheritedData.m_originalDisplay; | 349 other.m_nonInheritedData.m_originalDisplay; |
| 352 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; | 350 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; |
| 353 m_nonInheritedData.m_hasViewportUnits = | 351 m_nonInheritedData.m_hasViewportUnits = |
| 354 other.m_nonInheritedData.m_hasViewportUnits; | 352 other.m_nonInheritedData.m_hasViewportUnits; |
| 355 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; | 353 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; |
| 356 | 354 |
| 357 // Correctly set during selector matching: | 355 // Correctly set during selector matching: |
| 358 // m_nonInheritedData.m_styleType | 356 // m_nonInheritedData.m_styleType |
| 359 // m_nonInheritedData.m_pseudoBits | 357 // m_nonInheritedData.m_pseudoBits |
| (...skipping 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2491 if (value < 0) | 2489 if (value < 0) |
| 2492 fvalue -= 0.5f; | 2490 fvalue -= 0.5f; |
| 2493 else | 2491 else |
| 2494 fvalue += 0.5f; | 2492 fvalue += 0.5f; |
| 2495 } | 2493 } |
| 2496 | 2494 |
| 2497 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2495 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2498 } | 2496 } |
| 2499 | 2497 |
| 2500 } // namespace blink | 2498 } // namespace blink |
| OLD | NEW |