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) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011, 2013 Apple Inc. All rights
reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011, 2013 Apple Inc. All rights
reserved. |
7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 { | 965 { |
966 if (repaintContainer == this) | 966 if (repaintContainer == this) |
967 return rect; | 967 return rect; |
968 | 968 |
969 auto* parent = this->parent(); | 969 auto* parent = this->parent(); |
970 if (!parent) | 970 if (!parent) |
971 return rect; | 971 return rect; |
972 | 972 |
973 LayoutRect adjustedRect = rect; | 973 LayoutRect adjustedRect = rect; |
974 if (parent->hasOverflowClip()) { | 974 if (parent->hasOverflowClip()) { |
975 downcast<RenderBox>(*parent).applyCachedClipAndScrollPositionForRepaint(
adjustedRect); | 975 bool intersects = true; |
976 if (adjustedRect.isEmpty()) | 976 downcast<RenderBox>(*parent).applyCachedClipAndScrollPositionForRepaint(
adjustedRect, context.m_useInclusiveIntersection, &intersects); |
| 977 if (context.m_useInclusiveIntersection) |
| 978 *context.m_intersects = intersects; |
| 979 else |
| 980 intersects = !adjustedRect.isEmpty(); |
| 981 if (!intersects) |
977 return adjustedRect; | 982 return adjustedRect; |
978 } | 983 } |
979 return parent->computeRectForRepaint(adjustedRect, repaintContainer, context
); | 984 return parent->computeRectForRepaint(adjustedRect, repaintContainer, context
); |
980 } | 985 } |
981 | 986 |
982 FloatRect RenderObject::computeFloatRectForRepaint(const FloatRect&, const Rende
rLayerModelObject*, bool) const | 987 FloatRect RenderObject::computeFloatRectForRepaint(const FloatRect&, const Rende
rLayerModelObject*, bool, bool, bool*) const |
983 { | 988 { |
984 ASSERT_NOT_REACHED(); | 989 ASSERT_NOT_REACHED(); |
985 return FloatRect(); | 990 return FloatRect(); |
986 } | 991 } |
987 | 992 |
988 #if ENABLE(TREE_DEBUGGING) | 993 #if ENABLE(TREE_DEBUGGING) |
989 | 994 |
990 static void outputRenderTreeLegend(TextStream& stream) | 995 static void outputRenderTreeLegend(TextStream& stream) |
991 { | 996 { |
992 stream.nextLine(); | 997 stream.nextLine(); |
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1958 } | 1963 } |
1959 | 1964 |
1960 void showRenderTree(const WebCore::RenderObject* object) | 1965 void showRenderTree(const WebCore::RenderObject* object) |
1961 { | 1966 { |
1962 if (!object) | 1967 if (!object) |
1963 return; | 1968 return; |
1964 object->showRenderTreeForThis(); | 1969 object->showRenderTreeForThis(); |
1965 } | 1970 } |
1966 | 1971 |
1967 #endif | 1972 #endif |
OLD | NEW |