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

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

Issue 1818963003: Pass nullptr for paintInvalidationState if it can't be used to map geometry. (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 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 return; 1118 return;
1119 } 1119 }
1120 1120
1121 if (ancestorSkipped) { 1121 if (ancestorSkipped) {
1122 // If the paintInvalidationContainer is below o, then we need to map the rect into paintInvalidationContainer's coordinates. 1122 // If the paintInvalidationContainer is below o, then we need to map the rect into paintInvalidationContainer's coordinates.
1123 LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(conta iner); 1123 LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(conta iner);
1124 rect.move(-containerOffset); 1124 rect.move(-containerOffset);
1125 return; 1125 return;
1126 } 1126 }
1127 1127
1128 container->mapToVisibleRectInAncestorSpace(ancestor, rect, paintInvalidation State); 1128 container->mapToVisibleRectInAncestorSpace(ancestor, rect, nullptr);
1129 } 1129 }
1130 1130
1131 LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container) cons t 1131 LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container) cons t
1132 { 1132 {
1133 ASSERT(container == this->container()); 1133 ASSERT(container == this->container());
1134 1134
1135 LayoutSize offset; 1135 LayoutSize offset;
1136 if (isInFlowPositioned()) 1136 if (isInFlowPositioned())
1137 offset += offsetForInFlowPosition(); 1137 offset += offsetForInFlowPosition();
1138 1138
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 1379
1380 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const 1380 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason) const
1381 { 1381 {
1382 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason); 1382 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason);
1383 1383
1384 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1384 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1385 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason); 1385 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason);
1386 } 1386 }
1387 1387
1388 } // namespace blink 1388 } // 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