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

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

Issue 1236793005: Always include floating children into visual overflow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: NeedsRebaselines (see the try job results of the previous patch set for expectation changes) Created 5 years, 5 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
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, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid e; 274 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid e;
275 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ; 275 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ;
276 276
277 virtual bool hasLineIfEmpty() const; 277 virtual bool hasLineIfEmpty() const;
278 278
279 bool simplifiedLayout(); 279 bool simplifiedLayout();
280 virtual void simplifiedNormalFlowLayout(); 280 virtual void simplifiedNormalFlowLayout();
281 281
282 public: 282 public:
283 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false); 283 virtual void computeOverflow(LayoutUnit oldClientAfterEdge);
284 protected: 284 protected:
285 virtual void addOverflowFromChildren(); 285 virtual void addOverflowFromChildren();
286 void addOverflowFromPositionedObjects(); 286 void addOverflowFromPositionedObjects();
287 void addOverflowFromBlockChildren(); 287 void addOverflowFromBlockChildren();
288 void addVisualOverflowFromTheme(); 288 void addVisualOverflowFromTheme();
289 289
290 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOff set) const override; 290 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOff set) const override;
291 291
292 void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOf fset) const override; 292 void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOf fset) const override;
293 293
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 // FIXME: This is temporary as we move code that accesses block flow 419 // FIXME: This is temporary as we move code that accesses block flow
420 // member variables out of LayoutBlock and into LayoutBlockFlow. 420 // member variables out of LayoutBlock and into LayoutBlockFlow.
421 friend class LayoutBlockFlow; 421 friend class LayoutBlockFlow;
422 }; 422 };
423 423
424 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 424 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
425 425
426 } // namespace blink 426 } // namespace blink
427 427
428 #endif // LayoutBlock_h 428 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/block/float/containing-block-change-compositing-expected.html ('k') | Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698