forked from mirrors/gecko-dev
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
74 lines
2.1 KiB
Text
74 lines
2.1 KiB
Text
/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
|
|
/* 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/. */
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsSystemStatusBarCocoa.h"
|
|
#include "nsStandaloneNativeMenu.h"
|
|
#include "nsObjCExceptions.h"
|
|
#include "nsIDOMElement.h"
|
|
|
|
NS_IMPL_ISUPPORTS(nsSystemStatusBarCocoa, nsISystemStatusBar)
|
|
|
|
NS_IMETHODIMP
|
|
nsSystemStatusBarCocoa::AddItem(nsIDOMElement* aDOMElement)
|
|
{
|
|
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
|
|
|
|
RefPtr<nsStandaloneNativeMenu> menu = new nsStandaloneNativeMenu();
|
|
nsresult rv = menu->Init(aDOMElement);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
nsCOMPtr<nsISupports> keyPtr = aDOMElement;
|
|
mItems.Put(keyPtr, new StatusItem(menu));
|
|
|
|
return NS_OK;
|
|
|
|
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsSystemStatusBarCocoa::RemoveItem(nsIDOMElement* aDOMElement)
|
|
{
|
|
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
|
|
|
|
mItems.Remove(aDOMElement);
|
|
|
|
return NS_OK;
|
|
|
|
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
|
|
}
|
|
|
|
nsSystemStatusBarCocoa::StatusItem::StatusItem(nsStandaloneNativeMenu* aMenu)
|
|
: mMenu(aMenu)
|
|
{
|
|
MOZ_COUNT_CTOR(nsSystemStatusBarCocoa::StatusItem);
|
|
|
|
NSMenu* nativeMenu = nil;
|
|
mMenu->GetNativeMenu(reinterpret_cast<void**>(&nativeMenu));
|
|
|
|
mStatusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength] retain];
|
|
[mStatusItem setMenu:nativeMenu];
|
|
[mStatusItem setHighlightMode:YES];
|
|
|
|
// We want the status item to get its image from menu item that mMenu was
|
|
// initialized with. Icon loads are asynchronous, so we need to let the menu
|
|
// know about the item so that it can update its icon as soon as it has
|
|
// loaded.
|
|
mMenu->SetContainerStatusBarItem(mStatusItem);
|
|
}
|
|
|
|
nsSystemStatusBarCocoa::StatusItem::~StatusItem()
|
|
{
|
|
mMenu->SetContainerStatusBarItem(nil);
|
|
[[NSStatusBar systemStatusBar] removeStatusItem:mStatusItem];
|
|
[mStatusItem release];
|
|
mStatusItem = nil;
|
|
|
|
MOZ_COUNT_DTOR(nsSystemStatusBarCocoa::StatusItem);
|
|
}
|