| 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 bool hadTransform = m_transform; | 179 bool hadTransform = m_transform; |
| 180 if (localHasTransform != hadTransform) { | 180 if (localHasTransform != hadTransform) { |
| 181 if (localHasTransform) | 181 if (localHasTransform) |
| 182 m_transform = adoptPtr(new TransformationMatrix); | 182 m_transform = adoptPtr(new TransformationMatrix); |
| 183 else | 183 else |
| 184 m_transform.clear(); | 184 m_transform.clear(); |
| 185 | 185 |
| 186 // Layers with transforms act as clip rects roots, so clear the cached c
lip rects here. | 186 // Layers with transforms act as clip rects roots, so clear the cached c
lip rects here. |
| 187 if (layer()) | 187 if (layer()) |
| 188 layer()->clipper().clearClipRectsIncludingDescendants(); | 188 layer()->clipper().clearClipRectsIncludingDescendants(); |
| 189 } else if (localHasTransform && layer()) { | |
| 190 layer()->clipper().clearClipRectsIncludingDescendants(AbsoluteClipRects)
; | |
| 191 } | 189 } |
| 192 | 190 |
| 193 updateTransformationMatrix(); | 191 updateTransformationMatrix(); |
| 194 | 192 |
| 195 if (layer() && had3DTransform != has3DTransform()) | 193 if (layer() && had3DTransform != has3DTransform()) |
| 196 layer()->dirty3DTransformedDescendantStatus(); | 194 layer()->dirty3DTransformedDescendantStatus(); |
| 197 } | 195 } |
| 198 | 196 |
| 199 // TODO(ojan): Inline this into styleDidChange, | 197 // TODO(ojan): Inline this into styleDidChange, |
| 200 void RenderBox::updateFromStyle() | 198 void RenderBox::updateFromStyle() |
| (...skipping 2874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3075 | 3073 |
| 3076 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 3074 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 3077 { | 3075 { |
| 3078 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); | 3076 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 3079 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 3077 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 3080 ASSERT(hasBackground == style.hasBackground()); | 3078 ASSERT(hasBackground == style.hasBackground()); |
| 3081 hasBorder = style.hasBorder(); | 3079 hasBorder = style.hasBorder(); |
| 3082 } | 3080 } |
| 3083 | 3081 |
| 3084 } // namespace blink | 3082 } // namespace blink |
| OLD | NEW |