Backed out changeset 2114a592360d (bug 675709) for bustage on OS X: use undeclared identifiers. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 05 Feb 2017 20:53:32 +0100
changeset 340886 9436c71aecf1598172748722c48d87a1ac0894d6
parent 340885 31590ab43f619f595a0edef9acf4492e457ed92d
child 340887 3153a3e522f78e899d2e8368421d4d325d271536
push id31318
push usercbook@mozilla.com
push dateMon, 06 Feb 2017 11:56:59 +0000
treeherdermozilla-central@1cc159c7a044 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs675709
milestone54.0a1
backs out2114a592360dffbeb0c4588f20c809d7438c49bb
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
Backed out changeset 2114a592360d (bug 675709) for bustage on OS X: use undeclared identifiers. r=backout on a CLOSED TREE
widget/cocoa/nsPrintSettingsX.h
widget/cocoa/nsPrintSettingsX.mm
--- a/widget/cocoa/nsPrintSettingsX.h
+++ b/widget/cocoa/nsPrintSettingsX.h
@@ -46,44 +46,28 @@ public:
 
   // Re-initialize mAdjustedPaper{Width,Height} with values from mPageFormat.
   // Should be called whenever mPageFormat is initialized or overwritten.
   nsresult InitAdjustedPaperSize();
 
   void SetInchesScale(float aWidthScale, float aHeightScale);
   void GetInchesScale(float *aWidthScale, float *aHeightScale);
 
-  NS_IMETHOD SetPaperSizeUnit(int16_t aPaperSizeUnit) override;
-
-  NS_IMETHOD SetScaling(double aScaling) override;
-  NS_IMETHOD SetToFileName(const char16_t * aToFileName) override;
-
-  NS_IMETHOD GetOrientation(int32_t *aOrientation) override;
-  NS_IMETHOD SetOrientation(int32_t aOrientation) override;
-
-  NS_IMETHOD SetUnwriteableMarginTop(double aUnwriteableMarginTop) override;
-  NS_IMETHOD SetUnwriteableMarginLeft(double aUnwriteableMarginLeft) override;
-  NS_IMETHOD SetUnwriteableMarginBottom(double aUnwriteableMarginBottom) override;
-  NS_IMETHOD SetUnwriteableMarginRight(double aUnwriteableMarginRight) override;
-
   void SetAdjustedPaperSize(double aWidth, double aHeight);
   void GetAdjustedPaperSize(double *aWidth, double *aHeight);
-  nsresult SetCocoaPaperSize(double aWidth, double aHeight);
 
 protected:
   virtual ~nsPrintSettingsX();
 
   nsPrintSettingsX(const nsPrintSettingsX& src);
   nsPrintSettingsX& operator=(const nsPrintSettingsX& rhs);
 
   nsresult _Clone(nsIPrintSettings **_retval) override;
   nsresult _Assign(nsIPrintSettings *aPS) override;
 
-  int GetCocoaUnit(int16_t aGeckoUnit);
-
   // The out param has a ref count of 1 on return so caller needs to PMRelase() when done.
   OSStatus CreateDefaultPageFormat(PMPrintSession aSession, PMPageFormat& outFormat);
   OSStatus CreateDefaultPrintSettings(PMPrintSession aSession, PMPrintSettings& outSettings);
 
   NSPrintInfo* mPrintInfo;
 
   // Scaling factors used to convert the NSPrintInfo
   // paper size units to inches
