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

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

Issue 945003002: Remove LayoutState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: improve test 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
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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 void updateStaticInlinePositionForChild(RenderBox*); 110 void updateStaticInlinePositionForChild(RenderBox*);
111 111
112 static bool shouldSkipCreatingRunsForObject(RenderObject* obj) 112 static bool shouldSkipCreatingRunsForObject(RenderObject* obj)
113 { 113 {
114 return obj->isOutOfFlowPositioned() && !obj->style()->isOriginalDisplayI nlineType() && !obj->container()->isRenderInline(); 114 return obj->isOutOfFlowPositioned() && !obj->style()->isOriginalDisplayI nlineType() && !obj->container()->isRenderInline();
115 } 115 }
116 116
117 protected: 117 protected:
118 virtual void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&, Layo utUnit beforeEdge, LayoutUnit afterEdge); 118 virtual void layoutChildren(bool relayoutChildren, SubtreeLayoutScope&, Layo utUnit beforeEdge, LayoutUnit afterEdge);
119 119
120 virtual bool updateLogicalWidthAndColumnWidth() override;
121
122 void determineLogicalLeftPositionForChild(RenderBox* child); 120 void determineLogicalLeftPositionForChild(RenderBox* child);
123 121
124 private: 122 private:
125 void layoutBlockFlow(SubtreeLayoutScope&); 123 void layoutBlockFlow(SubtreeLayoutScope&);
126 124
127 void layoutBlockChild(RenderBox* child); 125 void layoutBlockChild(RenderBox* child);
128 void adjustPositionedBlock(RenderBox* child); 126 void adjustPositionedBlock(RenderBox* child);
129 127
130 RootInlineBox* createRootInlineBox(); 128 RootInlineBox* createRootInlineBox();
131 129
(...skipping 14 matching lines...) Expand all
146 protected: 144 protected:
147 friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos itionNewFloatOnLine, if we move those out from the private scope/add a helper to LineBreaker, we can remove this friend 145 friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos itionNewFloatOnLine, if we move those out from the private scope/add a helper to LineBreaker, we can remove this friend
148 friend class LineBreaker; 146 friend class LineBreaker;
149 }; 147 };
150 148
151 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); 149 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());
152 150
153 } // namespace blink 151 } // namespace blink
154 152
155 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_ 153 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCKFLOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698