| 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 LayoutUnit pageLogicalHeight; | 323 LayoutUnit pageLogicalHeight; |
| 324 while (!done) | 324 while (!done) |
| 325 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; | 325 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; |
| 326 | 326 |
| 327 LayoutView* layoutView = view(); | 327 LayoutView* layoutView = view(); |
| 328 if (layoutView->layoutState()->pageLogicalHeight()) | 328 if (layoutView->layoutState()->pageLogicalHeight()) |
| 329 setPageLogicalOffset(layoutView->layoutState()->pageLogicalOffset(*this,
logicalTop())); | 329 setPageLogicalOffset(layoutView->layoutState()->pageLogicalOffset(*this,
logicalTop())); |
| 330 | 330 |
| 331 updateLayerTransformAfterLayout(); | 331 updateLayerTransformAfterLayout(); |
| 332 | 332 |
| 333 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 333 updateAfterLayout(); |
| 334 // we overflow or not. | |
| 335 updateScrollInfoAfterLayout(); | |
| 336 | 334 |
| 337 if (m_paintInvalidationLogicalTop != m_paintInvalidationLogicalBottom) { | 335 if (m_paintInvalidationLogicalTop != m_paintInvalidationLogicalBottom) { |
| 338 bool hasVisibleContent = style()->visibility() == VISIBLE; | 336 bool hasVisibleContent = style()->visibility() == VISIBLE; |
| 339 if (!hasVisibleContent) { | 337 if (!hasVisibleContent) { |
| 340 PaintLayer* layer = enclosingLayer(); | 338 PaintLayer* layer = enclosingLayer(); |
| 341 layer->updateDescendantDependentFlags(); | 339 layer->updateDescendantDependentFlags(); |
| 342 hasVisibleContent = layer->hasVisibleContent(); | 340 hasVisibleContent = layer->hasVisibleContent(); |
| 343 } | 341 } |
| 344 if (hasVisibleContent) | 342 if (hasVisibleContent) |
| 345 setShouldInvalidateOverflowForPaint(); | 343 setShouldInvalidateOverflowForPaint(); |
| (...skipping 2686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3032 // FIXME: Glyph overflow will get lost in this case, but not really a big de
al. | 3030 // FIXME: Glyph overflow will get lost in this case, but not really a big de
al. |
| 3033 GlyphOverflowAndFallbackFontsMap textBoxDataMap; | 3031 GlyphOverflowAndFallbackFontsMap textBoxDataMap; |
| 3034 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); it
!= lineBoxes.end(); ++it) { | 3032 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); it
!= lineBoxes.end(); ++it) { |
| 3035 RootInlineBox* box = *it; | 3033 RootInlineBox* box = *it; |
| 3036 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap); | 3034 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap); |
| 3037 } | 3035 } |
| 3038 return childrenOverflowChanged; | 3036 return childrenOverflowChanged; |
| 3039 } | 3037 } |
| 3040 | 3038 |
| 3041 } // namespace blink | 3039 } // namespace blink |
| OLD | NEW |