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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 226203010: [CSS Shapes] shape-outside from image doesn't load properly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: corrected a flaw in clearShapeOutside that cropped up in webkit_unit_test Created 6 years, 8 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 | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderImage.cpp » ('j') | 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 setIsBox(); 98 setIsBox();
99 } 99 }
100 100
101 void RenderBox::willBeDestroyed() 101 void RenderBox::willBeDestroyed()
102 { 102 {
103 clearOverrideSize(); 103 clearOverrideSize();
104 clearContainingBlockOverrideSize(); 104 clearContainingBlockOverrideSize();
105 105
106 RenderBlock::removePercentHeightDescendantIfNeeded(this); 106 RenderBlock::removePercentHeightDescendantIfNeeded(this);
107 107
108 ShapeOutsideInfo::removeInfo(*this); 108 clearShapeOutside();
109 109
110 RenderBoxModelObject::willBeDestroyed(); 110 RenderBoxModelObject::willBeDestroyed();
111 } 111 }
112 112
113 void RenderBox::clearShapeOutside()
114 {
115 if (const ShapeValue* shapeValue = style() ? style()->shapeOutside() : 0) {
116 if (StyleImage* shapeImage = shapeValue->image())
117 shapeImage->removeClient(this);
118 }
119
120 ShapeOutsideInfo::removeInfo(*this);
121 }
122
113 void RenderBox::removeFloatingOrPositionedChildFromBlockLists() 123 void RenderBox::removeFloatingOrPositionedChildFromBlockLists()
114 { 124 {
115 ASSERT(isFloatingOrOutOfFlowPositioned()); 125 ASSERT(isFloatingOrOutOfFlowPositioned());
116 126
117 if (documentBeingDestroyed()) 127 if (documentBeingDestroyed())
118 return; 128 return;
119 129
120 if (isFloating()) { 130 if (isFloating()) {
121 RenderBlockFlow* parentBlockFlow = 0; 131 RenderBlockFlow* parentBlockFlow = 0;
122 for (RenderObject* curr = parent(); curr && !curr->isRenderView(); curr = curr->parent()) { 132 for (RenderObject* curr = parent(); curr && !curr->isRenderView(); curr = curr->parent()) {
(...skipping 4615 matching lines...) Expand 10 before | Expand all | Expand 10 after
4738 return 0; 4748 return 0;
4739 4749
4740 if (!layoutState && !flowThreadContainingBlock()) 4750 if (!layoutState && !flowThreadContainingBlock())
4741 return 0; 4751 return 0;
4742 4752
4743 RenderBlock* containerBlock = containingBlock(); 4753 RenderBlock* containerBlock = containingBlock();
4744 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4754 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4745 } 4755 }
4746 4756
4747 } // namespace WebCore 4757 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698