mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-30 00:01:50 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
67 lines
2.0 KiB
Objective-C
67 lines
2.0 KiB
Objective-C
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/*
|
|
* Retrieves and displays icons in native menu items on Mac OS X.
|
|
*/
|
|
|
|
#ifndef nsMenuItemIconX_h_
|
|
#define nsMenuItemIconX_h_
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "imgINotificationObserver.h"
|
|
|
|
class nsIURI;
|
|
class nsIContent;
|
|
class imgRequestProxy;
|
|
class nsMenuObjectX;
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
class nsMenuItemIconX : public imgINotificationObserver
|
|
{
|
|
public:
|
|
nsMenuItemIconX(nsMenuObjectX* aMenuItem,
|
|
nsIContent* aContent,
|
|
NSMenuItem* aNativeMenuItem);
|
|
private:
|
|
virtual ~nsMenuItemIconX();
|
|
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_IMGINOTIFICATIONOBSERVER
|
|
|
|
// SetupIcon succeeds if it was able to set up the icon, or if there should
|
|
// be no icon, in which case it clears any existing icon but still succeeds.
|
|
nsresult SetupIcon();
|
|
|
|
// GetIconURI fails if the item should not have any icon.
|
|
nsresult GetIconURI(nsIURI** aIconURI);
|
|
|
|
// LoadIcon will set a placeholder image and start a load request for the
|
|
// icon. The request may not complete until after LoadIcon returns.
|
|
nsresult LoadIcon(nsIURI* aIconURI);
|
|
|
|
// Unless we take precautions, we may outlive the object that created us
|
|
// (mMenuObject, which owns our native menu item (mNativeMenuItem)).
|
|
// Destroy() should be called from mMenuObject's destructor to prevent
|
|
// this from happening. See bug 499600.
|
|
void Destroy();
|
|
|
|
protected:
|
|
nsresult OnFrameComplete(imgIRequest* aRequest);
|
|
|
|
nsCOMPtr<nsIContent> mContent;
|
|
RefPtr<imgRequestProxy> mIconRequest;
|
|
nsMenuObjectX* mMenuObject; // [weak]
|
|
nsIntRect mImageRegionRect;
|
|
bool mLoadedIcon;
|
|
bool mSetIcon;
|
|
NSMenuItem* mNativeMenuItem; // [weak]
|
|
};
|
|
|
|
#endif // nsMenuItemIconX_h_
|