Chromium Code Reviews| 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 3158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3169 childrenOverflowChanged = true; | 3169 childrenOverflowChanged = true; |
| 3170 if (InlineBox* inlineBoxWrapper = toLayoutBlock(layoutObject)->inlin eBoxWrapper()) | 3170 if (InlineBox* inlineBoxWrapper = toLayoutBlock(layoutObject)->inlin eBoxWrapper()) |
| 3171 lineBoxes.add(&inlineBoxWrapper->root()); | 3171 lineBoxes.add(&inlineBoxWrapper->root()); |
| 3172 } | 3172 } |
| 3173 } | 3173 } |
| 3174 | 3174 |
| 3175 // FIXME: Glyph overflow will get lost in this case, but not really a big de al. | 3175 // FIXME: Glyph overflow will get lost in this case, but not really a big de al. |
| 3176 GlyphOverflowAndFallbackFontsMap textBoxDataMap; | 3176 GlyphOverflowAndFallbackFontsMap textBoxDataMap; |
| 3177 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); it != lineBoxes.end(); ++it) { | 3177 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); it != lineBoxes.end(); ++it) { |
| 3178 RootInlineBox* box = *it; | 3178 RootInlineBox* box = *it; |
| 3179 box->clearKnownToHaveNoOverflow(); | |
|
Xianzhu
2016/05/16 22:29:19
Shouldn't we clearKnownToHaveNoOverflow() in compu
rhogan
2016/05/17 17:38:08
No, because InlineBox::computeOverflow() consults
| |
| 3179 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap); | 3180 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap); |
| 3180 } | 3181 } |
| 3181 return childrenOverflowChanged; | 3182 return childrenOverflowChanged; |
| 3182 } | 3183 } |
| 3183 | 3184 |
| 3184 PositionWithAffinity LayoutBlockFlow::positionForPoint(const LayoutPoint& point) | 3185 PositionWithAffinity LayoutBlockFlow::positionForPoint(const LayoutPoint& point) |
| 3185 { | 3186 { |
| 3186 if (isAtomicInlineLevel()) { | 3187 if (isAtomicInlineLevel()) { |
| 3187 PositionWithAffinity position = positionForPointIfOutsideAtomicInlineLev el(point); | 3188 PositionWithAffinity position = positionForPointIfOutsideAtomicInlineLev el(point); |
| 3188 if (!position.isNull()) | 3189 if (!position.isNull()) |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3324 if (!rect.isEmpty()) | 3325 if (!rect.isEmpty()) |
| 3325 rects.append(rect); | 3326 rects.append(rect); |
| 3326 } | 3327 } |
| 3327 } | 3328 } |
| 3328 | 3329 |
| 3329 if (inlineElementContinuation) | 3330 if (inlineElementContinuation) |
| 3330 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in lineElementContinuation->containingBlock()->location() - location()), includeBlo ckOverflows); | 3331 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in lineElementContinuation->containingBlock()->location() - location()), includeBlo ckOverflows); |
| 3331 } | 3332 } |
| 3332 | 3333 |
| 3333 } // namespace blink | 3334 } // namespace blink |
| OLD | NEW |