--- a/widget/cocoa/nsPrintSettingsX.mm
+++ b/widget/cocoa/nsPrintSettingsX.mm
@@ -249,247 +249,24 @@ NS_IMETHODIMP nsPrintSettingsX::SetPaper
   mPaperHeight = aPaperHeight;
   mAdjustedPaperHeight = aPaperHeight * mHeightScale;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsPrintSettingsX::GetEffectivePageSize(double *aWidth, double *aHeight)
 {
-  if (kPaperSizeInches == GetCocoaUnit(mPaperSizeUnit)) {
-    *aWidth  = NS_INCHES_TO_TWIPS(mAdjustedPaperWidth / mWidthScale);
-    *aHeight = NS_INCHES_TO_TWIPS(mAdjustedPaperHeight / mHeightScale);
-  } else {
-    *aWidth  = NS_MILLIMETERS_TO_TWIPS(mAdjustedPaperWidth / mWidthScale);
-    *aHeight = NS_MILLIMETERS_TO_TWIPS(mAdjustedPaperHeight / mHeightScale);
-  }
+  *aWidth  = NS_INCHES_TO_TWIPS(mAdjustedPaperWidth / mWidthScale);
+  *aHeight = NS_INCHES_TO_TWIPS(mAdjustedPaperHeight / mHeightScale);
   return NS_OK;
 }
 
 void nsPrintSettingsX::SetAdjustedPaperSize(double aWidth, double aHeight)
 {
   mAdjustedPaperWidth = aWidth;
   mAdjustedPaperHeight = aHeight;
 }
 
 void nsPrintSettingsX::GetAdjustedPaperSize(double *aWidth, double *aHeight)
 {
   *aWidth = mAdjustedPaperWidth;
   *aHeight = mAdjustedPaperHeight;
 }
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetPaperSizeUnit(int16_t aPaperSizeUnit)
-{
-  mPaperSizeUnit = aPaperSizeUnit;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetScaling(double aScaling)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  [printInfoDict setObject: [NSNumber numberWithFloat: aScaling]
-   forKey: NSPrintScalingFactor];
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetToFileName(const char16_t *aToFileName)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  nsString filename = nsDependentString(aToFileName);
-
-  NSURL* jobSavingURL =
-      [NSURL fileURLWithPath: nsCocoaUtils::ToNSString(filename)];
-  if (jobSavingURL) {
-    [printInfoDict setObject: NSPrintSaveJob forKey: NSPrintJobDisposition];
-    [printInfoDict setObject: jobSavingURL forKey: NSPrintJobSavingURL];
-  }
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::GetOrientation(int32_t *aOrientation)
-{
-  if ([mPrintInfo orientation] == NSPaperOrientationPortrait) {
-    *aOrientation = nsIPrintSettings::kPortraitOrientation;
-  } else {
-    *aOrientation = nsIPrintSettings::kLandscapeOrientation;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetOrientation(int32_t aOrientation)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  if (aOrientation == nsIPrintSettings::kPortraitOrientation) {
-    [printInfoDict setObject: [NSNumber numberWithInt: NSPaperOrientationPortrait]
-     forKey: NSPrintOrientation];
-  } else {
-    [printInfoDict setObject: [NSNumber numberWithInt: NSPaperOrientationLandscape]
-     forKey: NSPrintOrientation];
-  }
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetUnwriteableMarginTop(double aUnwriteableMarginTop)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsPrintSettings::SetUnwriteableMarginTop(aUnwriteableMarginTop);
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  [printInfoDict setObject : [NSNumber numberWithDouble: aUnwriteableMarginTop]
-   forKey : NSPrintTopMargin];
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetUnwriteableMarginLeft(double aUnwriteableMarginLeft)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsPrintSettings::SetUnwriteableMarginLeft(aUnwriteableMarginLeft);
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  [printInfoDict setObject : [NSNumber numberWithDouble: aUnwriteableMarginLeft]
-   forKey : NSPrintLeftMargin];
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetUnwriteableMarginBottom(double aUnwriteableMarginBottom)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsPrintSettings::SetUnwriteableMarginBottom(aUnwriteableMarginBottom);
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  [printInfoDict setObject : [NSNumber numberWithDouble: aUnwriteableMarginBottom]
-   forKey : NSPrintBottomMargin];
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::SetUnwriteableMarginRight(double aUnwriteableMarginRight)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsPrintSettings::SetUnwriteableMarginRight(aUnwriteableMarginRight);
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  [printInfoDict setObject : [NSNumber numberWithDouble: aUnwriteableMarginRight]
-   forKey : NSPrintRightMargin];
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-int
-nsPrintSettingsX::GetCocoaUnit(int16_t aGeckoUnit)
-{
-  if (aGeckoUnit == kPaperSizeMillimeters)
-    return kPaperSizeMillimeters;
-  else
-    return kPaperSizeInches;
-}
-
-nsresult nsPrintSettingsX::SetCocoaPaperSize(double aWidth, double aHeight)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSSize paperSize;
-  NSMutableDictionary* printInfoDict = [mPrintInfo dictionary];
-  if ([mPrintInfo orientation] == NSPaperOrientationPortrait) {
-    // switch widths and heights
-    paperSize = NSMakeSize(aWidth, aHeight);
-    [printInfoDict setObject: [NSValue valueWithSize: paperSize]
-     forKey: NSPrintPaperSize];
-  } else {
-    paperSize = NSMakeSize(aHeight, aWidth);
-    [printInfoDict setObject: [NSValue valueWithSize: paperSize]
-     forKey: NSPrintPaperSize];
-  }
-  NSPrintInfo* newPrintInfo =
-      [[NSPrintInfo alloc] initWithDictionary: printInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}