| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * Copyright (C) 2013 Google Inc. All rights reserved. | 7 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * Redistribution and use in source and binary forms, with or without | 9 * Redistribution and use in source and binary forms, with or without |
| 10 * modification, are permitted provided that the following conditions are | 10 * modification, are permitted provided that the following conditions are |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 177 |
| 178 // FIXME: This should be const to avoid a const_cast, but can modify child d
irty bits and RenderCombineText | 178 // FIXME: This should be const to avoid a const_cast, but can modify child d
irty bits and RenderCombineText |
| 179 void computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, Layout
Unit& maxLogicalWidth); | 179 void computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, Layout
Unit& maxLogicalWidth); |
| 180 | 180 |
| 181 GapRects inlineSelectionGaps(const RenderBlock* rootBlock, const LayoutPoint
& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, | 181 GapRects inlineSelectionGaps(const RenderBlock* rootBlock, const LayoutPoint
& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, |
| 182 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& las
tLogicalRight, const PaintInfo*) const; | 182 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& las
tLogicalRight, const PaintInfo*) const; |
| 183 | 183 |
| 184 LayoutUnit paginationStrut() const { return m_rareData ? m_rareData->m_pagin
ationStrut : LayoutUnit(); } | 184 LayoutUnit paginationStrut() const { return m_rareData ? m_rareData->m_pagin
ationStrut : LayoutUnit(); } |
| 185 void setPaginationStrut(LayoutUnit); | 185 void setPaginationStrut(LayoutUnit); |
| 186 | 186 |
| 187 virtual bool avoidsFloats() const override; | |
| 188 | |
| 189 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con
st | 187 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con
st |
| 190 { | 188 { |
| 191 if (isHorizontalWritingMode()) | 189 if (isHorizontalWritingMode()) |
| 192 return child->x() + child->renderer()->marginLeft(); | 190 return child->x() + child->renderer()->marginLeft(); |
| 193 | 191 |
| 194 return child->x() + marginBeforeForChild(child->renderer()); | 192 return child->x() + marginBeforeForChild(child->renderer()); |
| 195 } | 193 } |
| 196 | 194 |
| 197 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con
st | 195 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con
st |
| 198 { | 196 { |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 | 498 |
| 501 // END METHODS DEFINED IN RenderBlockLineLayout | 499 // END METHODS DEFINED IN RenderBlockLineLayout |
| 502 | 500 |
| 503 }; | 501 }; |
| 504 | 502 |
| 505 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 503 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
| 506 | 504 |
| 507 } // namespace blink | 505 } // namespace blink |
| 508 | 506 |
| 509 #endif // RenderBlockFlow_h | 507 #endif // RenderBlockFlow_h |
| OLD | NEW |