| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 4226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4237 UseCounter::count(document(), UseCounter::CSSOverflowPaged); | 4237 UseCounter::count(document(), UseCounter::CSSOverflowPaged); |
| 4238 return LayoutPagedFlowThread::createAnonymous(document(), styleRef()); | 4238 return LayoutPagedFlowThread::createAnonymous(document(), styleRef()); |
| 4239 default: | 4239 default: |
| 4240 NOTREACHED(); | 4240 NOTREACHED(); |
| 4241 return nullptr; | 4241 return nullptr; |
| 4242 } | 4242 } |
| 4243 } | 4243 } |
| 4244 | 4244 |
| 4245 void LayoutBlockFlow::createOrDestroyMultiColumnFlowThreadIfNeeded( | 4245 void LayoutBlockFlow::createOrDestroyMultiColumnFlowThreadIfNeeded( |
| 4246 const ComputedStyle* oldStyle) { | 4246 const ComputedStyle* oldStyle) { |
| 4247 if (RuntimeEnabledFeatures::layoutNGEnabled()) | |
| 4248 return; | |
| 4249 | |
| 4250 // Paged overflow trumps multicol in this implementation. Ideally, it should | 4247 // Paged overflow trumps multicol in this implementation. Ideally, it should |
| 4251 // be possible to have both paged overflow and multicol on the same element, | 4248 // be possible to have both paged overflow and multicol on the same element, |
| 4252 // but then we need two flow threads. Anyway, this is nothing to worry about | 4249 // but then we need two flow threads. Anyway, this is nothing to worry about |
| 4253 // until we can actually nest multicol properly inside other fragmentation | 4250 // until we can actually nest multicol properly inside other fragmentation |
| 4254 // contexts. | 4251 // contexts. |
| 4255 FlowThreadType type = getFlowThreadType(styleRef()); | 4252 FlowThreadType type = getFlowThreadType(styleRef()); |
| 4256 | 4253 |
| 4257 if (multiColumnFlowThread()) { | 4254 if (multiColumnFlowThread()) { |
| 4258 ASSERT(oldStyle); | 4255 ASSERT(oldStyle); |
| 4259 if (type != getFlowThreadType(*oldStyle)) { | 4256 if (type != getFlowThreadType(*oldStyle)) { |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4602 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); | 4599 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); |
| 4603 } | 4600 } |
| 4604 | 4601 |
| 4605 void LayoutBlockFlow::invalidateDisplayItemClients( | 4602 void LayoutBlockFlow::invalidateDisplayItemClients( |
| 4606 PaintInvalidationReason invalidationReason) const { | 4603 PaintInvalidationReason invalidationReason) const { |
| 4607 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( | 4604 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( |
| 4608 invalidationReason); | 4605 invalidationReason); |
| 4609 } | 4606 } |
| 4610 | 4607 |
| 4611 } // namespace blink | 4608 } // namespace blink |
| OLD | NEW |