ug 489988 - Java Applets reload when print is called, r+sr=roc, a=dveditz

git-svn-id: svn://10.0.0.236/trunk@257111 18797224-902f-48f8-a5cc-f745e15eee43
2009-05-05 19:16:29 +00:00
parent cf9294fd23
commit b64c537c97
1 changed files with 6 additions and 7 deletions
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -134,15 +134,14 @@ nsAsyncInstantiateEvent::Run()
  // Also make sure that we still refer to the same data.
  nsIObjectFrame* frame = mContent->
    GetExistingFrame(nsObjectLoadingContent::eFlushContent);
-#ifdef DEBUG
-  if (frame && mFrame.IsAlive()) {
-    nsIFrame* objectFrame = nsnull;
+
+  nsIFrame* objectFrame = nsnull;
+  if (frame) {
    CallQueryInterface(frame, &objectFrame);
-    NS_ASSERTION(objectFrame == mFrame.GetFrame(), "Wrong frame!");
  }
-#endif
-  if (frame &&
-      mFrame.IsAlive() &&
+
+  if (objectFrame &&
+      mFrame.GetFrame() == objectFrame &&
      mContent->mURI == mURI &&
      mContent->mContentType.Equals(mContentType)) {
    if (LOG_ENABLED()) {