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
51 lines
1.3 KiB
C++
51 lines
1.3 KiB
C++
/* 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/. */
|
|
|
|
#ifndef _nsPluginNativeWindowGdk_h_
|
|
#define _nsPluginNativeWindowGdk_h_
|
|
|
|
#include "nsPluginNativeWindow.h"
|
|
#include "npapi.h"
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkx.h>
|
|
#include <gdk/gdk.h>
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
#include <gtk/gtkx.h>
|
|
#else
|
|
#include "gtk2xtbin.h"
|
|
#endif
|
|
#include "mozilla/X11Util.h"
|
|
|
|
class nsPluginNativeWindowGtk : public nsPluginNativeWindow {
|
|
public:
|
|
nsPluginNativeWindowGtk();
|
|
virtual ~nsPluginNativeWindowGtk();
|
|
|
|
virtual nsresult CallSetWindow(RefPtr<nsNPAPIPluginInstance> &aPluginInstance);
|
|
nsresult CreateXEmbedWindow(bool aEnableXtFocus);
|
|
void SetAllocation();
|
|
|
|
XID GetWindow() const
|
|
{
|
|
return static_cast<XID>(reinterpret_cast<uintptr_t>(window));
|
|
}
|
|
|
|
private:
|
|
void SetWindow(XID aWindow)
|
|
{
|
|
window = reinterpret_cast<void*>(static_cast<uintptr_t>(aWindow));
|
|
}
|
|
|
|
NPSetWindowCallbackStruct mWsInfo;
|
|
/**
|
|
* Either a GtkSocket or a special GtkXtBin widget (derived from GtkSocket)
|
|
* that encapsulates the Xt toolkit within a Gtk Application.
|
|
*/
|
|
GtkWidget* mSocketWidget;
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
nsresult CreateXtWindow();
|
|
#endif
|
|
};
|
|
|
|
#endif
|