瀏覽代碼

Revert "Absolutely positioned elements now have their height correctly calculated when 'top' and 'bottom' are both specified."

This reverts commit 0249aae7dc561f727839136aa57732d63c3b8c4d.
Lloyd Weehuizen 14 年之前
父節點
當前提交
cd1b90d963
共有 1 個文件被更改,包括 0 次插入24 次删除
  1. 0 24
      Source/Core/LayoutEngine.cpp

+ 0 - 24
Source/Core/LayoutEngine.cpp

@@ -654,30 +654,6 @@ void LayoutEngine::BuildBoxHeight(Box& box, Element* element, float containing_b
 			box.SetEdge(Box::MARGIN, Box::BOTTOM, margin);
 	}
 
-	// In the case we're an absolutely positioned element, we need to check our height.
-	int position_property = element->GetProperty< int >(POSITION);
-	if (display_property == DISPLAY_BLOCK && (position_property == POSITION_ABSOLUTE || position_property == POSITION_FIXED))
-	{
-		if (height_auto)
-		{
-			const Property* topProp = element->GetLocalProperty(TOP);
-			const Property* bottomProp = element->GetLocalProperty(BOTTOM);
-
-			// Check for top and bottom properties both being defined.
-			if ((topProp != NULL) && (bottomProp != NULL))
-			{
-				content_area.y = containing_block_height - (box.GetCumulativeEdge(Box::CONTENT, Box::TOP)
-					   + box.GetCumulativeEdge(Box::CONTENT, Box::BOTTOM)
-					   + topProp->Get<float>() + bottomProp->Get<float>());
-				content_area.y = Math::Max(0.0f, content_area.y);
-			}
-		}
-		else
-		{
-			// For now, we're ignoring the over-constrained situation
-		}
-	}
-
 	if (content_area.y >= 0)
 	{
 		// Clamp the calculated height; if the height is changed by the clamp, then the margins need to be recalculated if