Fix some merge bustage.

2010-03-08 14:16:41 -06:00
parent 8160dff0bb
commit 9c42a86e29
4 changed files with 13 additions and 15 deletions
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -1448,7 +1448,6 @@ nsFrameLoader::UpdateBaseWindowPositionAndSize(nsIFrame *aIFrame)
 nsIntSize
 nsFrameLoader::GetSubDocumentSize(const nsIFrame *aIFrame)
 {
-  nsAutoDisableGetUsedXAssertions disableAssert;
  nsSize docSizeAppUnits;
  nsPresContext* presContext = aIFrame->PresContext();
  nsCOMPtr<nsIDOMHTMLFrameElement> frameElem =