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 4013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4024 { | 4024 { |
4025 if (Document* document = frame().document()) { | 4025 if (Document* document = frame().document()) { |
4026 if (Element* element = document->viewportDefiningElement()) | 4026 if (Element* element = document->viewportDefiningElement()) |
4027 return element->layoutObject(); | 4027 return element->layoutObject(); |
4028 } | 4028 } |
4029 return nullptr; | 4029 return nullptr; |
4030 } | 4030 } |
4031 | 4031 |
4032 void FrameView::collectAnnotatedRegions(LayoutObject& layoutObject, Vector<Annot
atedRegionValue>& regions) | 4032 void FrameView::collectAnnotatedRegions(LayoutObject& layoutObject, Vector<Annot
atedRegionValue>& regions) |
4033 { | 4033 { |
4034 // LayoutTexts don't have their own style, they just use their parent's styl
e, | |
4035 // so we don't want to include them. | |
4036 if (layoutObject.isText()) | |
4037 return; | |
4038 | |
4039 layoutObject.addAnnotatedRegions(regions); | 4034 layoutObject.addAnnotatedRegions(regions); |
4040 for (LayoutObject* curr = layoutObject.slowFirstChild(); curr; curr = curr->
nextSibling()) | 4035 for (LayoutObject* curr = layoutObject.slowFirstChild(); curr; curr = curr->
nextSibling()) |
4041 collectAnnotatedRegions(*curr, regions); | 4036 collectAnnotatedRegions(*curr, regions); |
4042 } | 4037 } |
4043 | 4038 |
4044 void FrameView::collectFrameTimingRequestsRecursive(GraphicsLayerFrameTimingRequ
ests& graphicsLayerTimingRequests) | 4039 void FrameView::collectFrameTimingRequestsRecursive(GraphicsLayerFrameTimingRequ
ests& graphicsLayerTimingRequests) |
4045 { | 4040 { |
4046 collectFrameTimingRequests(graphicsLayerTimingRequests); | 4041 collectFrameTimingRequests(graphicsLayerTimingRequests); |
4047 | 4042 |
4048 for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree
().nextSibling()) { | 4043 for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree
().nextSibling()) { |
(...skipping 16 matching lines...) Expand all Loading... |
4065 | 4060 |
4066 if (!graphicsLayer) | 4061 if (!graphicsLayer) |
4067 return; | 4062 return; |
4068 | 4063 |
4069 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); | 4064 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); |
4070 | 4065 |
4071 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); | 4066 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); |
4072 } | 4067 } |
4073 | 4068 |
4074 } // namespace blink | 4069 } // namespace blink |
OLD | NEW |