| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 if (otherSiblings.siblingDescendants()) | 123 if (otherSiblings.siblingDescendants()) |
| 124 siblings.ensureSiblingDescendants().combine( | 124 siblings.ensureSiblingDescendants().combine( |
| 125 *otherSiblings.siblingDescendants()); | 125 *otherSiblings.siblingDescendants()); |
| 126 if (otherSiblings.descendants()) | 126 if (otherSiblings.descendants()) |
| 127 siblings.ensureDescendants().combine(*otherSiblings.descendants()); | 127 siblings.ensureDescendants().combine(*otherSiblings.descendants()); |
| 128 } | 128 } |
| 129 | 129 |
| 130 if (other.invalidatesSelf()) | 130 if (other.invalidatesSelf()) |
| 131 setInvalidatesSelf(); | 131 setInvalidatesSelf(); |
| 132 | 132 |
| 133 // No longer bother combining data structures, since the whole subtree is deem
ed invalid. | 133 // No longer bother combining data structures, since the whole subtree is |
| 134 // deemed invalid. |
| 134 if (wholeSubtreeInvalid()) | 135 if (wholeSubtreeInvalid()) |
| 135 return; | 136 return; |
| 136 | 137 |
| 137 if (other.wholeSubtreeInvalid()) { | 138 if (other.wholeSubtreeInvalid()) { |
| 138 setWholeSubtreeInvalid(); | 139 setWholeSubtreeInvalid(); |
| 139 return; | 140 return; |
| 140 } | 141 } |
| 141 | 142 |
| 142 if (other.customPseudoInvalid()) | 143 if (other.customPseudoInvalid()) |
| 143 setCustomPseudoInvalid(); | 144 setCustomPseudoInvalid(); |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 return *m_siblingDescendantInvalidationSet; | 316 return *m_siblingDescendantInvalidationSet; |
| 316 } | 317 } |
| 317 | 318 |
| 318 DescendantInvalidationSet& SiblingInvalidationSet::ensureDescendants() { | 319 DescendantInvalidationSet& SiblingInvalidationSet::ensureDescendants() { |
| 319 if (!m_descendantInvalidationSet) | 320 if (!m_descendantInvalidationSet) |
| 320 m_descendantInvalidationSet = DescendantInvalidationSet::create(); | 321 m_descendantInvalidationSet = DescendantInvalidationSet::create(); |
| 321 return *m_descendantInvalidationSet; | 322 return *m_descendantInvalidationSet; |
| 322 } | 323 } |
| 323 | 324 |
| 324 } // namespace blink | 325 } // namespace blink |
| OLD | NEW |