Chromium Code Reviews| OLD | NEW |
|---|---|
| 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. All rights reserv ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. 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 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1069 gOverrideContainingBlockLogicalWidthMap->remove(this); | 1069 gOverrideContainingBlockLogicalWidthMap->remove(this); |
| 1070 clearOverrideContainingBlockContentLogicalHeight(); | 1070 clearOverrideContainingBlockContentLogicalHeight(); |
| 1071 } | 1071 } |
| 1072 | 1072 |
| 1073 void LayoutBox::clearOverrideContainingBlockContentLogicalHeight() | 1073 void LayoutBox::clearOverrideContainingBlockContentLogicalHeight() |
| 1074 { | 1074 { |
| 1075 if (gOverrideContainingBlockLogicalHeightMap) | 1075 if (gOverrideContainingBlockLogicalHeightMap) |
| 1076 gOverrideContainingBlockLogicalHeightMap->remove(this); | 1076 gOverrideContainingBlockLogicalHeightMap->remove(this); |
| 1077 } | 1077 } |
| 1078 | 1078 |
| 1079 LayoutUnit LayoutBox::overrideContainingBlockContentWidth() const | |
|
esprehn
2015/10/30 23:21:31
logical?
cbiesinger
2015/11/13 03:25:48
Elliott - no, these are the non-logical versions o
| |
| 1080 { | |
| 1081 return containingBlock()->isHorizontalWritingMode() ? overrideContainingBloc kContentLogicalWidth() : overrideContainingBlockContentLogicalHeight(); | |
| 1082 } | |
| 1083 | |
| 1084 LayoutUnit LayoutBox::overrideContainingBlockContentHeight() const | |
|
esprehn
2015/10/30 23:21:31
does this need the word Logical in it? that matche
| |
| 1085 { | |
| 1086 return containingBlock()->isHorizontalWritingMode() ? overrideContainingBloc kContentLogicalHeight() : overrideContainingBlockContentLogicalWidth(); | |
| 1087 } | |
| 1088 | |
| 1089 bool LayoutBox::hasOverrideContainingBlockWidth() const | |
| 1090 { | |
| 1091 return containingBlock()->isHorizontalWritingMode() ? hasOverrideContainingB lockLogicalHeight() : hasOverrideContainingBlockLogicalWidth(); | |
| 1092 } | |
| 1093 | |
| 1094 bool LayoutBox::hasOverrideContainingBlockHeight() const | |
| 1095 { | |
| 1096 return containingBlock()->isHorizontalWritingMode() ? hasOverrideContainingB lockLogicalHeight() : hasOverrideContainingBlockLogicalWidth(); | |
| 1097 } | |
| 1098 | |
| 1079 LayoutUnit LayoutBox::extraInlineOffset() const | 1099 LayoutUnit LayoutBox::extraInlineOffset() const |
| 1080 { | 1100 { |
| 1081 return gExtraInlineOffsetMap ? gExtraInlineOffsetMap->get(this) : LayoutUnit (); | 1101 return gExtraInlineOffsetMap ? gExtraInlineOffsetMap->get(this) : LayoutUnit (); |
| 1082 } | 1102 } |
| 1083 | 1103 |
| 1084 LayoutUnit LayoutBox::extraBlockOffset() const | 1104 LayoutUnit LayoutBox::extraBlockOffset() const |
| 1085 { | 1105 { |
| 1086 return gExtraBlockOffsetMap ? gExtraBlockOffsetMap->get(this) : LayoutUnit() ; | 1106 return gExtraBlockOffsetMap ? gExtraBlockOffsetMap->get(this) : LayoutUnit() ; |
| 1087 } | 1107 } |
| 1088 | 1108 |
| (...skipping 3747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4836 StyleImage* borderImage = style()->borderImage().image(); | 4856 StyleImage* borderImage = style()->borderImage().image(); |
| 4837 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded(); | 4857 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded(); |
| 4838 } | 4858 } |
| 4839 | 4859 |
| 4840 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const | 4860 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const |
| 4841 { | 4861 { |
| 4842 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr; | 4862 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr; |
| 4843 } | 4863 } |
| 4844 | 4864 |
| 4845 } // namespace blink | 4865 } // namespace blink |
| OLD | NEW |