author | Cameron McCormack <cam@mcc.id.au> |
Mon, 07 Jan 2013 12:57:19 +1100 (2013-01-07) | |
changeset 117832 | 46e86e8499b2814126e53e255d16c147d1cdcab4 |
parent 117831 | de6f3b7fc084059b085322992330a906cc660f67 |
child 117833 | fed4e5f66b3d6499a9e3322eeb057bb2757da48f |
child 117879 | e742cc9b67d30dba9d0e571ab18852d683c98e97 |
push id | 24115 |
push user | philringnalda@gmail.com |
push date | Mon, 07 Jan 2013 05:51:13 +0000 (2013-01-07) |
treeherder | mozilla-central@fed4e5f66b3d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 827085 |
milestone | 20.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
layout/printing/nsPrintObject.cpp | file | annotate | diff | comparison | revisions | |
layout/printing/nsPrintObject.h | file | annotate | diff | comparison | revisions |
--- a/layout/printing/nsPrintObject.cpp +++ b/layout/printing/nsPrintObject.cpp @@ -15,17 +15,17 @@ #include "nsIBaseWindow.h" //--------------------------------------------------- //-- nsPrintObject Class Impl //--------------------------------------------------- nsPrintObject::nsPrintObject() : mContent(nullptr), mFrameType(eFrame), mParent(nullptr), mHasBeenPrinted(false), mDontPrint(true), mPrintAsIs(false), - mSharedPresShell(false), mInvisible(false), mDidCreateDocShell(false), + mInvisible(false), mDidCreateDocShell(false), mShrinkRatio(1.0), mZoomRatio(1.0) { MOZ_COUNT_CTOR(nsPrintObject); } nsPrintObject::~nsPrintObject() {
--- a/layout/printing/nsPrintObject.h +++ b/layout/printing/nsPrintObject.h @@ -51,17 +51,16 @@ public: nsCOMPtr<nsIContent> mContent; PrintObjectType mFrameType; nsTArray<nsPrintObject*> mKids; nsPrintObject* mParent; bool mHasBeenPrinted; bool mDontPrint; bool mPrintAsIs; - bool mSharedPresShell; bool mInvisible; // Indicates PO is set to not visible by CSS bool mPrintPreview; bool mDidCreateDocShell; float mShrinkRatio; float mZoomRatio; private: nsPrintObject& operator=(const nsPrintObject& aOther) MOZ_DELETE;