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

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

Issue 1148173003: Changing out-of-flow-ness on a multicol child may affect the need for column sets. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 ASSERT(!isLayoutIFrame() && !isEmbeddedObject() && !isCanvas()); 1747 ASSERT(!isLayoutIFrame() && !isEmbeddedObject() && !isCanvas());
1748 return; 1748 return;
1749 } 1749 }
1750 1750
1751 StyleDifference diff; 1751 StyleDifference diff;
1752 if (m_style) 1752 if (m_style)
1753 diff = m_style->visualInvalidationDiff(*style); 1753 diff = m_style->visualInvalidationDiff(*style);
1754 1754
1755 diff = adjustStyleDifference(diff); 1755 diff = adjustStyleDifference(diff);
1756 1756
1757 if (m_style) {
1758 if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
1759 flowThread->flowThreadDescendantStyleWillChange(this, diff, *style);
1760 }
1757 styleWillChange(diff, *style); 1761 styleWillChange(diff, *style);
1758 1762
1759 RefPtr<ComputedStyle> oldStyle = m_style.release(); 1763 RefPtr<ComputedStyle> oldStyle = m_style.release();
1760 setStyleInternal(style); 1764 setStyleInternal(style);
1761 1765
1762 updateFillImages(oldStyle ? &oldStyle->backgroundLayers() : 0, m_style->back groundLayers()); 1766 updateFillImages(oldStyle ? &oldStyle->backgroundLayers() : 0, m_style->back groundLayers());
1763 updateFillImages(oldStyle ? &oldStyle->maskLayers() : 0, m_style->maskLayers ()); 1767 updateFillImages(oldStyle ? &oldStyle->maskLayers() : 0, m_style->maskLayers ());
1764 1768
1765 updateImage(oldStyle ? oldStyle->borderImage().image() : 0, m_style->borderI mage().image()); 1769 updateImage(oldStyle ? oldStyle->borderImage().image() : 0, m_style->borderI mage().image());
1766 updateImage(oldStyle ? oldStyle->maskBoxImage().image() : 0, m_style->maskBo xImage().image()); 1770 updateImage(oldStyle ? oldStyle->maskBoxImage().image() : 0, m_style->maskBo xImage().image());
1767 1771
1768 updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style->shapeOuts ide()); 1772 updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style->shapeOuts ide());
1769 1773
1770 bool doesNotNeedLayoutOrPaintInvalidation = !m_parent; 1774 bool doesNotNeedLayoutOrPaintInvalidation = !m_parent;
1771 1775
1772 styleDidChange(diff, oldStyle.get()); 1776 styleDidChange(diff, oldStyle.get());
1777 if (oldStyle.get()) {
1778 if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
1779 flowThread->flowThreadDescendantStyleDidChange(this, diff, *oldStyle .get());
1780 }
1773 1781
1774 // FIXME: |this| might be destroyed here. This can currently happen for a La youtTextFragment when 1782 // FIXME: |this| might be destroyed here. This can currently happen for a La youtTextFragment when
1775 // its first-letter block gets an update in LayoutTextFragment::styleDidChan ge. For LayoutTextFragment(s), 1783 // its first-letter block gets an update in LayoutTextFragment::styleDidChan ge. For LayoutTextFragment(s),
1776 // we will safely bail out with the doesNotNeedLayoutOrPaintInvalidation fla g. We might want to broaden 1784 // we will safely bail out with the doesNotNeedLayoutOrPaintInvalidation fla g. We might want to broaden
1777 // this condition in the future as we move layoutObject changes out of layou t and into style changes. 1785 // this condition in the future as we move layoutObject changes out of layou t and into style changes.
1778 if (doesNotNeedLayoutOrPaintInvalidation) 1786 if (doesNotNeedLayoutOrPaintInvalidation)
1779 return; 1787 return;
1780 1788
1781 // Now that the layer (if any) has been updated, we need to adjust the diff again, 1789 // Now that the layer (if any) has been updated, we need to adjust the diff again,
1782 // check whether we should layout now, and decide if we need to invalidate p aints. 1790 // check whether we should layout now, and decide if we need to invalidate p aints.
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
3295 const blink::LayoutObject* root = object1; 3303 const blink::LayoutObject* root = object1;
3296 while (root->parent()) 3304 while (root->parent())
3297 root = root->parent(); 3305 root = root->parent();
3298 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3306 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3299 } else { 3307 } else {
3300 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3308 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3301 } 3309 }
3302 } 3310 }
3303 3311
3304 #endif 3312 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698