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

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: Revised the 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 * Copyright (C) 2014 Samsung Electronics. All rights reserved. 7 * Copyright (C) 2014 Samsung Electronics. 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 const ContentData* contentData = blockStyle.contentData(); 208 const ContentData* contentData = blockStyle.contentData();
209 if (contentData && contentData->isImage()) { 209 if (contentData && contentData->isImage()) {
210 const ImageContentData* imageContentData = static_cast<const ImageConten tData*>(contentData); 210 const ImageContentData* imageContentData = static_cast<const ImageConten tData*>(contentData);
211 appendImageIfNotNull(images, imageContentData->image()); 211 appendImageIfNotNull(images, imageContentData->image());
212 } 212 }
213 if (blockStyle.boxReflect()) 213 if (blockStyle.boxReflect())
214 appendImageIfNotNull(images, blockStyle.boxReflect()->mask().image()); 214 appendImageIfNotNull(images, blockStyle.boxReflect()->mask().image());
215 appendImageIfNotNull(images, blockStyle.listStyleImage()); 215 appendImageIfNotNull(images, blockStyle.listStyleImage());
216 appendImageIfNotNull(images, blockStyle.borderImageSource()); 216 appendImageIfNotNull(images, blockStyle.borderImageSource());
217 appendImageIfNotNull(images, blockStyle.maskBoxImageSource()); 217 appendImageIfNotNull(images, blockStyle.maskBoxImageSource());
218 if (blockStyle.shapeOutside())
219 appendImageIfNotNull(images, blockStyle.shapeOutside()->image());
218 } 220 }
219 221
220 RenderBlock::~RenderBlock() 222 RenderBlock::~RenderBlock()
221 { 223 {
222 if (hasColumns()) 224 if (hasColumns())
223 gColumnInfoMap->take(this); 225 gColumnInfoMap->take(this);
224 if (gPercentHeightDescendantsMap) 226 if (gPercentHeightDescendantsMap)
225 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap); 227 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap);
226 if (gPositionedDescendantsMap) 228 if (gPositionedDescendantsMap)
227 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap); 229 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap);
(...skipping 4805 matching lines...) Expand 10 before | Expand all | Expand 10 after
5033 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5035 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5034 { 5036 {
5035 showRenderObject(); 5037 showRenderObject();
5036 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5038 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5037 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5039 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5038 } 5040 }
5039 5041
5040 #endif 5042 #endif
5041 5043
5042 } // namespace WebCore 5044 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698