Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When object tags are sub-documents they should be treated as IFrames for printing

Browse Source 
Bug 128142
sr=attinasi r=dcone a=asa
This commit is contained in:
rods%netscape.com 2002-03-07 12:44:57 +00:00
parent 11f9d07fca
commit 56c2710b00
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsDocumentViewer.cpp
View File

@ -137,6 +137,7 @@ static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
#include "nsIDOMHTMLFrameElement.h"
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDOMHTMLIFrameElement.h"
#include "nsIDOMHTMLObjectElement.h"
// Print Preview
#include "nsIPrintPreviewContext.h"
@ -2988,8 +2989,9 @@ DocumentViewerImpl::MapContentForPO(PrintObject* aRootObject,
if (frame) {
po->mFrameType = eFrame;
} else {
nsCOMPtr<nsIDOMHTMLObjectElement> objElement(do_QueryInterface(aContent));
nsCOMPtr<nsIDOMHTMLIFrameElement> iFrame(do_QueryInterface(aContent));
if (iFrame) {
if (iFrame || objElement) {
po->mFrameType = eIFrame;
po->mPrintAsIs = PR_TRUE;
if (po->mParent) {

4
layout/base/nsDocumentViewer.cpp
View File

@ -137,6 +137,7 @@ static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
#include "nsIDOMHTMLFrameElement.h"
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDOMHTMLIFrameElement.h"
#include "nsIDOMHTMLObjectElement.h"
// Print Preview
#include "nsIPrintPreviewContext.h"
@ -2988,8 +2989,9 @@ DocumentViewerImpl::MapContentForPO(PrintObject* aRootObject,
if (frame) {
po->mFrameType = eFrame;
} else {
nsCOMPtr<nsIDOMHTMLObjectElement> objElement(do_QueryInterface(aContent));
nsCOMPtr<nsIDOMHTMLIFrameElement> iFrame(do_QueryInterface(aContent));
if (iFrame) {
if (iFrame || objElement) {
po->mFrameType = eIFrame;
po->mPrintAsIs = PR_TRUE;
if (po->mParent) {