| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 LayoutUnit pageLogicalHeight; | 318 LayoutUnit pageLogicalHeight; |
| 319 while (!done) | 319 while (!done) |
| 320 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; | 320 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; |
| 321 | 321 |
| 322 LayoutView* layoutView = view(); | 322 LayoutView* layoutView = view(); |
| 323 if (layoutView->layoutState()->pageLogicalHeight()) | 323 if (layoutView->layoutState()->pageLogicalHeight()) |
| 324 setPageLogicalOffset(layoutView->layoutState()->pageLogicalOffset(*this,
logicalTop())); | 324 setPageLogicalOffset(layoutView->layoutState()->pageLogicalOffset(*this,
logicalTop())); |
| 325 | 325 |
| 326 updateLayerTransformAfterLayout(); | 326 updateLayerTransformAfterLayout(); |
| 327 | 327 |
| 328 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 328 updateAfterLayout(); |
| 329 // we overflow or not. | |
| 330 updateScrollInfoAfterLayout(); | |
| 331 | 329 |
| 332 if (m_paintInvalidationLogicalTop != m_paintInvalidationLogicalBottom) { | 330 if (m_paintInvalidationLogicalTop != m_paintInvalidationLogicalBottom) { |
| 333 bool hasVisibleContent = style()->visibility() == VISIBLE; | 331 bool hasVisibleContent = style()->visibility() == VISIBLE; |
| 334 if (!hasVisibleContent) { | 332 if (!hasVisibleContent) { |
| 335 PaintLayer* layer = enclosingLayer(); | 333 PaintLayer* layer = enclosingLayer(); |
| 336 layer->updateDescendantDependentFlags(); | 334 layer->updateDescendantDependentFlags(); |
| 337 hasVisibleContent = layer->hasVisibleContent(); | 335 hasVisibleContent = layer->hasVisibleContent(); |
| 338 } | 336 } |
| 339 if (hasVisibleContent) | 337 if (hasVisibleContent) |
| 340 setShouldInvalidateOverflowForPaint(); | 338 setShouldInvalidateOverflowForPaint(); |
| (...skipping 2584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2925 // FIXME: Glyph overflow will get lost in this case, but not really a big de
al. | 2923 // FIXME: Glyph overflow will get lost in this case, but not really a big de
al. |
| 2926 GlyphOverflowAndFallbackFontsMap textBoxDataMap; | 2924 GlyphOverflowAndFallbackFontsMap textBoxDataMap; |
| 2927 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); it
!= lineBoxes.end(); ++it) { | 2925 for (ListHashSet<RootInlineBox*>::const_iterator it = lineBoxes.begin(); it
!= lineBoxes.end(); ++it) { |
| 2928 RootInlineBox* box = *it; | 2926 RootInlineBox* box = *it; |
| 2929 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap); | 2927 box->computeOverflow(box->lineTop(), box->lineBottom(), textBoxDataMap); |
| 2930 } | 2928 } |
| 2931 return childrenOverflowChanged; | 2929 return childrenOverflowChanged; |
| 2932 } | 2930 } |
| 2933 | 2931 |
| 2934 } // namespace blink | 2932 } // namespace blink |
| OLD | NEW |