Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 20:20:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 203840. remove nsIGraphics

Browse Source 
r+sr=roc+moz
This commit is contained in:
cbiesinger%web.de 2004-01-14 12:56:39 +00:00
parent 21aee21ee9
commit b9b4368aa0
7 changed files with 0 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/idl/Makefile.in
View File

@ -34,7 +34,6 @@ XPIDLSRCS = \
nsIFontEnumerator.idl \
nsIFontList.idl \
nsIScriptableRegion.idl \
nsIGraphics.idl \
nsIScreen.idl \
nsIScreenManager.idl \
nsIPrintOptions.idl \

92
gfx/idl/nsIGraphics.idl
View File

@ -1,92 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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):
* Patrick C. Beard <beard@netscape.com>
*
*
* Alternatively, the contents of this file may be used under the terms of
* either 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 NPL, 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 NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupports.idl"
typedef unsigned long nscolor;
typedef long nscoord;
/**
* Simplified graphics interface for JS rendering.
*/
[scriptable, uuid(812EAE54-1DD2-11B2-B17B-D0ACC700F975)]
interface nsIGraphics : nsISupports
{
/**
* The color used to paint with.
*/
attribute nscolor color;
/**
* Clipping.
*/
void clipRect(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
/**
* Primitives.
*/
void drawLine(in nscoord x1, in nscoord y1, in nscoord x2, in nscoord y2);
void drawRect(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
void fillRect(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
void invertRect(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
void drawEllipse(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
void fillEllipse(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
void invertEllipse(in nscoord x, in nscoord y, in nscoord width, in nscoord height);
void drawArc(in nscoord x, in nscoord y, in nscoord width, in nscoord height, in float startAngle, in float endAngle);
void fillArc(in nscoord x, in nscoord y, in nscoord width, in nscoord height, in float startAngle, in float endAngle);
void invertArc(in nscoord x, in nscoord y, in nscoord width, in nscoord height, in float startAngle, in float endAngle);
void drawPolygon(in unsigned long count, [array, size_is(count)] in long points);
void fillPolygon(in unsigned long count, [array, size_is(count)] in long points);
void invertPolygon(in unsigned long count, [array, size_is(count)] in long points);
void drawString(in wstring text, in nscoord x, in nscoord y);
void setFont(in wstring name, in nscoord size);
/**
* Stack of graphics states.
*/
void gsave();
void grestore();
};

1
gfx/src/Makefile.in
View File

@ -95,7 +95,6 @@ CPPSRCS = \
nsRegion.cpp \
nsTransform2D.cpp \
nsScriptableRegion.cpp \
nsGraphicsImpl.cpp \
nsPrintOptionsImpl.cpp \
nsPrintSettingsImpl.cpp \
nsPrintSession.cpp \

10
gfx/src/mac/nsRenderingContextMac.cpp
View File

@ -1447,16 +1447,6 @@ nsRenderingContextMac::FlushRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord
return NS_OK;
}
NS_IMETHODIMP nsRenderingContextMac::GetGraphics(nsIGraphics* *aGraphics)
{
NS_ASSERTION((aGraphics != nsnull), "aGraphics is NULL");
nsCOMPtr<nsIGraphics> graphics = new nsGraphicsImpl(this);
if (graphics)
return graphics->QueryInterface(NS_GET_IID(nsIGraphics), (void**)aGraphics);
else
return NS_ERROR_OUT_OF_MEMORY;
}
#ifdef MOZ_MATHML
NS_IMETHODIMP

4
gfx/src/mac/nsRenderingContextMac.h
View File

@ -57,8 +57,6 @@ class nsTransform2D;
class nsGraphicState;
class nsUnicodeFallbackCache;
class nsIGraphics;
//------------------------------------------------------------------------
@ -151,8 +149,6 @@ public:
const nsRect &aDestBounds, PRUint32 aCopyFlags);
NS_IMETHOD RetrieveCurrentNativeGraphicData(PRUint32 * ngd);
NS_IMETHOD GetGraphics(nsIGraphics* *aGraphics);
// nsRenderingContextImpl overrides
NS_IMETHOD ReleaseBackbuffer(void);
NS_IMETHOD UseBackbuffer(PRBool* aUseBackbuffer);

165
gfx/src/nsGraphicsImpl.cpp
View File

@ -1,165 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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):
* Patrick C. Beard <beard@netscape.com>
*
*
* Alternatively, the contents of this file may be used under the terms of
* either 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 NPL, 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 NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsGraphicsImpl.h"
#include "nsIDeviceContext.h"
#include "nsIFontMetrics.h"
#include "nsFont.h"
#include "nsCRT.h"
NS_IMPL_ISUPPORTS1(nsGraphicsImpl, nsIGraphics)
nsGraphicsImpl::nsGraphicsImpl(nsIRenderingContext* aRenderer)
: mRenderer(aRenderer)
{
// hack: back out the coordinate transformation to use pixels.
nsCOMPtr<nsIDeviceContext> dc;
mRenderer->GetDeviceContext(*getter_AddRefs(dc));
dc->GetDevUnitsToAppUnits(mDev2App);
mRenderer->Scale(mDev2App, mDev2App);
}
NS_IMETHODIMP nsGraphicsImpl::GetColor(nscolor *aColor)
{
return mRenderer->GetColor(*aColor);
}
NS_IMETHODIMP nsGraphicsImpl::SetColor(nscolor aColor)
{
return mRenderer->SetColor(aColor);
}
NS_IMETHODIMP nsGraphicsImpl::ClipRect(nscoord x, nscoord y, nscoord width, nscoord height)
{
nsRect r(x, y, width, height);
PRBool clipEmpty;
return mRenderer->SetClipRect(r, nsClipCombine_kIntersect, clipEmpty);
}
NS_IMETHODIMP nsGraphicsImpl::DrawLine(nscoord x1, nscoord y1, nscoord x2, nscoord y2)
{
return mRenderer->DrawLine(x1, y1, x2, y2);
}
NS_IMETHODIMP nsGraphicsImpl::DrawRect(nscoord x, nscoord y, nscoord width, nscoord height)
{
return mRenderer->DrawRect(x, y, width, height);
}
NS_IMETHODIMP nsGraphicsImpl::FillRect(nscoord x, nscoord y, nscoord width, nscoord height)
{
return mRenderer->FillRect(x, y, width, height);
}
NS_IMETHODIMP nsGraphicsImpl::InvertRect(nscoord x, nscoord y, nscoord width, nscoord height)
{
return mRenderer->InvertRect(x, y, width, height);
}
NS_IMETHODIMP nsGraphicsImpl::DrawEllipse(nscoord x, nscoord y, nscoord width, nscoord height)
{
return mRenderer->DrawEllipse(x, y, width, height);
}
NS_IMETHODIMP nsGraphicsImpl::FillEllipse(nscoord x, nscoord y, nscoord width, nscoord height)
{
return mRenderer->FillEllipse(x, y, width, height);
}
NS_IMETHODIMP nsGraphicsImpl::InvertEllipse(nscoord x, nscoord y, nscoord width, nscoord height)
{
// return mRenderer->InvertEllipse(x, y, width, height);
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsGraphicsImpl::DrawArc(nscoord x, nscoord y, nscoord width, nscoord height, float startAngle, float endAngle)
{
return mRenderer->DrawArc(x, y, width, height, startAngle, endAngle);
}
NS_IMETHODIMP nsGraphicsImpl::FillArc(nscoord x, nscoord y, nscoord width, nscoord height, float startAngle, float endAngle)
{
return mRenderer->FillArc(x, y, width, height, startAngle, endAngle);
}
NS_IMETHODIMP nsGraphicsImpl::InvertArc(nscoord x, nscoord y, nscoord width, nscoord height, float startAngle, float endAngle)
{
// return mRenderer->InvertArc(x, y, width, height, startAngle, endAngle);
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsGraphicsImpl::DrawPolygon(PRUint32 count, PRInt32 *points)
{
return mRenderer->DrawPolygon((nsPoint*)points, count / 2);
}
NS_IMETHODIMP nsGraphicsImpl::FillPolygon(PRUint32 count, PRInt32 *points)
{
return mRenderer->FillPolygon((nsPoint*)points, count / 2);
}
NS_IMETHODIMP nsGraphicsImpl::InvertPolygon(PRUint32 count, PRInt32 *points)
{
// return mRenderer->InvertPolygon(points);
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsGraphicsImpl::DrawString(const PRUnichar *text, nscoord x, nscoord y)
{
return mRenderer->DrawString(text, nsCRT::strlen(text), x, y);
}
NS_IMETHODIMP nsGraphicsImpl::SetFont(const PRUnichar *name, nscoord size)
{
size = NS_STATIC_CAST(nscoord, size * mDev2App);
nsAutoString nameString(name);
nsFont font(nameString, NS_FONT_STYLE_NORMAL, NS_FONT_VARIANT_NORMAL, NS_FONT_WEIGHT_NORMAL, NS_FONT_DECORATION_NONE, size);
return mRenderer->SetFont(font, nsnull);
}
NS_IMETHODIMP nsGraphicsImpl::Gsave(void)
{
return mRenderer->PushState();
}
NS_IMETHODIMP nsGraphicsImpl::Grestore(void)
{
PRBool unused;
return mRenderer->PopState(unused);
}

58
gfx/src/nsGraphicsImpl.h
View File

@ -1,58 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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):
* Patrick C. Beard <beard@netscape.com>
*
*
* Alternatively, the contents of this file may be used under the terms of
* either 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 NPL, 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 NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsIGraphics.h"
#include "nsCOMPtr.h"
#include "nsIRenderingContext.h"
class nsIRenderingContext;
class nsGraphicsImpl : public nsIGraphics {
public:
nsGraphicsImpl(nsIRenderingContext* aRenderer);
virtual ~nsGraphicsImpl() {}
NS_DECL_ISUPPORTS
NS_DECL_NSIGRAPHICS
private:
nsCOMPtr<nsIRenderingContext> mRenderer;
float mDev2App;
};