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

Side by Side Diff: sky/engine/core/rendering/RenderBlockFlow.h

Issue 754493002: Start splitting RenderParagraph logic out of RenderBlock (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: preland Created 6 years 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-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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 LayoutUnit startAlignedOffsetForLine(bool shouldIndentText); 108 LayoutUnit startAlignedOffsetForLine(bool shouldIndentText);
109 109
110 void setStaticInlinePositionForChild(RenderBox*, LayoutUnit inlinePosition); 110 void setStaticInlinePositionForChild(RenderBox*, LayoutUnit inlinePosition);
111 void updateStaticInlinePositionForChild(RenderBox*); 111 void updateStaticInlinePositionForChild(RenderBox*);
112 112
113 static bool shouldSkipCreatingRunsForObject(RenderObject* obj) 113 static bool shouldSkipCreatingRunsForObject(RenderObject* obj)
114 { 114 {
115 return obj->isOutOfFlowPositioned() && !obj->style()->isOriginalDisplayI nlineType() && !obj->container()->isRenderInline(); 115 return obj->isOutOfFlowPositioned() && !obj->style()->isOriginalDisplayI nlineType() && !obj->container()->isRenderInline();
116 } 116 }
117 117
118 void addOverflowFromInlineChildren();
119
120 // FIXME: This should be const to avoid a const_cast, but can modify child d irty bits 118 // FIXME: This should be const to avoid a const_cast, but can modify child d irty bits
121 void computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, Layout Unit& maxLogicalWidth); 119 void computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, Layout Unit& maxLogicalWidth);
122 120
123 GapRects inlineSelectionGaps(RenderBlock* rootBlock, const LayoutPoint& root BlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, 121 GapRects inlineSelectionGaps(RenderBlock* rootBlock, const LayoutPoint& root BlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
124 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& las tLogicalRight, const PaintInfo*); 122 LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& las tLogicalRight, const PaintInfo*);
125 123
126 protected: 124 protected:
127 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); 125 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge);
128 126
129 virtual bool updateLogicalWidthAndColumnWidth() override; 127 virtual bool updateLogicalWidthAndColumnWidth() override;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 196
199 // END METHODS DEFINED IN RenderBlockLineLayout 197 // END METHODS DEFINED IN RenderBlockLineLayout
200 198
201 }; 199 };
202 200
203 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); 201 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());
204 202
205 } // namespace blink 203 } // namespace blink
206 204
207 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_ 205 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698