| 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 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2433 | 2433 |
| 2434 m_floatingObjects->add(floatingObject->copyToNewContainer(offset
)); | 2434 m_floatingObjects->add(floatingObject->copyToNewContainer(offset
)); |
| 2435 } | 2435 } |
| 2436 } | 2436 } |
| 2437 } | 2437 } |
| 2438 } | 2438 } |
| 2439 | 2439 |
| 2440 void RenderBlockFlow::addOverhangingFloats(RenderBlockFlow* child, bool makeChil
dPaintOtherFloats) | 2440 void RenderBlockFlow::addOverhangingFloats(RenderBlockFlow* child, bool makeChil
dPaintOtherFloats) |
| 2441 { | 2441 { |
| 2442 // Prevent floats from being added to the canvas by the root element, e.g.,
<html>. | 2442 // Prevent floats from being added to the canvas by the root element, e.g.,
<html>. |
| 2443 if (child->hasOverflowClip() || !child->containsFloats() || child->isDocumen
tElement() || child->hasColumns() || child->isWritingModeRoot()) | 2443 if (child->hasOverflowClip() || !child->containsFloats() || child->isRenderF
lowThread() || child->isRenderRegion() || child->isDocumentElement() || child->h
asColumns() || child->isWritingModeRoot()) |
| 2444 return; | 2444 return; |
| 2445 | 2445 |
| 2446 LayoutUnit childLogicalTop = child->logicalTop(); | 2446 LayoutUnit childLogicalTop = child->logicalTop(); |
| 2447 LayoutUnit childLogicalLeft = child->logicalLeft(); | 2447 LayoutUnit childLogicalLeft = child->logicalLeft(); |
| 2448 | 2448 |
| 2449 // Floats that will remain the child's responsibility to paint should factor
into its | 2449 // Floats that will remain the child's responsibility to paint should factor
into its |
| 2450 // overflow. | 2450 // overflow. |
| 2451 FloatingObjectSetIterator childEnd = child->m_floatingObjects->set().end(); | 2451 FloatingObjectSetIterator childEnd = child->m_floatingObjects->set().end(); |
| 2452 for (FloatingObjectSetIterator childIt = child->m_floatingObjects->set().beg
in(); childIt != childEnd; ++childIt) { | 2452 for (FloatingObjectSetIterator childIt = child->m_floatingObjects->set().beg
in(); childIt != childEnd; ++childIt) { |
| 2453 FloatingObject* floatingObject = *childIt; | 2453 FloatingObject* floatingObject = *childIt; |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2793 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2793 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
| 2794 { | 2794 { |
| 2795 if (m_rareData) | 2795 if (m_rareData) |
| 2796 return *m_rareData; | 2796 return *m_rareData; |
| 2797 | 2797 |
| 2798 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2798 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
| 2799 return *m_rareData; | 2799 return *m_rareData; |
| 2800 } | 2800 } |
| 2801 | 2801 |
| 2802 } // namespace WebCore | 2802 } // namespace WebCore |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 242203003:
[New Multicolumn] Make floats affect heights correctly. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master