From 03156a9c6b156d8d4900bcc21426e9ff6f02177f Mon Sep 17 00:00:00 2001 From: "pnunn%netscape.com" Date: Thu, 30 Mar 2000 22:39:53 +0000 Subject: [PATCH] bug#33452, line 476, remove extraneous frame notification. r: troy, tested on NT, linux bug332697, line 1563, Use net context of last image req for reconnect. r: neeti, tested on NT, linux. pnunn. git-svn-id: svn://10.0.0.236/trunk@64629 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libimg/src/if.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/modules/libimg/src/if.cpp b/mozilla/modules/libimg/src/if.cpp index cbf07c49b7c..87f56e455cb 100644 --- a/mozilla/modules/libimg/src/if.cpp +++ b/mozilla/modules/libimg/src/if.cpp @@ -473,10 +473,6 @@ il_cache_return_notify(IL_ImageReq *image_req) nsCRT::zero(&message_data.update_rect, sizeof(IL_Rect)); if (ic->state == IC_COMPLETE) { - /* Send the observers a frame complete message. */ - XP_NotifyObservers(image_req->obs_list, IL_FRAME_COMPLETE, - &message_data); - /* Finally send the observers a complete message. */ XP_NotifyObservers(image_req->obs_list, IL_IMAGE_COMPLETE, &message_data); @@ -1559,7 +1555,11 @@ il_image_complete(il_container *ic) /* Call to netlib for net cache data happens here. */ netRequest->SetBackgroundLoad(PR_TRUE); reader = IL_NewNetReader(ic); - (void) ic->net_cx->GetURL(ic->url, IMG_NTWK_SERVER, reader); + + + /* using lclient insures we are using an active image request */ + (void) ic->lclient->net_cx->GetURL(ic->url, IMG_NTWK_SERVER, reader); + /* Release reader, GetURL will keep a ref to it. */ NS_RELEASE(reader); } else { @@ -2112,7 +2112,7 @@ IL_GetImage(const char* image_url, #endif /* Record the context that actually initiates and controls the transfer. */ - ic->net_cx = net_cx->Clone(); + ic->net_cx = net_cx->Clone(); /* need to make a net request */ ILTRACE(1,("il: net request for %s, %s", image_url,