| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 950 if (protector->hasOneRef()) | 950 if (protector->hasOneRef()) |
| 951 return; | 951 return; |
| 952 #endif | 952 #endif |
| 953 | 953 |
| 954 Document* document = m_frame->document(); | 954 Document* document = m_frame->document(); |
| 955 | 955 |
| 956 // If the layout view was marked as needing layout after we added items in t
he subtree roots we need | 956 // If the layout view was marked as needing layout after we added items in t
he subtree roots we need |
| 957 // to clear the roots and do the layout from the layoutView. | 957 // to clear the roots and do the layout from the layoutView. |
| 958 if (layoutView()->needsLayout()) | 958 if (layoutView()->needsLayout()) |
| 959 clearLayoutSubtreeRootsAndMarkContainingBlocks(); | 959 clearLayoutSubtreeRootsAndMarkContainingBlocks(); |
| 960 layoutView()->clearHitTestCache(); |
| 960 | 961 |
| 961 bool inSubtreeLayout = isSubtreeLayout(); | 962 bool inSubtreeLayout = isSubtreeLayout(); |
| 962 | 963 |
| 963 // FIXME: The notion of a single root for layout is no longer applicable. Re
move or update this code. crbug.com/460596 | 964 // FIXME: The notion of a single root for layout is no longer applicable. Re
move or update this code. crbug.com/460596 |
| 964 LayoutObject* rootForThisLayout = inSubtreeLayout ? *(m_layoutSubtreeRoots.b
egin()) : layoutView(); | 965 LayoutObject* rootForThisLayout = inSubtreeLayout ? *(m_layoutSubtreeRoots.b
egin()) : layoutView(); |
| 965 if (!rootForThisLayout) { | 966 if (!rootForThisLayout) { |
| 966 // FIXME: Do we need to set m_size here? | 967 // FIXME: Do we need to set m_size here? |
| 967 ASSERT_NOT_REACHED(); | 968 ASSERT_NOT_REACHED(); |
| 968 return; | 969 return; |
| 969 } | 970 } |
| (...skipping 3037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4007 | 4008 |
| 4008 if (!graphicsLayer) | 4009 if (!graphicsLayer) |
| 4009 return; | 4010 return; |
| 4010 | 4011 |
| 4011 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); | 4012 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); |
| 4012 | 4013 |
| 4013 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); | 4014 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); |
| 4014 } | 4015 } |
| 4015 | 4016 |
| 4016 } // namespace blink | 4017 } // namespace blink |
| OLD | NEW |