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

Side by Side Diff: Source/core/rendering/RenderDeprecatedFlexibleBox.cpp

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Zoltan's comments Created 6 years, 9 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 * This file is part of the render object implementation for KHTML. 2 * This file is part of the render object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * Copyright (C) 2003 Apple Computer, Inc. 6 * Copyright (C) 2003 Apple Computer, Inc.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 256
257 if (!relayoutChildren && simplifiedLayout()) 257 if (!relayoutChildren && simplifiedLayout())
258 return; 258 return;
259 259
260 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); 260 LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
261 261
262 { 262 {
263 // LayoutStateMaintainer needs this deliberate scope to pop before repai nt 263 // LayoutStateMaintainer needs this deliberate scope to pop before repai nt
264 LayoutStateMaintainer statePusher(*this, locationOffset()); 264 LayoutStateMaintainer statePusher(*this, locationOffset());
265 265
266 RenderFlowThread* flowThread = flowThreadContainingBlock();
267 if (updateRegionsAndShapesLogicalSize(flowThread))
268 relayoutChildren = true;
269
270 LayoutSize previousSize = size(); 266 LayoutSize previousSize = size();
271 267
272 updateLogicalWidth(); 268 updateLogicalWidth();
273 updateLogicalHeight(); 269 updateLogicalHeight();
274 270
275 if (previousSize != size() 271 if (previousSize != size()
276 || (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOri ent() == HORIZONTAL 272 || (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOri ent() == HORIZONTAL
277 && parent()->style()->boxAlign() == BSTRETCH)) 273 && parent()->style()->boxAlign() == BSTRETCH))
278 relayoutChildren = true; 274 relayoutChildren = true;
279 275
280 setHeight(0); 276 setHeight(0);
281 277
282 m_stretchingChildren = false; 278 m_stretchingChildren = false;
283 279
284 if (isHorizontal()) 280 if (isHorizontal())
285 layoutHorizontalBox(relayoutChildren); 281 layoutHorizontalBox(relayoutChildren);
286 else 282 else
287 layoutVerticalBox(relayoutChildren); 283 layoutVerticalBox(relayoutChildren);
288 284
289 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); 285 LayoutUnit oldClientAfterEdge = clientLogicalBottom();
290 updateLogicalHeight(); 286 updateLogicalHeight();
291 287
292 if (previousSize.height() != height()) 288 if (previousSize.height() != height())
293 relayoutChildren = true; 289 relayoutChildren = true;
294 290
295 layoutPositionedObjects(relayoutChildren || isRoot()); 291 layoutPositionedObjects(relayoutChildren || isRoot());
296 292
297 computeRegionRangeForBlock(flowThread); 293 computeRegionRangeForBlock(flowThreadContainingBlock());
298 294
299 computeOverflow(oldClientAfterEdge); 295 computeOverflow(oldClientAfterEdge);
300 } 296 }
301 297
302 updateLayerTransform(); 298 updateLayerTransform();
303 299
304 if (view()->layoutState()->pageLogicalHeight()) 300 if (view()->layoutState()->pageLogicalHeight())
305 setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(*this, log icalTop())); 301 setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(*this, log icalTop()));
306 302
307 // Update our scrollbars if we're overflow:auto/scroll/hidden now that we kn ow if 303 // Update our scrollbars if we're overflow:auto/scroll/hidden now that we kn ow if
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 if (isPseudoElement()) 1076 if (isPseudoElement())
1081 return "RenderDeprecatedFlexibleBox (generated)"; 1077 return "RenderDeprecatedFlexibleBox (generated)";
1082 if (isAnonymous()) 1078 if (isAnonymous())
1083 return "RenderDeprecatedFlexibleBox (generated)"; 1079 return "RenderDeprecatedFlexibleBox (generated)";
1084 if (isRelPositioned()) 1080 if (isRelPositioned())
1085 return "RenderDeprecatedFlexibleBox (relative positioned)"; 1081 return "RenderDeprecatedFlexibleBox (relative positioned)";
1086 return "RenderDeprecatedFlexibleBox"; 1082 return "RenderDeprecatedFlexibleBox";
1087 } 1083 }
1088 1084
1089 } // namespace WebCore 1085 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698