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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2191953002: Fix asserts when updating shouldPaint for floating objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 } 1439 }
1440 1440
1441 void PaintLayer::didUpdateNeedsCompositedScrolling() 1441 void PaintLayer::didUpdateNeedsCompositedScrolling()
1442 { 1442 {
1443 bool wasSelfPaintingLayer = isSelfPaintingLayer(); 1443 bool wasSelfPaintingLayer = isSelfPaintingLayer();
1444 updateSelfPaintingLayer(); 1444 updateSelfPaintingLayer();
1445 1445
1446 // If the floating object becomes non-self-painting, so some ancestor should paint it; 1446 // If the floating object becomes non-self-painting, so some ancestor should paint it;
1447 // if it becomes self-painting, it should paint itself and no ancestor shoul d paint it. 1447 // if it becomes self-painting, it should paint itself and no ancestor shoul d paint it.
1448 if (wasSelfPaintingLayer != isSelfPaintingLayer() && m_layoutObject->isFloat ing()) 1448 if (wasSelfPaintingLayer != isSelfPaintingLayer() && m_layoutObject->isFloat ing())
1449 LayoutBlockFlow::setAncestorShouldPaintFloatingObject(*layoutBox(), wasS elfPaintingLayer); 1449 LayoutBlockFlow::setAncestorShouldPaintFloatingObject(*layoutBox());
1450 } 1450 }
1451 1451
1452 void PaintLayer::updateReflectionInfo(const ComputedStyle* oldStyle) 1452 void PaintLayer::updateReflectionInfo(const ComputedStyle* oldStyle)
1453 { 1453 {
1454 ASSERT(!oldStyle || !layoutObject()->style()->reflectionDataEquivalent(oldSt yle)); 1454 ASSERT(!oldStyle || !layoutObject()->style()->reflectionDataEquivalent(oldSt yle));
1455 if (layoutObject()->hasReflection()) { 1455 if (layoutObject()->hasReflection()) {
1456 if (!ensureRareData().reflectionInfo) 1456 if (!ensureRareData().reflectionInfo)
1457 m_rareData->reflectionInfo = wrapUnique(new PaintLayerReflectionInfo (*layoutBox())); 1457 m_rareData->reflectionInfo = wrapUnique(new PaintLayerReflectionInfo (*layoutBox()));
1458 m_rareData->reflectionInfo->updateAfterStyleChange(oldStyle); 1458 m_rareData->reflectionInfo->updateAfterStyleChange(oldStyle);
1459 } else if (m_rareData && m_rareData->reflectionInfo) { 1459 } else if (m_rareData && m_rareData->reflectionInfo) {
(...skipping 1478 matching lines...) Expand 10 before | Expand all | Expand 10 after
2938 2938
2939 void showLayerTree(const blink::LayoutObject* layoutObject) 2939 void showLayerTree(const blink::LayoutObject* layoutObject)
2940 { 2940 {
2941 if (!layoutObject) { 2941 if (!layoutObject) {
2942 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); 2942 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
2943 return; 2943 return;
2944 } 2944 }
2945 showLayerTree(layoutObject->enclosingLayer()); 2945 showLayerTree(layoutObject->enclosingLayer());
2946 } 2946 }
2947 #endif 2947 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698