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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 28 matching lines...) Expand all
39 #include "core/rendering/HitTestLocation.h" 39 #include "core/rendering/HitTestLocation.h"
40 #include "core/rendering/HitTestResult.h" 40 #include "core/rendering/HitTestResult.h"
41 #include "core/rendering/InlineIterator.h" 41 #include "core/rendering/InlineIterator.h"
42 #include "core/rendering/InlineTextBox.h" 42 #include "core/rendering/InlineTextBox.h"
43 #include "core/rendering/PaintInfo.h" 43 #include "core/rendering/PaintInfo.h"
44 #include "core/rendering/RenderFlexibleBox.h" 44 #include "core/rendering/RenderFlexibleBox.h"
45 #include "core/rendering/RenderInline.h" 45 #include "core/rendering/RenderInline.h"
46 #include "core/rendering/RenderLayer.h" 46 #include "core/rendering/RenderLayer.h"
47 #include "core/rendering/RenderObjectInlines.h" 47 #include "core/rendering/RenderObjectInlines.h"
48 #include "core/rendering/RenderView.h" 48 #include "core/rendering/RenderView.h"
49 #include "core/rendering/shapes/ShapeOutsideInfo.h"
50 #include "core/rendering/style/ContentData.h" 49 #include "core/rendering/style/ContentData.h"
51 #include "core/rendering/style/RenderStyle.h" 50 #include "core/rendering/style/RenderStyle.h"
52 #include "platform/geometry/FloatQuad.h" 51 #include "platform/geometry/FloatQuad.h"
53 #include "platform/geometry/TransformState.h" 52 #include "platform/geometry/TransformState.h"
54 #include "platform/graphics/GraphicsContextCullSaver.h" 53 #include "platform/graphics/GraphicsContextCullSaver.h"
55 #include "platform/graphics/GraphicsContextStateSaver.h" 54 #include "platform/graphics/GraphicsContextStateSaver.h"
56 #include "wtf/StdLibExtras.h" 55 #include "wtf/StdLibExtras.h"
57 #include "wtf/TemporaryChange.h" 56 #include "wtf/TemporaryChange.h"
58 57
59 using namespace WTF; 58 using namespace WTF;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 { 137 {
139 appendLayers(images, blockStyle.backgroundLayers()); 138 appendLayers(images, blockStyle.backgroundLayers());
140 appendLayers(images, blockStyle.maskLayers()); 139 appendLayers(images, blockStyle.maskLayers());
141 140
142 const ContentData* contentData = blockStyle.contentData(); 141 const ContentData* contentData = blockStyle.contentData();
143 if (contentData && contentData->isImage()) 142 if (contentData && contentData->isImage())
144 appendImageIfNotNull(images, toImageContentData(contentData)->image()); 143 appendImageIfNotNull(images, toImageContentData(contentData)->image());
145 appendImageIfNotNull(images, blockStyle.listStyleImage()); 144 appendImageIfNotNull(images, blockStyle.listStyleImage());
146 appendImageIfNotNull(images, blockStyle.borderImageSource()); 145 appendImageIfNotNull(images, blockStyle.borderImageSource());
147 appendImageIfNotNull(images, blockStyle.maskBoxImageSource()); 146 appendImageIfNotNull(images, blockStyle.maskBoxImageSource());
148 if (blockStyle.shapeOutside())
149 appendImageIfNotNull(images, blockStyle.shapeOutside()->image());
150 } 147 }
151 148
152 void RenderBlock::removeFromGlobalMaps() 149 void RenderBlock::removeFromGlobalMaps()
153 { 150 {
154 if (gPercentHeightDescendantsMap) 151 if (gPercentHeightDescendantsMap)
155 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap); 152 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap);
156 if (gPositionedDescendantsMap) 153 if (gPositionedDescendantsMap)
157 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap); 154 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap);
158 } 155 }
159 156
(...skipping 2870 matching lines...) Expand 10 before | Expand all | Expand 10 after
3030 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 3027 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
3031 { 3028 {
3032 showRenderObject(); 3029 showRenderObject();
3033 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3030 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3034 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3031 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3035 } 3032 }
3036 3033
3037 #endif 3034 #endif
3038 3035
3039 } // namespace blink 3036 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResourceLoader.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698