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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 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, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 gPositionedContainerMap = new TrackedContainerMap; 980 gPositionedContainerMap = new TrackedContainerMap;
981 } 981 }
982 gPositionedContainerMap->set(o, this); 982 gPositionedContainerMap->set(o, this);
983 983
984 if (!gPositionedDescendantsMap) 984 if (!gPositionedDescendantsMap)
985 gPositionedDescendantsMap = new TrackedDescendantsMap; 985 gPositionedDescendantsMap = new TrackedDescendantsMap;
986 TrackedLayoutBoxListHashSet* descendantSet = 986 TrackedLayoutBoxListHashSet* descendantSet =
987 gPositionedDescendantsMap->get(this); 987 gPositionedDescendantsMap->get(this);
988 if (!descendantSet) { 988 if (!descendantSet) {
989 descendantSet = new TrackedLayoutBoxListHashSet; 989 descendantSet = new TrackedLayoutBoxListHashSet;
990 gPositionedDescendantsMap->set(this, wrapUnique(descendantSet)); 990 gPositionedDescendantsMap->set(this, WTF::wrapUnique(descendantSet));
991 } 991 }
992 descendantSet->add(o); 992 descendantSet->add(o);
993 993
994 m_hasPositionedObjects = true; 994 m_hasPositionedObjects = true;
995 } 995 }
996 996
997 void LayoutBlock::removePositionedObject(LayoutBox* o) { 997 void LayoutBlock::removePositionedObject(LayoutBox* o) {
998 if (!gPositionedContainerMap) 998 if (!gPositionedContainerMap)
999 return; 999 return;
1000 1000
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 descendant->removeFromPercentHeightContainer(); 1084 descendant->removeFromPercentHeightContainer();
1085 } 1085 }
1086 descendant->setPercentHeightContainer(this); 1086 descendant->setPercentHeightContainer(this);
1087 1087
1088 if (!gPercentHeightDescendantsMap) 1088 if (!gPercentHeightDescendantsMap)
1089 gPercentHeightDescendantsMap = new TrackedDescendantsMap; 1089 gPercentHeightDescendantsMap = new TrackedDescendantsMap;
1090 TrackedLayoutBoxListHashSet* descendantSet = 1090 TrackedLayoutBoxListHashSet* descendantSet =
1091 gPercentHeightDescendantsMap->get(this); 1091 gPercentHeightDescendantsMap->get(this);
1092 if (!descendantSet) { 1092 if (!descendantSet) {
1093 descendantSet = new TrackedLayoutBoxListHashSet; 1093 descendantSet = new TrackedLayoutBoxListHashSet;
1094 gPercentHeightDescendantsMap->set(this, wrapUnique(descendantSet)); 1094 gPercentHeightDescendantsMap->set(this, WTF::wrapUnique(descendantSet));
1095 } 1095 }
1096 descendantSet->add(descendant); 1096 descendantSet->add(descendant);
1097 1097
1098 m_hasPercentHeightDescendants = true; 1098 m_hasPercentHeightDescendants = true;
1099 } 1099 }
1100 1100
1101 void LayoutBlock::removePercentHeightDescendant(LayoutBox* descendant) { 1101 void LayoutBlock::removePercentHeightDescendant(LayoutBox* descendant) {
1102 if (TrackedLayoutBoxListHashSet* descendants = percentHeightDescendants()) { 1102 if (TrackedLayoutBoxListHashSet* descendants = percentHeightDescendants()) {
1103 descendants->remove(descendant); 1103 descendants->remove(descendant);
1104 descendant->setPercentHeightContainer(nullptr); 1104 descendant->setPercentHeightContainer(nullptr);
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after
2198 } 2198 }
2199 2199
2200 return availableHeight; 2200 return availableHeight;
2201 } 2201 }
2202 2202
2203 bool LayoutBlock::hasDefiniteLogicalHeight() const { 2203 bool LayoutBlock::hasDefiniteLogicalHeight() const {
2204 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); 2204 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
2205 } 2205 }
2206 2206
2207 } // namespace blink 2207 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698