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

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

Issue 2515303003: Move stuff from layoutBlockFlow() into new method addOverhangingFloatsFromChildren(). (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 const HitTestLocation& locationInContainer, 472 const HitTestLocation& locationInContainer,
473 const LayoutPoint& accumulatedOffset, 473 const LayoutPoint& accumulatedOffset,
474 HitTestAction) override; 474 HitTestAction) override;
475 475
476 LayoutSize accumulateInFlowPositionOffsets() const override; 476 LayoutSize accumulateInFlowPositionOffsets() const override;
477 477
478 private: 478 private:
479 bool layoutBlockFlow(bool relayoutChildren, 479 bool layoutBlockFlow(bool relayoutChildren,
480 LayoutUnit& pageLogicalHeight, 480 LayoutUnit& pageLogicalHeight,
481 SubtreeLayoutScope&); 481 SubtreeLayoutScope&);
482 void addOverhangingFloatsFromChildren(LayoutUnit unconstrainedHeight);
482 void layoutBlockChildren(bool relayoutChildren, 483 void layoutBlockChildren(bool relayoutChildren,
483 SubtreeLayoutScope&, 484 SubtreeLayoutScope&,
484 LayoutUnit beforeEdge, 485 LayoutUnit beforeEdge,
485 LayoutUnit afterEdge); 486 LayoutUnit afterEdge);
486 487
487 void markDescendantsWithFloatsForLayoutIfNeeded( 488 void markDescendantsWithFloatsForLayoutIfNeeded(
488 LayoutBlockFlow& child, 489 LayoutBlockFlow& child,
489 LayoutUnit newLogicalTop, 490 LayoutUnit newLogicalTop,
490 LayoutUnit previousFloatLogicalBottom); 491 LayoutUnit previousFloatLogicalBottom);
491 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, 492 bool positionAndLayoutOnceIfNeeded(LayoutBox& child,
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 void positionDialog(); 944 void positionDialog();
944 945
945 // END METHODS DEFINED IN LayoutBlockFlowLine 946 // END METHODS DEFINED IN LayoutBlockFlowLine
946 }; 947 };
947 948
948 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 949 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
949 950
950 } // namespace blink 951 } // namespace blink
951 952
952 #endif // LayoutBlockFlow_h 953 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698