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

Side by Side Diff: Source/core/rendering/RenderBlock.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
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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 const ContentData* contentData = blockStyle.contentData(); 207 const ContentData* contentData = blockStyle.contentData();
208 if (contentData && contentData->isImage()) { 208 if (contentData && contentData->isImage()) {
209 const ImageContentData* imageContentData = static_cast<const ImageConten tData*>(contentData); 209 const ImageContentData* imageContentData = static_cast<const ImageConten tData*>(contentData);
210 appendImageIfNotNull(images, imageContentData->image()); 210 appendImageIfNotNull(images, imageContentData->image());
211 } 211 }
212 if (blockStyle.boxReflect()) 212 if (blockStyle.boxReflect())
213 appendImageIfNotNull(images, blockStyle.boxReflect()->mask().image()); 213 appendImageIfNotNull(images, blockStyle.boxReflect()->mask().image());
214 appendImageIfNotNull(images, blockStyle.listStyleImage()); 214 appendImageIfNotNull(images, blockStyle.listStyleImage());
215 appendImageIfNotNull(images, blockStyle.borderImageSource()); 215 appendImageIfNotNull(images, blockStyle.borderImageSource());
216 appendImageIfNotNull(images, blockStyle.maskBoxImageSource()); 216 appendImageIfNotNull(images, blockStyle.maskBoxImageSource());
217 if (blockStyle.shapeOutside())
218 appendImageIfNotNull(images, blockStyle.shapeOutside()->image());
217 } 219 }
218 220
219 RenderBlock::~RenderBlock() 221 RenderBlock::~RenderBlock()
220 { 222 {
221 if (hasColumns()) 223 if (hasColumns())
222 gColumnInfoMap->take(this); 224 gColumnInfoMap->take(this);
223 if (gPercentHeightDescendantsMap) 225 if (gPercentHeightDescendantsMap)
224 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap); 226 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap);
225 if (gPositionedDescendantsMap) 227 if (gPositionedDescendantsMap)
226 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap); 228 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap);
(...skipping 4678 matching lines...) Expand 10 before | Expand all | Expand 10 after
4905 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4907 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4906 { 4908 {
4907 showRenderObject(); 4909 showRenderObject();
4908 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4910 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4909 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4911 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4910 } 4912 }
4911 4913
4912 #endif 4914 #endif
4913 4915
4914 } // namespace WebCore 4916 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/css/shape-image-file-expected.html ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698