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: Source/core/rendering/RenderBlockFlow.h

Issue 944923004: rendering/RenderBoxModelObject -> layout/LayoutBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBlockFlow.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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 LayoutRect blockSelectionGap(const RenderBlock* rootBlock, const LayoutPoint & rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, 199 LayoutRect blockSelectionGap(const RenderBlock* rootBlock, const LayoutPoint & rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
200 LayoutUnit lastLogicalTop, LayoutUnit lastLogicalLeft, LayoutUnit lastLo gicalRight, LayoutUnit logicalBottom, const PaintInfo*) const; 200 LayoutUnit lastLogicalTop, LayoutUnit lastLogicalLeft, LayoutUnit lastLo gicalRight, LayoutUnit logicalBottom, const PaintInfo*) const;
201 201
202 LayoutUnit paginationStrut() const { return m_rareData ? m_rareData->m_pagin ationStrut : LayoutUnit(); } 202 LayoutUnit paginationStrut() const { return m_rareData ? m_rareData->m_pagin ationStrut : LayoutUnit(); }
203 void setPaginationStrut(LayoutUnit); 203 void setPaginationStrut(LayoutUnit);
204 204
205 void positionSpannerDescendant(LayoutMultiColumnSpannerPlaceholder& child); 205 void positionSpannerDescendant(LayoutMultiColumnSpannerPlaceholder& child);
206 206
207 virtual bool avoidsFloats() const override; 207 virtual bool avoidsFloats() const override;
208 208
209 using RenderBoxModelObject::moveChildrenTo; 209 using LayoutBoxModelObject::moveChildrenTo;
210 virtual void moveChildrenTo(RenderBoxModelObject* toBoxModelObject, LayoutOb ject* startChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRe moveInsert = false) override; 210 virtual void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutOb ject* startChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRe moveInsert = false) override;
211 211
212 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con st 212 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) con st
213 { 213 {
214 if (isHorizontalWritingMode()) 214 if (isHorizontalWritingMode())
215 return child->x() + child->renderer()->marginLeft(); 215 return child->x() + child->renderer()->marginLeft();
216 216
217 return child->x() + marginBeforeForChild(*(child->renderer())); 217 return child->x() + marginBeforeForChild(*(child->renderer()));
218 } 218 }
219 219
220 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con st 220 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject* child) con st
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 537
538 // END METHODS DEFINED IN RenderBlockLineLayout 538 // END METHODS DEFINED IN RenderBlockLineLayout
539 539
540 }; 540 };
541 541
542 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); 542 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());
543 543
544 } // namespace blink 544 } // namespace blink
545 545
546 #endif // RenderBlockFlow_h 546 #endif // RenderBlockFlow_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698