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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2458003002: Remove ASSERT_WITH_SECURITY_IMPLICATION. (Closed)
Patch Set: Minor formatting fix Created 4 years, 1 month 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 3377 matching lines...) Expand 10 before | Expand all | Expand 10 after
3388 stretchedHeight = 3388 stretchedHeight =
3389 toLayoutFlexibleBox(block->parent()) 3389 toLayoutFlexibleBox(block->parent())
3390 ->childLogicalHeightForPercentageResolution(*block); 3390 ->childLogicalHeightForPercentageResolution(*block);
3391 else if (block->isGridItem() && 3391 else if (block->isGridItem() &&
3392 block->hasOverrideLogicalContentHeight()) 3392 block->hasOverrideLogicalContentHeight())
3393 stretchedHeight = block->overrideLogicalContentHeight(); 3393 stretchedHeight = block->overrideLogicalContentHeight();
3394 } 3394 }
3395 3395
3396 if (cb->isOutOfFlowPositioned() && cb->style()->height().isAuto() && 3396 if (cb->isOutOfFlowPositioned() && cb->style()->height().isAuto() &&
3397 !(cb->style()->top().isAuto() || cb->style()->bottom().isAuto())) { 3397 !(cb->style()->top().isAuto() || cb->style()->bottom().isAuto())) {
3398 ASSERT_WITH_SECURITY_IMPLICATION(cb->isLayoutBlock()); 3398 SECURITY_DCHECK(cb->isLayoutBlock());
3399 LayoutBlock* block = toLayoutBlock(cb); 3399 LayoutBlock* block = toLayoutBlock(cb);
3400 LogicalExtentComputedValues computedValues; 3400 LogicalExtentComputedValues computedValues;
3401 block->computeLogicalHeight(block->logicalHeight(), LayoutUnit(), 3401 block->computeLogicalHeight(block->logicalHeight(), LayoutUnit(),
3402 computedValues); 3402 computedValues);
3403 LayoutUnit newContentHeight = computedValues.m_extent - 3403 LayoutUnit newContentHeight = computedValues.m_extent -
3404 block->borderAndPaddingLogicalHeight() - 3404 block->borderAndPaddingLogicalHeight() -
3405 block->scrollbarLogicalHeight(); 3405 block->scrollbarLogicalHeight();
3406 LayoutUnit newHeight = 3406 LayoutUnit newHeight =
3407 block->adjustContentBoxLogicalHeightForBoxSizing(newContentHeight); 3407 block->adjustContentBoxLogicalHeightForBoxSizing(newContentHeight);
3408 return adjustContentBoxLogicalHeightForBoxSizing( 3408 return adjustContentBoxLogicalHeightForBoxSizing(
(...skipping 2186 matching lines...) Expand 10 before | Expand all | Expand 10 after
5595 LayoutRect rect = frameRect(); 5595 LayoutRect rect = frameRect();
5596 5596
5597 LayoutBlock* block = containingBlock(); 5597 LayoutBlock* block = containingBlock();
5598 if (block) 5598 if (block)
5599 block->adjustChildDebugRect(rect); 5599 block->adjustChildDebugRect(rect);
5600 5600
5601 return rect; 5601 return rect;
5602 } 5602 }
5603 5603
5604 } // namespace blink 5604 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698