mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 12:15:33 +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
119 lines
3.4 KiB
C++
119 lines
3.4 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
// vim:set ts=2 sts=2 sw=2 et cin:
|
|
/* 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 AndroidSurfaceTexture_h__
|
|
#define AndroidSurfaceTexture_h__
|
|
#ifdef MOZ_WIDGET_ANDROID
|
|
|
|
#include <jni.h>
|
|
#include "nsIRunnable.h"
|
|
#include "gfxPlatform.h"
|
|
#include "GLDefs.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/Monitor.h"
|
|
|
|
#include "SurfaceTexture.h"
|
|
#include "AndroidNativeWindow.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
class Matrix4x4;
|
|
}
|
|
}
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
|
|
class GLContext;
|
|
|
|
/**
|
|
* This class is a wrapper around Android's SurfaceTexture class.
|
|
* Usage is pretty much exactly like the Java class, so see
|
|
* the Android documentation for details.
|
|
*/
|
|
class AndroidSurfaceTexture {
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AndroidSurfaceTexture)
|
|
|
|
public:
|
|
|
|
// The SurfaceTexture is created in an attached state. This method requires
|
|
// Android Ice Cream Sandwich.
|
|
static already_AddRefed<AndroidSurfaceTexture> Create(GLContext* aGLContext, GLuint aTexture);
|
|
|
|
// Here the SurfaceTexture will be created in a detached state. You must call
|
|
// Attach() with the GLContext you wish to composite with. It must be done
|
|
// on the thread where that GLContext is current. This method requires
|
|
// Android Jelly Bean.
|
|
static already_AddRefed<AndroidSurfaceTexture> Create();
|
|
|
|
static AndroidSurfaceTexture* Find(int id);
|
|
|
|
// If we are on Jelly Bean, the SurfaceTexture can be detached and reattached
|
|
// to allow consumption from different GLContexts. It is recommended to only
|
|
// attach while you are consuming in order to allow this.
|
|
//
|
|
// Only one GLContext may be attached at any given time. If another is already
|
|
// attached, we try to wait for it to become detached.
|
|
nsresult Attach(GLContext* aContext, PRIntervalTime aTiemout = PR_INTERVAL_NO_TIMEOUT);
|
|
|
|
nsresult Detach();
|
|
|
|
// Ability to detach is based on API version (16+), and we also block PowerVR since it has some type
|
|
// of fencing problem. Bug 1100126.
|
|
bool CanDetach() { return mCanDetach; }
|
|
|
|
GLContext* GetAttachedContext() { return mAttachedContext; }
|
|
|
|
AndroidNativeWindow* NativeWindow() {
|
|
return mNativeWindow;
|
|
}
|
|
|
|
// This attaches the updated data to the TEXTURE_EXTERNAL target
|
|
void UpdateTexImage();
|
|
|
|
void GetTransformMatrix(mozilla::gfx::Matrix4x4& aMatrix);
|
|
int ID() { return mID; }
|
|
|
|
void SetDefaultSize(mozilla::gfx::IntSize size);
|
|
|
|
// The callback is guaranteed to be called on the main thread even
|
|
// if the upstream callback is received on a different thread
|
|
void SetFrameAvailableCallback(nsIRunnable* aRunnable);
|
|
|
|
// Only should be called by AndroidJNI when we get a
|
|
// callback from the underlying SurfaceTexture instance
|
|
void NotifyFrameAvailable();
|
|
|
|
GLuint Texture() { return mTexture; }
|
|
const widget::sdk::Surface::Ref& JavaSurface() { return mSurface; }
|
|
|
|
private:
|
|
AndroidSurfaceTexture();
|
|
~AndroidSurfaceTexture();
|
|
|
|
bool Init(GLContext* aContext, GLuint aTexture);
|
|
void UpdateCanDetach();
|
|
|
|
GLuint mTexture;
|
|
widget::sdk::SurfaceTexture::GlobalRef mSurfaceTexture;
|
|
widget::sdk::Surface::GlobalRef mSurface;
|
|
|
|
Monitor mMonitor;
|
|
GLContext* mAttachedContext;
|
|
bool mCanDetach;
|
|
|
|
RefPtr<AndroidNativeWindow> mNativeWindow;
|
|
int mID;
|
|
nsCOMPtr<nsIRunnable> mFrameAvailableCallback;
|
|
};
|
|
|
|
}
|
|
}
|
|
|
|
|
|
#endif
|
|
#endif
|