| 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
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 noninherited_flags.verticalAlign = other.noninherited_flags.verticalAlign; | 246 noninherited_flags.verticalAlign = other.noninherited_flags.verticalAlign; |
| 247 noninherited_flags.clear = other.noninherited_flags.clear; | 247 noninherited_flags.clear = other.noninherited_flags.clear; |
| 248 noninherited_flags.position = other.noninherited_flags.position; | 248 noninherited_flags.position = other.noninherited_flags.position; |
| 249 noninherited_flags.floating = other.noninherited_flags.floating; | 249 noninherited_flags.floating = other.noninherited_flags.floating; |
| 250 noninherited_flags.tableLayout = other.noninherited_flags.tableLayout; | 250 noninherited_flags.tableLayout = other.noninherited_flags.tableLayout; |
| 251 noninherited_flags.unicodeBidi = other.noninherited_flags.unicodeBidi; | 251 noninherited_flags.unicodeBidi = other.noninherited_flags.unicodeBidi; |
| 252 noninherited_flags.hasViewportUnits = other.noninherited_flags.hasViewportUn
its; | 252 noninherited_flags.hasViewportUnits = other.noninherited_flags.hasViewportUn
its; |
| 253 noninherited_flags.pageBreakBefore = other.noninherited_flags.pageBreakBefor
e; | 253 noninherited_flags.pageBreakBefore = other.noninherited_flags.pageBreakBefor
e; |
| 254 noninherited_flags.pageBreakAfter = other.noninherited_flags.pageBreakAfter; | 254 noninherited_flags.pageBreakAfter = other.noninherited_flags.pageBreakAfter; |
| 255 noninherited_flags.pageBreakInside = other.noninherited_flags.pageBreakInsid
e; | 255 noninherited_flags.pageBreakInside = other.noninherited_flags.pageBreakInsid
e; |
| 256 noninherited_flags.hasRemUnits = other.noninherited_flags.hasRemUnits; |
| 256 | 257 |
| 257 // Correctly set during selector matching: | 258 // Correctly set during selector matching: |
| 258 // noninherited_flags.styleType | 259 // noninherited_flags.styleType |
| 259 // noninherited_flags.pseudoBits | 260 // noninherited_flags.pseudoBits |
| 260 | 261 |
| 261 // Set correctly while computing style for children: | 262 // Set correctly while computing style for children: |
| 262 // noninherited_flags.explicitInheritance | 263 // noninherited_flags.explicitInheritance |
| 263 | 264 |
| 264 // unique() styles are not cacheable. | 265 // unique() styles are not cacheable. |
| 265 ASSERT(!other.noninherited_flags.unique); | 266 ASSERT(!other.noninherited_flags.unique); |
| (...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1774 } | 1775 } |
| 1775 | 1776 |
| 1776 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1777 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
| 1777 { | 1778 { |
| 1778 setEmptyState(other.emptyState()); | 1779 setEmptyState(other.emptyState()); |
| 1779 if (other.hasExplicitlyInheritedProperties()) | 1780 if (other.hasExplicitlyInheritedProperties()) |
| 1780 setHasExplicitlyInheritedProperties(); | 1781 setHasExplicitlyInheritedProperties(); |
| 1781 } | 1782 } |
| 1782 | 1783 |
| 1783 } // namespace blink | 1784 } // namespace blink |
| OLD | NEW |