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 2286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2297 // Special-case zero- and less-than-zero-height floats: thos
e don't touch | 2297 // Special-case zero- and less-than-zero-height floats: thos
e don't touch |
2298 // the line that they're on, but it still needs to be dirtie
d. This is | 2298 // the line that they're on, but it still needs to be dirtie
d. This is |
2299 // accomplished by pretending they have a height of 1. | 2299 // accomplished by pretending they have a height of 1. |
2300 logicalBottom = std::max(logicalBottom, logicalTop + 1); | 2300 logicalBottom = std::max(logicalBottom, logicalTop + 1); |
2301 } | 2301 } |
2302 if (floatingObject->originatingLine()) { | 2302 if (floatingObject->originatingLine()) { |
2303 if (!selfNeedsLayout()) { | 2303 if (!selfNeedsLayout()) { |
2304 ASSERT(floatingObject->originatingLine()->renderer() ==
this); | 2304 ASSERT(floatingObject->originatingLine()->renderer() ==
this); |
2305 floatingObject->originatingLine()->markDirty(); | 2305 floatingObject->originatingLine()->markDirty(); |
2306 } | 2306 } |
2307 #if ASSERT_ENABLED | 2307 #if ENABLE(ASSERT) |
2308 floatingObject->setOriginatingLine(0); | 2308 floatingObject->setOriginatingLine(0); |
2309 #endif | 2309 #endif |
2310 } | 2310 } |
2311 markLinesDirtyInBlockRange(0, logicalBottom); | 2311 markLinesDirtyInBlockRange(0, logicalBottom); |
2312 } | 2312 } |
2313 m_floatingObjects->remove(floatingObject); | 2313 m_floatingObjects->remove(floatingObject); |
2314 } | 2314 } |
2315 } | 2315 } |
2316 } | 2316 } |
2317 | 2317 |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2899 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2899 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
2900 { | 2900 { |
2901 if (m_rareData) | 2901 if (m_rareData) |
2902 return *m_rareData; | 2902 return *m_rareData; |
2903 | 2903 |
2904 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2904 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
2905 return *m_rareData; | 2905 return *m_rareData; |
2906 } | 2906 } |
2907 | 2907 |
2908 } // namespace WebCore | 2908 } // namespace WebCore |
OLD | NEW |