Title: [159154] trunk/Source/WebCore/rendering/RenderBlock.cpp
- Revision
- 159154
- Author
- hy...@apple.com
- Date
- 2013-11-12 15:14:41 -0800 (Tue, 12 Nov 2013)
Log Message
Fix windows build bustage.
Modified Paths
Diff
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (159153 => 159154)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-11-12 23:09:39 UTC (rev 159153)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-11-12 23:14:41 UTC (rev 159154)
@@ -1330,6 +1330,22 @@
invalidateBackgroundObscurationStatus();
}
+static RenderBlockRareData* getRareData(const RenderBlock* block)
+{
+ return gRareDataMap ? gRareDataMap->get(block) : 0;
+}
+
+static RenderBlockRareData& ensureRareData(const RenderBlock* block)
+{
+ if (!gRareDataMap)
+ gRareDataMap = new RenderBlockRareDataMap;
+
+ auto& rareData = gRareDataMap->add(block, nullptr).iterator->value;
+ if (!rareData)
+ rareData = std::make_unique<RenderBlockRareData>();
+ return *rareData.get();
+}
+
#if ENABLE(CSS_SHAPES)
void RenderBlock::relayoutShapeDescendantIfMoved(RenderBlock* child, LayoutSize offset)
{
@@ -1409,22 +1425,6 @@
}
}
-static RenderBlockRareData* getRareData(const RenderBlock* block)
-{
- return gRareDataMap ? gRareDataMap->get(block) : 0;
-}
-
-static RenderBlockRareData& ensureRareData(const RenderBlock* block)
-{
- if (!gRareDataMap)
- gRareDataMap = new RenderBlockRareDataMap;
-
- auto& rareData = gRareDataMap->add(block, nullptr).iterator->value;
- if (!rareData)
- rareData = std::make_unique<RenderBlockRareData>();
- return *rareData.get();
-}
-
ShapeInsideInfo* RenderBlock::ensureShapeInsideInfo()
{
RenderBlockRareData& rareData = ensureRareData(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
