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

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

Issue 1106533002: Formatting contexts should always expand to enclose floats (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 5 years, 6 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/FloatingObjects.cpp ('k') | 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 child->y() + child->layoutObject()->marginTop()); 235 child->y() + child->layoutObject()->marginTop());
236 } 236 }
237 237
238 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay outPoint&) const; 238 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay outPoint&) const;
239 239
240 virtual const char* name() const override { return "LayoutBlockFlow"; } 240 virtual const char* name() const override { return "LayoutBlockFlow"; }
241 241
242 protected: 242 protected:
243 void rebuildFloatsFromIntruding(); 243 void rebuildFloatsFromIntruding();
244 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); 244 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge);
245 void addLowestFloatFromChildren(LayoutBlockFlow*);
245 246
246 void createFloatingObjects(); 247 void createFloatingObjects();
247 248
248 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override; 249 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
249 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 250 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
250 251
251 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, LayoutBox& ); 252 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, LayoutBox& );
252 253
253 void addOverflowFromFloats(); 254 void addOverflowFromFloats();
254 255
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 540
540 // END METHODS DEFINED IN LayoutBlockFlowLine 541 // END METHODS DEFINED IN LayoutBlockFlowLine
541 542
542 }; 543 };
543 544
544 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 545 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
545 546
546 } // namespace blink 547 } // namespace blink
547 548
548 #endif // LayoutBlockFlow_h 549 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « Source/core/layout/FloatingObjects.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698