| 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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_overflowX = other.m_nonInheritedData.m_overflowX; | 370 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; |
| 371 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; | 371 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; |
| 372 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; | 372 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; |
| 373 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; | 373 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; |
| 374 m_nonInheritedData.m_hasViewportUnits = | 374 m_nonInheritedData.m_hasViewportUnits = |
| 375 other.m_nonInheritedData.m_hasViewportUnits; | 375 other.m_nonInheritedData.m_hasViewportUnits; |
| 376 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; | |
| 377 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; | |
| 378 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; | |
| 379 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; | 376 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; |
| 380 | 377 |
| 381 // Correctly set during selector matching: | 378 // Correctly set during selector matching: |
| 382 // m_nonInheritedData.m_styleType | 379 // m_nonInheritedData.m_styleType |
| 383 // m_nonInheritedData.m_pseudoBits | 380 // m_nonInheritedData.m_pseudoBits |
| 384 | 381 |
| 385 // Set correctly while computing style for children: | 382 // Set correctly while computing style for children: |
| 386 // m_nonInheritedData.m_explicitInheritance | 383 // m_nonInheritedData.m_explicitInheritance |
| 387 | 384 |
| 388 // unique() styles are not cacheable. | 385 // unique() styles are not cacheable. |
| (...skipping 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2476 if (value < 0) | 2473 if (value < 0) |
| 2477 fvalue -= 0.5f; | 2474 fvalue -= 0.5f; |
| 2478 else | 2475 else |
| 2479 fvalue += 0.5f; | 2476 fvalue += 0.5f; |
| 2480 } | 2477 } |
| 2481 | 2478 |
| 2482 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2479 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2483 } | 2480 } |
| 2484 | 2481 |
| 2485 } // namespace blink | 2482 } // namespace blink |
| OLD | NEW |