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

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

Issue 2553833002: Refactor layoutBlock() and layoutBlockFlow(). Happens to fix bugs. (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
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 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 Node* nodeForHitTest() const final; 470 Node* nodeForHitTest() const final;
471 bool hitTestChildren(HitTestResult&, 471 bool hitTestChildren(HitTestResult&,
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 void resetLayout(); 479 void resetLayout();
480 void layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); 480 void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&);
481 void addOverhangingFloatsFromChildren(LayoutUnit unconstrainedHeight); 481 void addOverhangingFloatsFromChildren(LayoutUnit unconstrainedHeight);
482 void layoutBlockChildren(bool relayoutChildren, 482 void layoutBlockChildren(bool relayoutChildren,
483 SubtreeLayoutScope&, 483 SubtreeLayoutScope&,
484 LayoutUnit beforeEdge, 484 LayoutUnit beforeEdge,
485 LayoutUnit afterEdge); 485 LayoutUnit afterEdge);
486 486
487 void markDescendantsWithFloatsForLayoutIfNeeded( 487 void markDescendantsWithFloatsForLayoutIfNeeded(
488 LayoutBlockFlow& child, 488 LayoutBlockFlow& child,
489 LayoutUnit newLogicalTop, 489 LayoutUnit newLogicalTop,
490 LayoutUnit previousFloatLogicalBottom); 490 LayoutUnit previousFloatLogicalBottom);
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 void positionDialog(); 945 void positionDialog();
946 946
947 // END METHODS DEFINED IN LayoutBlockFlowLine 947 // END METHODS DEFINED IN LayoutBlockFlowLine
948 }; 948 };
949 949
950 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 950 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
951 951
952 } // namespace blink 952 } // namespace blink
953 953
954 #endif // LayoutBlockFlow_h 954 #endif // LayoutBlockFlow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698