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

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

Issue 135043007: Remove default parameter from virtual layoutBlock function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/rendering/RenderRegion.h ('k') | no next file » | 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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 return; 278 return;
279 } 279 }
280 280
281 checkRegionStyle(); 281 checkRegionStyle();
282 updateRegionHasAutoLogicalHeightFlag(); 282 updateRegionHasAutoLogicalHeightFlag();
283 283
284 if (oldStyle && oldStyle->writingMode() != style()->writingMode()) 284 if (oldStyle && oldStyle->writingMode() != style()->writingMode())
285 m_flowThread->regionChangedWritingMode(this); 285 m_flowThread->regionChangedWritingMode(this);
286 } 286 }
287 287
288 void RenderRegion::layoutBlock(bool relayoutChildren, LayoutUnit) 288 void RenderRegion::layoutBlock(bool relayoutChildren)
289 { 289 {
290 RenderBlockFlow::layoutBlock(relayoutChildren); 290 RenderBlockFlow::layoutBlock(relayoutChildren);
291 291
292 if (isValid()) { 292 if (isValid()) {
293 LayoutRect oldRegionRect(flowThreadPortionRect()); 293 LayoutRect oldRegionRect(flowThreadPortionRect());
294 if (!isHorizontalWritingMode()) 294 if (!isHorizontalWritingMode())
295 oldRegionRect = oldRegionRect.transposedRect(); 295 oldRegionRect = oldRegionRect.transposedRect();
296 296
297 if (hasAutoLogicalHeight() && !m_flowThread->inConstrainedLayoutPhase()) { 297 if (hasAutoLogicalHeight() && !m_flowThread->inConstrainedLayoutPhase()) {
298 m_flowThread->invalidateRegions(); 298 m_flowThread->invalidateRegions();
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 return generatingNode(); 679 return generatingNode();
680 } 680 }
681 681
682 bool RenderRegion::isElementBasedRegion() const 682 bool RenderRegion::isElementBasedRegion() const
683 { 683 {
684 Node* node = nodeForRegion(); 684 Node* node = nodeForRegion();
685 return node && node->isElementNode() && !node->isPseudoElement(); 685 return node && node->isElementNode() && !node->isPseudoElement();
686 } 686 }
687 687
688 } // namespace WebCore 688 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderRegion.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698