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

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

Issue 19865002: [CSS Shapes] Port shape-inside on regions and shape's content overflow from WebKit (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: [CSS Shapes] Port shape-inside on regions and shape's content overflow from WebKit Created 7 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
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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 LayoutUnit estimateLogicalTopPosition(RenderBox* child, const MarginInfo&, L ayoutUnit& estimateWithoutPagination); 1073 LayoutUnit estimateLogicalTopPosition(RenderBox* child, const MarginInfo&, L ayoutUnit& estimateWithoutPagination);
1074 void marginBeforeEstimateForChild(RenderBox*, LayoutUnit&, LayoutUnit&, bool &) const; 1074 void marginBeforeEstimateForChild(RenderBox*, LayoutUnit&, LayoutUnit&, bool &) const;
1075 void handleAfterSideOfBlock(LayoutUnit top, LayoutUnit bottom, MarginInfo&); 1075 void handleAfterSideOfBlock(LayoutUnit top, LayoutUnit bottom, MarginInfo&);
1076 void setCollapsedBottomMargin(const MarginInfo&); 1076 void setCollapsedBottomMargin(const MarginInfo&);
1077 // End helper functions and structs used by layoutBlockChildren. 1077 // End helper functions and structs used by layoutBlockChildren.
1078 1078
1079 // Helper function for layoutInlineChildren() 1079 // Helper function for layoutInlineChildren()
1080 RootInlineBox* createLineBoxesFromBidiRuns(BidiRunList<BidiRun>&, const Inli neIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, W ordMeasurements&); 1080 RootInlineBox* createLineBoxesFromBidiRuns(BidiRunList<BidiRun>&, const Inli neIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun, W ordMeasurements&);
1081 void layoutRunsAndFloats(LineLayoutState&, bool hasInlineChild); 1081 void layoutRunsAndFloats(LineLayoutState&, bool hasInlineChild);
1082 void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines); 1082 void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&, const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus, unsigned consecutiveHyphenatedLines);
1083 void updateShapeAndSegmentsForCurrentLine(ShapeInsideInfo*&, LayoutUnit&, Li neLayoutState&);
1084 void updateShapeAndSegmentsForCurrentLineInFlowThread(ShapeInsideInfo*&, Lin eLayoutState&);
1085 bool adjustLogicalLineTopAndLogicalHeightIfNeeded(ShapeInsideInfo*, LayoutUn it, LineLayoutState&, InlineBidiResolver&, FloatingObject*, InlineIterator&, Wor dMeasurements&);
1083 const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogica lHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine , InlineBidiResolver&, const InlineIterator&); 1086 const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogica lHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine , InlineBidiResolver&, const InlineIterator&);
1084 void linkToEndLineIfNeeded(LineLayoutState&); 1087 void linkToEndLineIfNeeded(LineLayoutState&);
1085 static void repaintDirtyFloats(Vector<FloatWithRect>& floats); 1088 static void repaintDirtyFloats(Vector<FloatWithRect>& floats);
1086 1089
1087 protected: 1090 protected:
1088 void determineLogicalLeftPositionForChild(RenderBox* child, ApplyLayoutDelta Mode = DoNotApplyLayoutDelta); 1091 void determineLogicalLeftPositionForChild(RenderBox* child, ApplyLayoutDelta Mode = DoNotApplyLayoutDelta);
1089 1092
1090 // Pagination routines. 1093 // Pagination routines.
1091 virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, Layou tUnit pageLogicalHeight, LayoutStateMaintainer&); 1094 virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, Layou tUnit pageLogicalHeight, LayoutStateMaintainer&);
1092 1095
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 static String string(const int value); 1348 static String string(const int value);
1346 }; 1349 };
1347 template<> struct ValueToString<RenderBlock::FloatingObject*> { 1350 template<> struct ValueToString<RenderBlock::FloatingObject*> {
1348 static String string(const RenderBlock::FloatingObject*); 1351 static String string(const RenderBlock::FloatingObject*);
1349 }; 1352 };
1350 #endif 1353 #endif
1351 1354
1352 } // namespace WebCore 1355 } // namespace WebCore
1353 1356
1354 #endif // RenderBlock_h 1357 #endif // RenderBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698