Backing out bug 396587 to hopefully fix orange.

2007-09-19 20:41:29 -07:00
parent 3c9e2d3a40
commit 4837fcb386
3 changed files with 49 additions and 101 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3624,11 +3624,9 @@ nsDocShell::SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx,
    mBounds.width = cx;
    mBounds.height = cy;

-    // Hold strong ref, since SetBounds can make us null out mContentViewer
-    nsCOMPtr<nsIContentViewer> viewer = mContentViewer;
-    if (viewer) {
+    if (mContentViewer) {
        //XXX Border figured in here or is that handled elsewhere?
-        NS_ENSURE_SUCCESS(viewer->SetBounds(mBounds), NS_ERROR_FAILURE);
+        NS_ENSURE_SUCCESS(mContentViewer->SetBounds(mBounds), NS_ERROR_FAILURE);
    }

    return NS_OK;