mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 12:51:09 +02: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
60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIGeolocationProvider.h"
|
|
|
|
|
|
/*
|
|
* The CoreLocationObjects class contains the CoreLocation objects
|
|
* we'll need.
|
|
*
|
|
* Declaring them directly in CoreLocationLocationProvider
|
|
* would require Objective-C++ syntax, which would contaminate all
|
|
* files that include this header and require them to be Objective-C++
|
|
* as well.
|
|
*
|
|
* The solution then is to forward-declare CoreLocationObjects here and
|
|
* hold a pointer to it in CoreLocationLocationProvider, and only actually
|
|
* define it in CoreLocationLocationProvider.mm, thus making it safe
|
|
* for nsGeolocation.cpp, which is C++-only, to include this header.
|
|
*/
|
|
class CoreLocationObjects;
|
|
class MLSFallback;
|
|
|
|
class CoreLocationLocationProvider
|
|
: public nsIGeolocationProvider
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIGEOLOCATIONPROVIDER
|
|
|
|
CoreLocationLocationProvider();
|
|
void NotifyError(uint16_t aErrorCode);
|
|
void Update(nsIDOMGeoPosition* aSomewhere);
|
|
void CreateMLSFallbackProvider();
|
|
void CancelMLSFallbackProvider();
|
|
|
|
private:
|
|
virtual ~CoreLocationLocationProvider();
|
|
|
|
CoreLocationObjects* mCLObjects;
|
|
nsCOMPtr<nsIGeolocationUpdate> mCallback;
|
|
RefPtr<MLSFallback> mMLSFallbackProvider;
|
|
|
|
class MLSUpdate : public nsIGeolocationUpdate
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIGEOLOCATIONUPDATE
|
|
|
|
explicit MLSUpdate(CoreLocationLocationProvider& parentProvider);
|
|
|
|
private:
|
|
CoreLocationLocationProvider& mParentLocationProvider;
|
|
virtual ~MLSUpdate();
|
|
};
|
|
};
|