| 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 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 } | 331 } |
| 332 | 332 |
| 333 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) { | 333 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) { |
| 334 ComputedStyleBase::CopyNonInheritedFromCached(other); | 334 ComputedStyleBase::CopyNonInheritedFromCached(other); |
| 335 rare_non_inherited_data_ = other.rare_non_inherited_data_; | 335 rare_non_inherited_data_ = other.rare_non_inherited_data_; |
| 336 | 336 |
| 337 // The flags are copied one-by-one because they contain | 337 // The flags are copied one-by-one because they contain |
| 338 // bunch of stuff other than real style data. | 338 // bunch of stuff other than real style data. |
| 339 // See comments for each skipped flag below. | 339 // See comments for each skipped flag below. |
| 340 | 340 |
| 341 // These are not generated in ComputedStyleBase | |
| 342 SetHasViewportUnits(other.HasViewportUnits()); | |
| 343 SetHasRemUnitsInternal(other.HasRemUnits()); | |
| 344 | |
| 345 // Correctly set during selector matching: | 341 // Correctly set during selector matching: |
| 346 // m_styleType | 342 // m_styleType |
| 347 // m_pseudoBits | 343 // m_pseudoBits |
| 348 | 344 |
| 349 // Set correctly while computing style for children: | 345 // Set correctly while computing style for children: |
| 350 // m_explicitInheritance | 346 // m_explicitInheritance |
| 351 | 347 |
| 352 // unique() styles are not cacheable. | 348 // unique() styles are not cacheable. |
| 353 DCHECK(!other.Unique()); | 349 DCHECK(!other.Unique()); |
| 354 | 350 |
| (...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2358 if (value < 0) | 2354 if (value < 0) |
| 2359 fvalue -= 0.5f; | 2355 fvalue -= 0.5f; |
| 2360 else | 2356 else |
| 2361 fvalue += 0.5f; | 2357 fvalue += 0.5f; |
| 2362 } | 2358 } |
| 2363 | 2359 |
| 2364 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2360 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
| 2365 } | 2361 } |
| 2366 | 2362 |
| 2367 } // namespace blink | 2363 } // namespace blink |
| OLD | NEW |