Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 2474883002: logicalHeightWithVisibleOverflow() needs to include overhanging floats. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3887 matching lines...) Expand 10 before | Expand all | Expand 10 after
3898 3898
3899 LayoutUnit LayoutBlockFlow::nextFloatLogicalBottomBelowForBlock( 3899 LayoutUnit LayoutBlockFlow::nextFloatLogicalBottomBelowForBlock(
3900 LayoutUnit logicalHeight) const { 3900 LayoutUnit logicalHeight) const {
3901 if (!m_floatingObjects) 3901 if (!m_floatingObjects)
3902 return logicalHeight; 3902 return logicalHeight;
3903 3903
3904 return m_floatingObjects->findNextFloatLogicalBottomBelowForBlock( 3904 return m_floatingObjects->findNextFloatLogicalBottomBelowForBlock(
3905 logicalHeight); 3905 logicalHeight);
3906 } 3906 }
3907 3907
3908 LayoutUnit LayoutBlockFlow::logicalHeightWithVisibleOverflow() const {
3909 LayoutUnit logicalHeight = LayoutBlock::logicalHeightWithVisibleOverflow();
3910 return std::max(logicalHeight, lowestFloatLogicalBottom());
3911 }
3912
3908 Node* LayoutBlockFlow::nodeForHitTest() const { 3913 Node* LayoutBlockFlow::nodeForHitTest() const {
3909 // If we are in the margins of block elements that are part of a 3914 // If we are in the margins of block elements that are part of a
3910 // continuation we're actually still inside the enclosing element 3915 // continuation we're actually still inside the enclosing element
3911 // that was split. Use the appropriate inner node. 3916 // that was split. Use the appropriate inner node.
3912 return isAnonymousBlockContinuation() ? continuation()->node() : node(); 3917 return isAnonymousBlockContinuation() ? continuation()->node() : node();
3913 } 3918 }
3914 3919
3915 bool LayoutBlockFlow::hitTestChildren( 3920 bool LayoutBlockFlow::hitTestChildren(
3916 HitTestResult& result, 3921 HitTestResult& result,
3917 const HitTestLocation& locationInContainer, 3922 const HitTestLocation& locationInContainer,
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
4550 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 4555 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
4551 } 4556 }
4552 4557
4553 void LayoutBlockFlow::invalidateDisplayItemClients( 4558 void LayoutBlockFlow::invalidateDisplayItemClients(
4554 PaintInvalidationReason invalidationReason) const { 4559 PaintInvalidationReason invalidationReason) const {
4555 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( 4560 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
4556 invalidationReason); 4561 invalidationReason);
4557 } 4562 }
4558 4563
4559 } // namespace blink 4564 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.h ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698