Commit 892be572 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Access document object via browser object in nsIChannel::AsyncOpen.

parent b0ffd08a
...@@ -1063,17 +1063,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen ...@@ -1063,17 +1063,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
cancel = TRUE; cancel = TRUE;
} }
if(window == window->doc_obj->basedoc.window) { if(is_main_content_window(window)) {
if(!This->uri->channel_bsc) { if(!This->uri->channel_bsc) {
/* top window navigation initiated by Gecko */ /* top window navigation initiated by Gecko */
nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); nsres = before_async_open(This, window->browser, &cancel);
if(NS_SUCCEEDED(nsres) && cancel) { if(NS_SUCCEEDED(nsres) && cancel) {
TRACE("canceled\n"); TRACE("canceled\n");
nsres = NS_BINDING_ABORTED; nsres = NS_BINDING_ABORTED;
} }
}else if(window->doc_obj->mime) { }else if(window->browser->doc->mime) {
heap_free(This->content_type); heap_free(This->content_type);
This->content_type = heap_strdupWtoA(window->doc_obj->mime); This->content_type = heap_strdupWtoA(window->browser->doc->mime);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment