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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 1473363003: Invalidate first line display item clients when first line style changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pure paint invalildation change (Element.cpp reverted) Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index d18a8bdfec657ca4677d650192fcf9a19d44e955..ff366cd2570eae7e854f1094a13c67f6d22a8fc7 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -1845,12 +1845,23 @@ void LayoutObject::setPseudoStyle(PassRefPtr<ComputedStyle> pseudoStyle)
void LayoutObject::firstLineStyleDidChange(const ComputedStyle& oldStyle, const ComputedStyle& newStyle)
{
StyleDifference diff = oldStyle.visualInvalidationDiff(newStyle);
- if (diff.hasDifference()) {
- // TODO(rune@opera.com): We should use the diff to determine whether a repaint vs. layout
- // is needed, but for now just assume a layout will be required. The diff code
- // in LayoutObject::setStyle would need to be factored out so that it could be reused.
- setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::StyleChange);
+
+ if (diff.needsPaintInvalidation() || diff.textDecorationOrColorChanged()) {
+ LayoutBlock* block = nullptr;
+ if (isLayoutBlockFlow() || isLayoutButton()) {
+ block = toLayoutBlock(this);
+ } else if (isLayoutInline()) {
+ if (toLayoutInline(this)->firstLineBoxIncludingCulling()->isFirstLineStyle())
mstensho (USE GERRIT) 2015/12/02 10:09:31 Can't firstLineBoxIncludingCulling() return nullpt
Xianzhu 2015/12/02 17:41:57 Not sure though didn't encounter. Added nullptr ch
+ block = containingBlock();
+ }
+ if (block) {
+ block->invalidateDisplayItemClientsOfFirstLine();
+ if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+ block->setShouldDoFullPaintInvalidation();
+ }
}
+ if (diff.needsLayout())
+ setNeedsLayoutAndPrefWidthsRecalc(LayoutInvalidationReason::StyleChange);
}
void LayoutObject::markContainingBlocksForOverflowRecalc()

Powered by Google App Engine
This is Rietveld 408576698