зеркало из https://github.com/mozilla/gecko-dev.git
338724 Get rid of nsQDFlushManager/nsIQDFlushManager, it's been rendered obsolete. Ha. Cocoa-only. r=josh
This commit is contained in:
mark%moxienet.com
Родитель
65d8bcd6f6
Коммит
bf513167d0
|
|
@ -62,9 +62,5 @@ XPIDLSRCS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
XPIDLSRCS += nsIQDFlushManager.idl
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,75 +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 supposed to avoid exccessive QuickDraw flushes.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mark Mentovai <mark@moxienet.com>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2005
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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 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 "nsISupports.idl"
|
||||
|
||||
%{ C++
|
||||
#include <Carbon/Carbon.h>
|
||||
%}
|
||||
|
||||
native CGrafPtr(CGrafPtr);
|
||||
native RgnHandle(RgnHandle);
|
||||
|
||||
/**
|
||||
* nsIQDFlushManager is responsible for rate-limiting QuickDraw buffer
|
||||
* flushes. Think of it as a plumber in a time of rationing. It's
|
||||
* expected to be used as a singleton doled out by the service manager.
|
||||
*/
|
||||
|
||||
[uuid(40352CE3-9D15-4643-8CBF-71DA61650F13)]
|
||||
interface nsIQDFlushManager : nsISupports
|
||||
{
|
||||
/**
|
||||
* Flushes the port buffer, a la QDFlushPortBuffer. If the buffer has
|
||||
* been flushed too recently, the region to flush is instead added to
|
||||
* the dirty region, and a buffer flush will be scheduled for an
|
||||
* appropriate time.
|
||||
*
|
||||
* @param aPort the QuickDraw port to flush
|
||||
*
|
||||
* @param aRegion the region to flush or mark as dirty
|
||||
*/
|
||||
void flushPortBuffer(in CGrafPtr aPort, in RgnHandle aRegion);
|
||||
|
||||
/**
|
||||
* Cancels a pending flush scheduled by calling flushPortBuffer. This
|
||||
* method is suitable to call when a port is destroyed.
|
||||
*
|
||||
* @param aPort the QuickDraw port to not flush
|
||||
*/
|
||||
void removePort(in CGrafPtr aPort);
|
||||
};
|
||||
|
|
@ -92,7 +92,6 @@ EXPORTS = \
|
|||
$(NULL)
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
CPPSRCS += nsQDFlushManager.cpp
|
||||
CMMSRCS = nsCocoaImageUtils.mm
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -52,9 +52,6 @@
|
|||
#include "nsCOMPtr.h"
|
||||
#include "nsUnicodeMappingUtil.h"
|
||||
#include "gfxImageFrame.h"
|
||||
#ifdef MOZ_WIDGET_COCOA
|
||||
#include "nsQDFlushManager.h"
|
||||
#endif
|
||||
|
||||
#include "nsIGenericFactory.h"
|
||||
|
||||
|
|
@ -69,9 +66,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDrawingSurfaceMac)
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorMac)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
|
||||
#ifdef MOZ_WIDGET_COCOA
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsQDFlushManager)
|
||||
#endif
|
||||
|
||||
static NS_IMETHODIMP
|
||||
nsScriptableRegionConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
|
||||
|
|
@ -132,12 +126,6 @@ static const nsModuleComponentInfo components[] =
|
|||
GFX_IMAGEFRAME_CID,
|
||||
"@mozilla.org/gfx/image/frame;2",
|
||||
gfxImageFrameConstructor, },
|
||||
#ifdef MOZ_WIDGET_COCOA
|
||||
{ NS_QDFLUSHMANAGER_CLASSNAME,
|
||||
NS_QDFLUSHMANAGER_CID,
|
||||
NS_QDFLUSHMANAGER_CONTRACTID,
|
||||
nsQDFlushManagerConstructor },
|
||||
#endif
|
||||
};
|
||||
|
||||
PR_STATIC_CALLBACK(void)
|
||||
|
|
|
|||
|
|
@ -1,297 +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 supposed to avoid excessive QuickDraw flushes.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mark Mentovai <mark@moxienet.com>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2005
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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 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 "nsQDFlushManager.h"
|
||||
|
||||
#include "nsComponentManagerUtils.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsCRT.h"
|
||||
|
||||
// nsQDFlushManager
|
||||
|
||||
nsQDFlushManager::nsQDFlushManager()
|
||||
: mPortList(nsnull)
|
||||
{
|
||||
}
|
||||
|
||||
nsQDFlushManager::~nsQDFlushManager()
|
||||
{
|
||||
nsQDFlushPort* port = mPortList;
|
||||
while (port)
|
||||
{
|
||||
nsQDFlushPort* next = port->mNext;
|
||||
port->Destroy();
|
||||
NS_RELEASE(port);
|
||||
port = next;
|
||||
}
|
||||
}
|
||||
|
||||
// CreateOrGetPort(aPort)
|
||||
//
|
||||
// Walks through the list of port objects and returns the one corresponding to
|
||||
// aPort if it exists. If it doesn't exist, but an unused existing port
|
||||
// object can be adapted to aPort, it will be adapted and returned. If no
|
||||
// suitable port object exists, a new port object is created, added to the
|
||||
// list, and returned. Any port objects created here will be destroyed when
|
||||
// the ~nsQDFlushManager destructor runs or when RemovePort is called.
|
||||
//
|
||||
// protected
|
||||
nsQDFlushPort*
|
||||
nsQDFlushManager::CreateOrGetPort(CGrafPtr aPort)
|
||||
{
|
||||
AbsoluteTime now = ::UpTime();
|
||||
|
||||
// First, go through the list and see if an object is already associated
|
||||
// with this port.
|
||||
nsQDFlushPort* port = mPortList;
|
||||
while (port)
|
||||
{
|
||||
if (aPort == port->mPort)
|
||||
{
|
||||
return port;
|
||||
}
|
||||
port = port->mNext;
|
||||
}
|
||||
|
||||
// If no port object exists yet, try to find an object that's not in use.
|
||||
// If there is one, repurpose it.
|
||||
// Don't be frightened. The pointer-pointer business isn't so confusing,
|
||||
// and it eases maintenance of the linked list.
|
||||
nsQDFlushPort** portPtr = &mPortList;
|
||||
while ((port = *portPtr))
|
||||
{
|
||||
if (!port->mFlushTimerRunning && port->TimeUntilFlush(now) < 0)
|
||||
{
|
||||
// If the flush timer is not running and it's past the time during which
|
||||
// a flush would be postponed, the object is no longer needed. Future
|
||||
// flushes for port->mPort would occur immediately. Since there's no
|
||||
// longer any state to track, the object can be reused for another port
|
||||
// This keeps the size of the list manageable.
|
||||
port->Init(aPort);
|
||||
return port;
|
||||
}
|
||||
portPtr = &port->mNext;
|
||||
}
|
||||
|
||||
// portPtr points to mNext of the last port object in the list, or if none,
|
||||
// to mPortList. That makes it easy to hook the new object up.
|
||||
*portPtr = port = new nsQDFlushPort(aPort);
|
||||
NS_IF_ADDREF(port);
|
||||
return port;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsQDFlushManager, nsIQDFlushManager)
|
||||
|
||||
// nsIQDFlushManager implementation
|
||||
|
||||
// FlushPortBuffer(aPort, aRegion)
|
||||
//
|
||||
// The public entry point for object-based calls. Calls
|
||||
// QDFlushPortBuffer(aPort, aRegion) if aPort hasn't been flushed too
|
||||
// recently. If it has been, calls QDAddRegionToDirtyRegion(aPort, aRegion)
|
||||
// and if no flush has been scheduled, schedules a flush for the appropriate
|
||||
// time.
|
||||
//
|
||||
// public
|
||||
NS_IMETHODIMP
|
||||
nsQDFlushManager::FlushPortBuffer(CGrafPtr aPort, RgnHandle aRegion)
|
||||
{
|
||||
CreateOrGetPort(aPort)->FlushPortBuffer(aRegion);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// RemovePort(aPort)
|
||||
//
|
||||
// Walks through the list of port objects and removes the one corresponding to
|
||||
// aPort, if it exists.
|
||||
//
|
||||
// public
|
||||
NS_IMETHODIMP
|
||||
nsQDFlushManager::RemovePort(CGrafPtr aPort)
|
||||
{
|
||||
// Traversal is as in CreateOrGetPort.
|
||||
nsQDFlushPort** portPtr = &mPortList;
|
||||
while (nsQDFlushPort* port = *portPtr)
|
||||
{
|
||||
if (aPort == port->mPort)
|
||||
{
|
||||
nsQDFlushPort* next = port->mNext;
|
||||
port->Destroy();
|
||||
NS_RELEASE(port);
|
||||
|
||||
// portPtr points to mNext of the previous object, or if none,
|
||||
// mPortList. That makes it easy to snip the old object out by
|
||||
// setting it to the follower.
|
||||
*portPtr = next;
|
||||
return NS_OK;
|
||||
}
|
||||
portPtr = &port->mNext;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// nsQDFlushPort
|
||||
|
||||
nsQDFlushPort::nsQDFlushPort(CGrafPtr aPort)
|
||||
: mNext(nsnull)
|
||||
, mPort(aPort)
|
||||
, mLastFlushTime((AbsoluteTime){0, 0})
|
||||
, mFlushTimer(nsnull)
|
||||
, mFlushTimerRunning(PR_FALSE)
|
||||
{
|
||||
}
|
||||
|
||||
nsQDFlushPort::~nsQDFlushPort()
|
||||
{
|
||||
// Everything should have been taken care of by Destroy().
|
||||
}
|
||||
|
||||
// Init(aPort)
|
||||
//
|
||||
// (Re)initialize object.
|
||||
//
|
||||
// protected
|
||||
void
|
||||
nsQDFlushPort::Init(CGrafPtr aPort)
|
||||
{
|
||||
mPort = aPort;
|
||||
}
|
||||
|
||||
// Destroy()
|
||||
//
|
||||
// Prepare object for destruction.
|
||||
//
|
||||
// protected
|
||||
void
|
||||
nsQDFlushPort::Destroy()
|
||||
{
|
||||
if (mFlushTimer)
|
||||
{
|
||||
mFlushTimer->Cancel();
|
||||
}
|
||||
mFlushTimer = nsnull;
|
||||
mFlushTimerRunning = PR_FALSE;
|
||||
mNext = nsnull;
|
||||
}
|
||||
|
||||
// FlushPortBuffer(aRegion)
|
||||
//
|
||||
// Flushes, dirties, and schedules, as appropriate. Public access is from
|
||||
// nsQDFlushManager::FlushPortBuffer(CGrafPtr aPort, RgnHandle aRegion).
|
||||
//
|
||||
// protected
|
||||
void
|
||||
nsQDFlushPort::FlushPortBuffer(RgnHandle aRegion)
|
||||
{
|
||||
AbsoluteTime now = ::UpTime();
|
||||
PRInt64 timeUntilFlush = TimeUntilFlush(now);
|
||||
|
||||
if (!mFlushTimerRunning && timeUntilFlush < 0)
|
||||
{
|
||||
// If past the time for the next acceptable flush, flush now.
|
||||
::QDFlushPortBuffer(mPort, aRegion);
|
||||
mLastFlushTime = now;
|
||||
}
|
||||
else
|
||||
{
|
||||
// If it's not time for the next flush yet, or if the timer is running
|
||||
// indicating that an update is pending, just mark the dirty region.
|
||||
::QDAddRegionToDirtyRegion(mPort, aRegion);
|
||||
|
||||
if (!mFlushTimerRunning)
|
||||
{
|
||||
// No flush scheduled? No problem.
|
||||
if (!mFlushTimer)
|
||||
{
|
||||
// No timer object? No problem.
|
||||
nsresult err;
|
||||
mFlushTimer = do_CreateInstance("@mozilla.org/timer;1", &err);
|
||||
NS_ASSERTION(NS_SUCCEEDED(err), "Could not instantiate flush timer.");
|
||||
}
|
||||
if (mFlushTimer)
|
||||
{
|
||||
// Start the clock, with the timer firing at the already-calculated
|
||||
// time until the next flush. Nanoseconds (1E-9) were used above,
|
||||
// but nsITimer is big on milliseconds (1E-3), so divide by 1E6.
|
||||
// Any time that was consumed between the ::UpTime call and now
|
||||
// will be lost. That's not so bad in the usual case, it's a tiny
|
||||
// bit less not so bad if a timer object didn't exist yet and was
|
||||
// created. It's better to update slightly less frequently than
|
||||
// the target than slightly more frequently.
|
||||
mFlushTimer->InitWithCallback(this, (PRUint32)(timeUntilFlush/1E6),
|
||||
nsITimer::TYPE_ONE_SHOT);
|
||||
mFlushTimerRunning = PR_TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// protected
|
||||
PRInt64
|
||||
nsQDFlushPort::TimeUntilFlush(AbsoluteTime aNow)
|
||||
{
|
||||
Nanoseconds elapsed = ::AbsoluteDeltaToNanoseconds(aNow, mLastFlushTime);
|
||||
|
||||
// nano = 1E-9 and the desired refresh rate is in Hz, so 1E9/kRefreshRateHz
|
||||
// gives the interval between updates in nanoseconds.
|
||||
return S64Subtract(U64SetU(1E9/kRefreshRateHz),
|
||||
UnsignedWideToUInt64(elapsed));
|
||||
}
|
||||
|
||||
// nsITimer implementation
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsQDFlushPort, nsITimerCallback)
|
||||
|
||||
// Notify(aTimer)
|
||||
//
|
||||
// Timer callback. Flush the dirty port buffer to the screen.
|
||||
NS_IMETHODIMP
|
||||
nsQDFlushPort::Notify(nsITimer* aTimer)
|
||||
{
|
||||
NS_ASSERTION(aTimer == mFlushTimer, "Callback called by wrong timer");
|
||||
|
||||
// Flush the dirty region.
|
||||
::QDFlushPortBuffer(mPort, NULL);
|
||||
|
||||
mLastFlushTime = ::UpTime();
|
||||
mFlushTimerRunning = PR_FALSE;
|
||||
|
||||
// This shouldn't be necessary, nsITimer.idl
|
||||
// aTimer->Cancel();
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1,109 +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 supposed to avoid exccessive QuickDraw flushes.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mark Mentovai <mark@moxienet.com>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2005
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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 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 ***** */
|
||||
|
||||
#ifndef nsQDFlushManager_h___
|
||||
#define nsQDFlushManager_h___
|
||||
|
||||
#include "nscore.h"
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIQDFlushManager.h"
|
||||
#include "nsITimer.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
// The expected use is to replace these calls:
|
||||
// ::QDFlushPortBuffer(port, region)
|
||||
// with these:
|
||||
// nsCOMPtr<nsIQDFlushManager> qdFlushManager =
|
||||
// do_GetService("@mozilla.org/gfx/qdflushmanager;1");
|
||||
// qdFlushManager->FlushPortBuffer(port, region);
|
||||
// and at port destruction time:
|
||||
// qdFlushManager->RemovePort(port)
|
||||
|
||||
class nsQDFlushPort : public nsITimerCallback
|
||||
{
|
||||
// nsQDFlushManager is responsible for maintaining the list of port objects.
|
||||
friend class nsQDFlushManager;
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSITIMERCALLBACK
|
||||
|
||||
protected:
|
||||
nsQDFlushPort(CGrafPtr aPort);
|
||||
~nsQDFlushPort();
|
||||
|
||||
void Init(CGrafPtr aPort);
|
||||
void Destroy();
|
||||
void FlushPortBuffer(RgnHandle aRegion);
|
||||
PRInt64 TimeUntilFlush(AbsoluteTime aNow);
|
||||
|
||||
// To use the display's refresh rate as the update Hz, see
|
||||
// http://developer.apple.com/documentation/Performance/Conceptual/Drawing/Articles/FlushingContent.html .
|
||||
// Here, use a hard-coded 30 Hz instead.
|
||||
static const PRUint32 kRefreshRateHz = 30; // Maximum number of updates
|
||||
// per second
|
||||
|
||||
nsQDFlushPort* mNext; // Next object in list
|
||||
CGrafPtr mPort; // Associated port
|
||||
AbsoluteTime mLastFlushTime; // Last QDFlushPortBuffer call
|
||||
nsCOMPtr<nsITimer> mFlushTimer; // Timer for scheduled flush
|
||||
PRPackedBool mFlushTimerRunning; // Is it?
|
||||
};
|
||||
|
||||
class NS_EXPORT nsQDFlushManager : public nsIQDFlushManager
|
||||
{
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIQDFLUSHMANAGER
|
||||
|
||||
public:
|
||||
nsQDFlushManager();
|
||||
~nsQDFlushManager();
|
||||
|
||||
protected:
|
||||
nsQDFlushPort* CreateOrGetPort(CGrafPtr aPort);
|
||||
|
||||
nsQDFlushPort* mPortList; // Head of list
|
||||
};
|
||||
|
||||
// 6F91262A-CF9E-4DDD-AA01-7A1FCCF14281
|
||||
#define NS_QDFLUSHMANAGER_CLASSNAME "QuickDraw Buffer Flusher"
|
||||
#define NS_QDFLUSHMANAGER_CID \
|
||||
{0x6F91262A, 0xCF9E, 0x4DDD, {0xAA, 0x01, 0x7A, 0x1F, 0xCC, 0xF1, 0x42, 0x81}}
|
||||
#define NS_QDFLUSHMANAGER_CONTRACTID "@mozilla.org/gfx/qdflushmanager;1"
|
||||
|
||||
#endif /* nsQDFlushManager_h___ */
|
||||
|
|
@ -53,10 +53,6 @@
|
|||
#include "nsGfxUtils.h"
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
#ifdef MOZ_WIDGET_COCOA
|
||||
#include "nsIQDFlushManager.h"
|
||||
#endif
|
||||
|
||||
#include "plhash.h"
|
||||
|
||||
#include <FixMath.h>
|
||||
|
|
@ -1392,30 +1388,6 @@ nsRenderingContextMac::FlushRect(const nsRect& aRect)
|
|||
NS_IMETHODIMP
|
||||
nsRenderingContextMac::FlushRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight)
|
||||
{
|
||||
#ifdef MOZ_WIDGET_COCOA
|
||||
if (mPort) {
|
||||
SetupPortState();
|
||||
|
||||
nscoord x,y,w,h;
|
||||
|
||||
x = aX;
|
||||
y = aY;
|
||||
w = aWidth;
|
||||
h = aHeight;
|
||||
|
||||
mGS->mTMatrix.TransformCoord(&x, &y, &w, &h);
|
||||
|
||||
StRegionFromPool rgn;
|
||||
if (!rgn) return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
::SetRectRgn(rgn, pinToShort(x), pinToShort(y), pinToShort(x + w), pinToShort(y + h));
|
||||
|
||||
nsCOMPtr<nsIQDFlushManager> qdFlushManager =
|
||||
do_GetService("@mozilla.org/gfx/qdflushmanager;1");
|
||||
if (qdFlushManager)
|
||||
qdFlushManager->FlushPortBuffer(mPort, rgn);
|
||||
}
|
||||
#endif
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@
|
|||
#include "nsIServiceManager.h"
|
||||
|
||||
#include "nsMacResources.h"
|
||||
#include "nsIQDFlushManager.h"
|
||||
|
||||
#import "nsCursorManager.h"
|
||||
#import "nsWindowMap.h"
|
||||
|
|
@ -117,7 +116,6 @@ static NSView* sLastViewEntered = nil;
|
|||
|
||||
- (BOOL)childViewHasPlugin;
|
||||
|
||||
- (void)flushRect:(NSRect)inRect;
|
||||
- (BOOL)isRectObscuredBySubview:(NSRect)inRect;
|
||||
|
||||
#if USE_CLICK_HOLD_CONTEXTMENU
|
||||
|
|
@ -466,15 +464,6 @@ void nsChildView::TearDownView()
|
|||
[(NSView*)responder isDescendantOf:mView])
|
||||
[win makeFirstResponder: [mView superview]];
|
||||
|
||||
GrafPtr curPort = GetChildViewQuickDrawPort();
|
||||
if (curPort)
|
||||
{
|
||||
nsCOMPtr<nsIQDFlushManager> qdFlushManager =
|
||||
do_GetService("@mozilla.org/gfx/qdflushmanager;1");
|
||||
if (qdFlushManager)
|
||||
qdFlushManager->RemovePort(curPort);
|
||||
}
|
||||
|
||||
[mView removeFromSuperviewWithoutNeedingDisplay];
|
||||
[mView release];
|
||||
mView = nil;
|
||||
|
|
@ -2490,20 +2479,6 @@ nsChildView::GetThebesSurface()
|
|||
return NO;
|
||||
}
|
||||
|
||||
- (void)flushRect:(NSRect)inRect
|
||||
{
|
||||
Rect updateRect;
|
||||
updateRect.left = (short)inRect.origin.x;
|
||||
updateRect.top = (short)inRect.origin.y;
|
||||
updateRect.right = updateRect.left + (short)inRect.size.width;
|
||||
updateRect.bottom = updateRect.top + (short)inRect.size.height;
|
||||
|
||||
RgnHandle updateRgn = ::NewRgn();
|
||||
RectRgn(updateRgn, &updateRect);
|
||||
::QDFlushPortBuffer((CGrafPtr)[self qdPort], updateRgn);
|
||||
::DisposeRgn(updateRgn);
|
||||
}
|
||||
|
||||
//
|
||||
// -wantsDefaultClipping
|
||||
//
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче