| 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 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1029 clipRect.contract(0, height() - valueForLength(style()->clipBottom(), he
ight())); | 1029 clipRect.contract(0, height() - valueForLength(style()->clipBottom(), he
ight())); |
| 1030 | 1030 |
| 1031 return clipRect; | 1031 return clipRect; |
| 1032 } | 1032 } |
| 1033 | 1033 |
| 1034 LayoutUnit RenderBox::containingBlockLogicalHeightForContent(AvailableLogicalHei
ghtType heightType) const | 1034 LayoutUnit RenderBox::containingBlockLogicalHeightForContent(AvailableLogicalHei
ghtType heightType) const |
| 1035 { | 1035 { |
| 1036 return containingBlock()->availableLogicalHeight(heightType); | 1036 return containingBlock()->availableLogicalHeight(heightType); |
| 1037 } | 1037 } |
| 1038 | 1038 |
| 1039 void RenderBox::mapLocalToContainer(const RenderLayerModelObject* paintInvalidat
ionContainer, TransformState& transformState, MapCoordinatesFlags mode, const Pa
intInvalidationState* paintInvalidationState) const | 1039 void RenderBox::mapLocalToContainer(const RenderLayerModelObject* paintInvalidat
ionContainer, TransformState& transformState, MapCoordinatesFlags mode) const |
| 1040 { | 1040 { |
| 1041 if (paintInvalidationContainer == this) | 1041 if (paintInvalidationContainer == this) |
| 1042 return; | 1042 return; |
| 1043 | 1043 |
| 1044 if (paintInvalidationState && paintInvalidationState->canMapToContainer(pain
tInvalidationContainer)) { | |
| 1045 LayoutSize offset = paintInvalidationState->paintOffset() + locationOffs
et(); | |
| 1046 if (style()->hasInFlowPosition() && layer()) | |
| 1047 offset += layer()->offsetForInFlowPosition(); | |
| 1048 transformState.move(offset); | |
| 1049 return; | |
| 1050 } | |
| 1051 | |
| 1052 bool containerSkipped; | 1044 bool containerSkipped; |
| 1053 RenderObject* o = container(paintInvalidationContainer, &containerSkipped); | 1045 RenderObject* o = container(paintInvalidationContainer, &containerSkipped); |
| 1054 if (!o) | 1046 if (!o) |
| 1055 return; | 1047 return; |
| 1056 | 1048 |
| 1057 LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(trans
formState.mappedPoint())); | 1049 LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(trans
formState.mappedPoint())); |
| 1058 | 1050 |
| 1059 bool preserve3D = mode & UseTransforms && (o->style()->preserves3D() || styl
e()->preserves3D()); | 1051 bool preserve3D = mode & UseTransforms && (o->style()->preserves3D() || styl
e()->preserves3D()); |
| 1060 if (mode & UseTransforms && shouldUseTransformFromContainer(o)) { | 1052 if (mode & UseTransforms && shouldUseTransformFromContainer(o)) { |
| 1061 TransformationMatrix t; | 1053 TransformationMatrix t; |
| (...skipping 2073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3135 | 3127 |
| 3136 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 3128 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 3137 { | 3129 { |
| 3138 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); | 3130 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 3139 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 3131 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 3140 ASSERT(hasBackground == style.hasBackground()); | 3132 ASSERT(hasBackground == style.hasBackground()); |
| 3141 hasBorder = style.hasBorder(); | 3133 hasBorder = style.hasBorder(); |
| 3142 } | 3134 } |
| 3143 | 3135 |
| 3144 } // namespace blink | 3136 } // namespace blink |
| OLD | NEW |