Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutInline.cpp

Issue 1786513002: Fix paint invalidation of paintInvalidationContainer itself (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 LayoutRect outlineRect = unionRectEvenIfEmpty(rects); 1076 LayoutRect outlineRect = unionRectEvenIfEmpty(rects);
1077 outlineRect.inflate(outlineOutset); 1077 outlineRect.inflate(outlineOutset);
1078 overflowRect.unite(outlineRect); 1078 overflowRect.unite(outlineRect);
1079 } 1079 }
1080 } 1080 }
1081 return overflowRect; 1081 return overflowRect;
1082 } 1082 }
1083 1083
1084 void LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* a ncestor, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const 1084 void LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* a ncestor, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
1085 { 1085 {
1086 if (paintInvalidationState && paintInvalidationState->canMapToContainer(ance stor)) { 1086 if (paintInvalidationState && paintInvalidationState->canMapToAncestor(ances tor)) {
1087 if (style()->hasInFlowPosition() && layer()) 1087 paintInvalidationState->mapObjectRectToAncestor(*this, ancestor, rect);
1088 rect.move(layer()->offsetForInFlowPosition());
1089 rect.move(paintInvalidationState->paintOffset());
1090 if (paintInvalidationState->isClipped())
1091 rect.intersect(paintInvalidationState->clipRect());
1092 return; 1088 return;
1093 } 1089 }
1094 1090
1095 if (ancestor == this) 1091 if (ancestor == this)
1096 return; 1092 return;
1097 1093
1098 bool ancestorSkipped; 1094 bool ancestorSkipped;
1099 LayoutObject* container = this->container(ancestor, &ancestorSkipped); 1095 LayoutObject* container = this->container(ancestor, &ancestorSkipped);
1100 if (!container) 1096 if (!container)
1101 return; 1097 return;
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 1384
1389 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const 1385 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const
1390 { 1386 {
1391 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason); 1387 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason);
1392 1388
1393 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1389 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1394 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason); 1390 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason);
1395 } 1391 }
1396 1392
1397 } // namespace blink 1393 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698