Bug 445004. Make the base and document URI of document.written documents be the
base and document URI of the document on whose current context our code is running. r+sr=jst, r=dcamp Bug 465752. Fix Equals() to work right on javascript: URIs. r=dcamp, sr=jst. Both a=ss git-svn-id: svn://10.0.0.236/trunk@255943 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -125,6 +125,7 @@
|
||||
#include "nsITimelineService.h"
|
||||
#include "nsGfxCIID.h"
|
||||
#include "nsStyleSheetService.h"
|
||||
#include "ImageErrors.h"
|
||||
|
||||
#include "nsIPrompt.h"
|
||||
#include "imgIContainer.h" // image animation mode constants
|
||||
@@ -959,7 +960,11 @@ DocumentViewerImpl::LoadComplete(nsresult aStatus)
|
||||
|
||||
// Now, fire either an OnLoad or OnError event to the document...
|
||||
PRBool restoring = PR_FALSE;
|
||||
if(NS_SUCCEEDED(aStatus)) {
|
||||
// XXXbz imagelib kills off the document load for a full-page image with
|
||||
// NS_IMAGELIB_ERROR_LOAD_ABORTED if it's in the cache. So we want to treat
|
||||
// that one as a success code; otherwise whether we fire onload for the image
|
||||
// will depend on whether it's cached!
|
||||
if((NS_SUCCEEDED(aStatus) || aStatus == NS_IMAGELIB_ERROR_LOAD_ABORTED)) {
|
||||
nsEventStatus status = nsEventStatus_eIgnore;
|
||||
nsEvent event(PR_TRUE, NS_LOAD);
|
||||
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
|
||||
|
||||
Reference in New Issue
Block a user