Source/WebCore/rendering/RenderBlock.h - Issue 9371039: Merge 106150

Side by Side Diff: Source/WebCore/rendering/RenderBlock.h

Issue 9371039: Merge 106150 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/

Patch Set: Created 8 years, 10 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:

« no previous file with comments | « LayoutTests/fast/css-generated-content/resources/positioned-div-with-floating-after-content-crash-frame2.html ('k') | Source/WebCore/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 431 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
442	442

443 virtual const char* renderName() const;	443 virtual const char* renderName() const;

444	444

445 virtual bool isRenderBlock() const { return true; }	445 virtual bool isRenderBlock() const { return true; }

446 virtual bool isBlockFlow() const { return (!isInline() \|\| isReplaced()) && ! isTable(); }	446 virtual bool isBlockFlow() const { return (!isInline() \|\| isReplaced()) && ! isTable(); }

447 virtual bool isInlineBlockOrInlineTable() const { return isInline() && isRep laced(); }	447 virtual bool isInlineBlockOrInlineTable() const { return isInline() && isRep laced(); }

448	448

449 void makeChildrenNonInline(RenderObject* insertionPoint = 0);	449 void makeChildrenNonInline(RenderObject* insertionPoint = 0);

450 virtual void removeLeftoverAnonymousBlock(RenderBlock* child);	450 virtual void removeLeftoverAnonymousBlock(RenderBlock* child);

451	451

	452 static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* chi ld);

	453

452 virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.d irtyLinesFromChangedChild(this, child); }	454 virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.d irtyLinesFromChangedChild(this, child); }

453	455

454 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);	456 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);

455 void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* befo reChild);	457 void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* befo reChild);

456 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild);	458 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild);

457 virtual void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, R enderObject* beforeChild = 0);	459 virtual void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, R enderObject* beforeChild = 0);

458	460

459 virtual bool isSelfCollapsingBlock() const;	461 virtual bool isSelfCollapsingBlock() const;

460	462

461 virtual LayoutUnit collapsedMarginBefore() const { return maxPositiveMarginB efore() - maxNegativeMarginBefore(); }	463 virtual LayoutUnit collapsedMarginBefore() const { return maxPositiveMarginB efore() - maxNegativeMarginBefore(); }

(...skipping 617 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1079 static String string(const int value);	1081 static String string(const int value);

1080 };	1082 };

1081 template<> struct ValueToString<RenderBlock::FloatingObject*> {	1083 template<> struct ValueToString<RenderBlock::FloatingObject*> {

1082 static String string(const RenderBlock::FloatingObject*);	1084 static String string(const RenderBlock::FloatingObject*);

1083 };	1085 };

1084 #endif	1086 #endif

1085	1087

1086 } // namespace WebCore	1088 } // namespace WebCore

1087	1089

1088 #endif // RenderBlock_h	1090 #endif // RenderBlock_h

OLD	NEW