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

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

Issue 2559443002: Let LayoutBlockFlow::removeFloatingObject take LayoutUnit instead of int. (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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 BlockChildrenLayoutInfo&); 498 BlockChildrenLayoutInfo&);
499 499
500 void layoutBlockChild(LayoutBox& child, BlockChildrenLayoutInfo&); 500 void layoutBlockChild(LayoutBox& child, BlockChildrenLayoutInfo&);
501 void adjustPositionedBlock(LayoutBox& child, const BlockChildrenLayoutInfo&); 501 void adjustPositionedBlock(LayoutBox& child, const BlockChildrenLayoutInfo&);
502 void adjustFloatingBlock(const MarginInfo&); 502 void adjustFloatingBlock(const MarginInfo&);
503 503
504 LayoutPoint computeLogicalLocationForFloat(const FloatingObject&, 504 LayoutPoint computeLogicalLocationForFloat(const FloatingObject&,
505 LayoutUnit logicalTopOffset) const; 505 LayoutUnit logicalTopOffset) const;
506 506
507 void removeFloatingObject(LayoutBox*); 507 void removeFloatingObject(LayoutBox*);
508 void removeFloatingObjectsBelow(FloatingObject*, int logicalOffset); 508 void removeFloatingObjectsBelow(FloatingObject*, LayoutUnit logicalOffset);
509 509
510 LayoutUnit getClearDelta(LayoutBox* child, LayoutUnit yPos); 510 LayoutUnit getClearDelta(LayoutBox* child, LayoutUnit yPos);
511 511
512 bool hasOverhangingFloat(LayoutBox*); 512 bool hasOverhangingFloat(LayoutBox*);
513 void addIntrudingFloats(LayoutBlockFlow* prev, 513 void addIntrudingFloats(LayoutBlockFlow* prev,
514 LayoutUnit xoffset, 514 LayoutUnit xoffset,
515 LayoutUnit yoffset); 515 LayoutUnit yoffset);
516 void addOverhangingFloats(LayoutBlockFlow* child, 516 void addOverhangingFloats(LayoutBlockFlow* child,
517 bool makeChildPaintOtherFloats); 517 bool makeChildPaintOtherFloats);
518 518
(...skipping 426 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
« 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