Chromium Code Reviews| 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 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 952 if (protector->hasOneRef()) | 952 if (protector->hasOneRef()) |
| 953 return; | 953 return; |
| 954 #endif | 954 #endif |
| 955 | 955 |
| 956 Document* document = m_frame->document(); | 956 Document* document = m_frame->document(); |
| 957 | 957 |
| 958 // If the layout view was marked as needing layout after we added items in t he subtree roots we need | 958 // If the layout view was marked as needing layout after we added items in t he subtree roots we need |
| 959 // to clear the roots and do the layout from the layoutView. | 959 // to clear the roots and do the layout from the layoutView. |
| 960 if (layoutView()->needsLayout()) | 960 if (layoutView()->needsLayout()) |
| 961 clearLayoutSubtreeRootsAndMarkContainingBlocks(); | 961 clearLayoutSubtreeRootsAndMarkContainingBlocks(); |
| 962 layoutView()->clearHitTestCache(); | |
|
esprehn
2015/05/25 21:01:45
This is not enough, you also need to invalidate on
| |
| 962 | 963 |
| 963 bool inSubtreeLayout = isSubtreeLayout(); | 964 bool inSubtreeLayout = isSubtreeLayout(); |
| 964 | 965 |
| 965 // FIXME: The notion of a single root for layout is no longer applicable. Re move or update this code. crbug.com/460596 | 966 // FIXME: The notion of a single root for layout is no longer applicable. Re move or update this code. crbug.com/460596 |
| 966 LayoutObject* rootForThisLayout = inSubtreeLayout ? *(m_layoutSubtreeRoots.b egin()) : layoutView(); | 967 LayoutObject* rootForThisLayout = inSubtreeLayout ? *(m_layoutSubtreeRoots.b egin()) : layoutView(); |
| 967 if (!rootForThisLayout) { | 968 if (!rootForThisLayout) { |
| 968 // FIXME: Do we need to set m_size here? | 969 // FIXME: Do we need to set m_size here? |
| 969 ASSERT_NOT_REACHED(); | 970 ASSERT_NOT_REACHED(); |
| 970 return; | 971 return; |
| 971 } | 972 } |
| (...skipping 3096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4068 | 4069 |
| 4069 if (!graphicsLayer) | 4070 if (!graphicsLayer) |
| 4070 return; | 4071 return; |
| 4071 | 4072 |
| 4072 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); | 4073 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); |
| 4073 | 4074 |
| 4074 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); | 4075 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); |
| 4075 } | 4076 } |
| 4076 | 4077 |
| 4077 } // namespace blink | 4078 } // namespace blink |
| OLD | NEW |