| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/rendering/RenderParagraph.h" | 6 #include "sky/engine/core/rendering/RenderParagraph.h" |
| 7 | 7 |
| 8 #include "sky/engine/core/rendering/BidiRunForLine.h" | 8 #include "sky/engine/core/rendering/BidiRunForLine.h" |
| 9 #include "sky/engine/core/rendering/InlineIterator.h" | 9 #include "sky/engine/core/rendering/InlineIterator.h" |
| 10 #include "sky/engine/core/rendering/RenderLayer.h" | 10 #include "sky/engine/core/rendering/RenderLayer.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 } | 165 } |
| 166 | 166 |
| 167 // FIXME: Glyph overflow will get lost in this case, but not really a big
deal. | 167 // FIXME: Glyph overflow will get lost in this case, but not really a big
deal. |
| 168 GlyphOverflowAndFallbackFontsMap textBoxDataMap; | 168 GlyphOverflowAndFallbackFontsMap textBoxDataMap; |
| 169 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); i
t != lineBoxes.end(); ++it) { | 169 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); i
t != lineBoxes.end(); ++it) { |
| 170 RootInlineBox* box = *it; | 170 RootInlineBox* box = *it; |
| 171 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap
); | 171 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap
); |
| 172 } | 172 } |
| 173 } | 173 } |
| 174 | 174 |
| 175 void RenderParagraph::paintChildren(PaintInfo& paintInfo, const LayoutPoint& pai
ntOffset) | 175 void RenderParagraph::paintChildren(PaintInfo& paintInfo, const LayoutPoint& pai
ntOffset, Vector<RenderBox*>& layers) |
| 176 { | 176 { |
| 177 m_lineBoxes.paint(this, paintInfo, paintOffset); | 177 m_lineBoxes.paint(this, paintInfo, paintOffset, layers); |
| 178 } | 178 } |
| 179 | 179 |
| 180 bool RenderParagraph::hitTestContents(const HitTestRequest& request, HitTestResu
lt& result, const HitTestLocation& locationInContainer, const LayoutPoint& accum
ulatedOffset, HitTestAction hitTestAction) | 180 bool RenderParagraph::hitTestContents(const HitTestRequest& request, HitTestResu
lt& result, const HitTestLocation& locationInContainer, const LayoutPoint& accum
ulatedOffset, HitTestAction hitTestAction) |
| 181 { | 181 { |
| 182 return m_lineBoxes.hitTest(this, request, result, locationInContainer, accum
ulatedOffset, hitTestAction); | 182 return m_lineBoxes.hitTest(this, request, result, locationInContainer, accum
ulatedOffset, hitTestAction); |
| 183 } | 183 } |
| 184 | 184 |
| 185 void RenderParagraph::markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUn
it logicalBottom, RootInlineBox* highest) | 185 void RenderParagraph::markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUn
it logicalBottom, RootInlineBox* highest) |
| 186 { | 186 { |
| 187 if (logicalTop >= logicalBottom) | 187 if (logicalTop >= logicalBottom) |
| (...skipping 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1573 curr->adjustLogicalPosition(logicalLeft, 0); | 1573 curr->adjustLogicalPosition(logicalLeft, 0); |
| 1574 else | 1574 else |
| 1575 curr->adjustLogicalPosition(logicalLeft - (availableLogicalW
idth - totalLogicalWidth), 0); | 1575 curr->adjustLogicalPosition(logicalLeft - (availableLogicalW
idth - totalLogicalWidth), 0); |
| 1576 } | 1576 } |
| 1577 } | 1577 } |
| 1578 firstLine = false; | 1578 firstLine = false; |
| 1579 } | 1579 } |
| 1580 } | 1580 } |
| 1581 | 1581 |
| 1582 } // namespace blink | 1582 } // namespace blink |
| OLD | NEW |