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

Back out changeset ba9be0418b15 (bug 579963) because it didn't work.

Browse Source
This commit is contained in:
Timothy Nikkel 2010-07-25 18:10:08 -05:00
parent abc4f41212
commit 94e794fd91
3 changed files with 12 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/src/Makefile.in
View File

@ -85,7 +85,6 @@ endif
CPPSRCS = \
nsColor.cpp \
nsFont.cpp \
nsPoint.cpp \
nsRect.cpp \
nsRegion.cpp \
nsTransform2D.cpp \

50
gfx/src/nsPoint.cpp
View File

@ -1,50 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsPoint.h"
nsPoint
nsPoint::ConvertAppUnits(PRInt32 aFromAPP, PRInt32 aToAPP) const {
if (aFromAPP != aToAPP) {
nsPoint point;
point.x = NSToCoordRound(NSCoordScale(x, aFromAPP, aToAPP));
point.y = NSToCoordRound(NSCoordScale(y, aFromAPP, aToAPP));
return point;
}
return *this;
}

13
gfx/src/nsPoint.h
View File

@ -85,7 +85,7 @@ struct nsPoint {
inline nsIntPoint ToNearestPixels(nscoord aAppUnitsPerPixel) const;
// Converts this point from aFromAPP, an appunits per pixel ratio, to aToAPP.
nsPoint ConvertAppUnits(PRInt32 aFromAPP, PRInt32 aToAPP) const;
inline nsPoint ConvertAppUnits(PRInt32 aFromAPP, PRInt32 aToAPP) const;
};
struct nsIntPoint {
@ -131,4 +131,15 @@ nsPoint::ToNearestPixels(nscoord aAppUnitsPerPixel) const {
NSToIntRound(NSAppUnitsToFloatPixels(y, float(aAppUnitsPerPixel))));
}
inline nsPoint
nsPoint::ConvertAppUnits(PRInt32 aFromAPP, PRInt32 aToAPP) const {
if (aFromAPP != aToAPP) {
nsPoint point;
point.x = NSToCoordRound(NSCoordScale(x, aFromAPP, aToAPP));
point.y = NSToCoordRound(NSCoordScale(y, aFromAPP, aToAPP));
return point;
}
return *this;
}
#endif /* NSPOINT_H */