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

Side by Side Diff: Source/core/layout/LayoutObject.cpp

Issue 1345833003: Revert of Invalidate whitespace text on text color changes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 3 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 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1699 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 diff.setNeedsPaintInvalidationLayer(); 1710 diff.setNeedsPaintInvalidationLayer();
1711 } 1711 }
1712 1712
1713 // If backdrop filter changed, and the layer does not paint into its own sep arate backing or it paints with filters, then we need to invalidate paints. 1713 // If backdrop filter changed, and the layer does not paint into its own sep arate backing or it paints with filters, then we need to invalidate paints.
1714 if (diff.backdropFilterChanged() && hasLayer()) { 1714 if (diff.backdropFilterChanged() && hasLayer()) {
1715 DeprecatedPaintLayer* layer = toLayoutBoxModelObject(this)->layer(); 1715 DeprecatedPaintLayer* layer = toLayoutBoxModelObject(this)->layer();
1716 if (!layer->hasStyleDeterminedDirectCompositingReasons() || layer->paint sWithBackdropFilters()) 1716 if (!layer->hasStyleDeterminedDirectCompositingReasons() || layer->paint sWithBackdropFilters())
1717 diff.setNeedsPaintInvalidationLayer(); 1717 diff.setNeedsPaintInvalidationLayer();
1718 } 1718 }
1719 1719
1720 if (diff.textDecorationOrColorChanged() && !diff.needsPaintInvalidation()) { 1720 if (diff.textOrColorChanged() && !diff.needsPaintInvalidation()) {
1721 if (style()->hasBorder() || style()->hasOutline() 1721 if (style()->hasBorder() || style()->hasOutline()
1722 || style()->isBackgroundColorCurrentColor() 1722 || style()->isBackgroundColorCurrentColor()
1723 || (isText() && !isBR())) 1723 || (isText() && !toLayoutText(this)->isAllCollapsibleWhitespace()))
1724 diff.setNeedsPaintInvalidationObject(); 1724 diff.setNeedsPaintInvalidationObject();
1725 } 1725 }
1726 1726
1727 // The answer to layerTypeRequired() for plugins, iframes, and canvas can ch ange without the actual 1727 // The answer to layerTypeRequired() for plugins, iframes, and canvas can ch ange without the actual
1728 // style changing, since it depends on whether we decide to composite these elements. When the 1728 // style changing, since it depends on whether we decide to composite these elements. When the
1729 // layer status of one of these elements changes, we need to force a layout. 1729 // layer status of one of these elements changes, we need to force a layout.
1730 if (!diff.needsFullLayout() && style() && isBoxModelObject()) { 1730 if (!diff.needsFullLayout() && style() && isBoxModelObject()) {
1731 bool requiresLayer = toLayoutBoxModelObject(this)->layerTypeRequired() ! = NoDeprecatedPaintLayer; 1731 bool requiresLayer = toLayoutBoxModelObject(this)->layerTypeRequired() ! = NoDeprecatedPaintLayer;
1732 if (hasLayer() != requiresLayer) 1732 if (hasLayer() != requiresLayer)
1733 diff.setNeedsFullLayout(); 1733 diff.setNeedsFullLayout();
(...skipping 1645 matching lines...) Expand 10 before | Expand all | Expand 10 after
3379 const blink::LayoutObject* root = object1; 3379 const blink::LayoutObject* root = object1;
3380 while (root->parent()) 3380 while (root->parent())
3381 root = root->parent(); 3381 root = root->parent();
3382 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3382 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3383 } else { 3383 } else {
3384 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3384 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3385 } 3385 }
3386 } 3386 }
3387 3387
3388 #endif 3388 #endif
OLDNEW
« no previous file with comments | « LayoutTests/paint/invalidation/text-decoration-invalidation-expected.html ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698