renaming nsIImageRequest2

This commit is contained in:
pavlov%netscape.com 2001-02-20 23:02:50 +00:00
parent be7bb58ab3
commit 21092358de
7 changed files with 22 additions and 85 deletions

View File

@ -1,4 +1,4 @@
nsIImageDecoder.idl
nsIImageDecoderObserver.idl
nsIImageLoader.idl
nsIImageRequest2.idl
lpIImageRequest.idl

View File

@ -31,7 +31,7 @@ MODULE = imglib2
XPIDLSRCS = nsIImageDecoder.idl \
nsIImageDecoderObserver.idl \
nsIImageLoader.idl \
nsIImageRequest2.idl
lpIImageRequest.idl
include $(topsrcdir)/config/rules.mk

View File

@ -31,7 +31,7 @@ XPIDLSRCS = \
.\nsIImageDecoder.idl \
.\nsIImageDecoderObserver.idl \
.\nsIImageLoader.idl \
.\nsIImageRequest2.idl \
.\lpIImageRequest.idl \
$(NULL)

View File

@ -25,7 +25,7 @@
#include "nsIOutputStream.idl"
#include "gfxtypes.idl"
interface nsIImageRequest;
interface lpIImageRequest;
/**
* nsIImageDecoder interface
@ -46,8 +46,8 @@ interface nsIImageDecoder : nsIOutputStream
* The decoder should always pass NULL as the first two parameters to
* all of the nsIImageDecoderObserver APIs.
*/
void init(in nsIImageRequest aRequest);
void init(in lpIImageRequest aRequest);
/// allows access to the nsIImage we have to put bits in to.
readonly attribute nsIImageRequest request;
readonly attribute lpIImageRequest request;
};

View File

@ -21,12 +21,12 @@
* Stuart Parmenter <pavlov@netscape.com>
*/
#include "nsIImageContainerObserver.idl"
#include "gfxIImageContainerObserver.idl"
#include "gfxtypes.idl"
interface nsIImageRequest;
interface nsIImageContainer;
interface nsIImageFrame;
interface lpIImageRequest;
interface gfxIImageContainer;
interface gfxIImageFrame;
%{C++
#include "nsRect.h"
@ -40,42 +40,42 @@ interface nsIImageFrame;
* @see imagelib2
*/
[scriptable, uuid(350163d2-1dd2-11b2-9e69-89959ecec1f3)]
interface nsIImageDecoderObserver : nsIImageContainerObserver
interface nsIImageDecoderObserver : gfxIImageContainerObserver
{
/**
* called as soon as the image begins getting decoded
*/
void onStartDecode(in nsIImageRequest request, in nsISupports cx);
void onStartDecode(in lpIImageRequest request, in nsISupports cx);
/**
* called once the image has been inited and therefore has a width and height
*/
void onStartContainer(in nsIImageRequest request, in nsISupports cx, in nsIImageContainer image);
void onStartContainer(in lpIImageRequest request, in nsISupports cx, in gfxIImageContainer image);
/**
* called when each frame is created
*/
void onStartFrame(in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame);
void onStartFrame(in lpIImageRequest request, in nsISupports cx, in gfxIImageFrame frame);
/**
* called when some part of the frame has new data in it
*/
[noscript] void onDataAvailable(in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame, [const] in nsRect rect);
[noscript] void onDataAvailable(in lpIImageRequest request, in nsISupports cx, in gfxIImageFrame frame, [const] in nsRect rect);
/**
* called when a frame is finished decoding
*/
void onStopFrame(in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame);
void onStopFrame(in lpIImageRequest request, in nsISupports cx, in gfxIImageFrame frame);
/**
* probably not needed. called right before onStopDecode
*/
void onStopContainer(in nsIImageRequest request, in nsISupports cx, in nsIImageContainer image);
void onStopContainer(in lpIImageRequest request, in nsISupports cx, in gfxIImageContainer image);
/**
* called when the decoder is dying off
*/
void onStopDecode(in nsIImageRequest request, in nsISupports cx,
void onStopDecode(in lpIImageRequest request, in nsISupports cx,
in nsresult status, in wstring statusArg);
};

View File

@ -25,7 +25,7 @@
#include "gfxtypes.idl"
interface nsIImageDecoderObserver;
interface nsIImageRequest;
interface lpIImageRequest;
interface nsISimpleEnumerator;
interface nsIStreamListener;
interface nsIURI;
@ -47,7 +47,7 @@ interface nsIImageLoader : nsISupports
* @param aObserver the observer
* @param cx some random data
*/
nsIImageRequest loadImage(in nsIURI uri, in nsIImageDecoderObserver aObserver, in nsISupports cx);
lpIImageRequest loadImage(in nsIURI uri, in nsIImageDecoderObserver aObserver, in nsISupports cx);
/**
* Start the load and decode of an image.
@ -55,11 +55,11 @@ interface nsIImageLoader : nsISupports
* @param aObserver the observer
* @param cx some random data
*/
nsIImageRequest loadImageWithChannel(in nsIChannel aChannel, in nsIImageDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener aListener);
lpIImageRequest loadImageWithChannel(in nsIChannel aChannel, in nsIImageDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener aListener);
/**
* Returns the channels contained directly in this group.
* @note Enumerator element type: nsIImageRequest.
* @note Enumerator element type: lpIImageRequest.
*/
readonly attribute nsISimpleEnumerator requests;
};

View File

@ -1,63 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* 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 Netscape are
* Copyright (C) 2001 Netscape Communications Corporation.
* All Rights Reserved.
*
* Contributor(s):
* Stuart Parmenter <pavlov@netscape.com>
*/
#include "nsISupports.idl"
interface nsIImageContainer;
/**
* nsIImageRequest interface
*
* @author Stuart Parmenter <pavlov@netscape.com>
* @version 0.1
* @see imagelib2
*/
[scriptable, uuid(ccf705f6-1dd1-11b2-82ef-e18eccf7f7ec)]
interface nsIImageRequest : nsISupports
{
void cancel(in nsresult status);
/**
* the image container...
* @return the image object associated with the request.
* @attention NEED DOCS
*/
readonly attribute nsIImageContainer image;
/**
* Bits set in the return value from imageStatus
* @name statusflags
*/
//@{
const long STATUS_NONE = 0x0;
const long STATUS_SIZE_AVAILABLE = 0x1;
const long STATUS_LOAD_COMPLETE = 0x2;
const long STATUS_ERROR = 0x4;
//@}
/**
* something
* @attention NEED DOCS
*/
readonly attribute unsigned long imageStatus;
};