| 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 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1264 | 1264 |
| 1265 paintInfo.context->restore(); | 1265 paintInfo.context->restore(); |
| 1266 if (originalPhase == PaintPhaseOutline) { | 1266 if (originalPhase == PaintPhaseOutline) { |
| 1267 paintInfo.phase = PaintPhaseSelfOutline; | 1267 paintInfo.phase = PaintPhaseSelfOutline; |
| 1268 paintObject(paintInfo, accumulatedOffset); | 1268 paintObject(paintInfo, accumulatedOffset); |
| 1269 paintInfo.phase = originalPhase; | 1269 paintInfo.phase = originalPhase; |
| 1270 } else if (originalPhase == PaintPhaseChildBlockBackground) | 1270 } else if (originalPhase == PaintPhaseChildBlockBackground) |
| 1271 paintInfo.phase = originalPhase; | 1271 paintInfo.phase = originalPhase; |
| 1272 } | 1272 } |
| 1273 | 1273 |
| 1274 LayoutRect RenderBox::overflowClipRect(const LayoutPoint& location, OverlayScrol
lbarSizeRelevancy relevancy) | 1274 LayoutRect RenderBox::overflowClipRect(const LayoutPoint& location) |
| 1275 { | 1275 { |
| 1276 LayoutRect clipRect = borderBoxRect(); | 1276 LayoutRect clipRect = borderBoxRect(); |
| 1277 clipRect.setLocation(location + clipRect.location() + LayoutSize(borderLeft(
), borderTop())); | 1277 clipRect.setLocation(location + clipRect.location() + LayoutSize(borderLeft(
), borderTop())); |
| 1278 clipRect.setSize(clipRect.size() - LayoutSize(borderLeft() + borderRight(),
borderTop() + borderBottom())); | 1278 clipRect.setSize(clipRect.size() - LayoutSize(borderLeft() + borderRight(),
borderTop() + borderBottom())); |
| 1279 return clipRect; | 1279 return clipRect; |
| 1280 } | 1280 } |
| 1281 | 1281 |
| 1282 LayoutRect RenderBox::clipRect(const LayoutPoint& location) | 1282 LayoutRect RenderBox::clipRect(const LayoutPoint& location) |
| 1283 { | 1283 { |
| 1284 LayoutRect borderBoxRect = this->borderBoxRect(); | 1284 LayoutRect borderBoxRect = this->borderBoxRect(); |
| (...skipping 2470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3755 | 3755 |
| 3756 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 3756 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 3757 { | 3757 { |
| 3758 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); | 3758 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 3759 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 3759 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 3760 ASSERT(hasBackground == style.hasBackground()); | 3760 ASSERT(hasBackground == style.hasBackground()); |
| 3761 hasBorder = style.hasBorder(); | 3761 hasBorder = style.hasBorder(); |
| 3762 } | 3762 } |
| 3763 | 3763 |
| 3764 } // namespace blink | 3764 } // namespace blink |
| OLD | NEW |