wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 75fb08918611 (bug 903466) for Android build bustage

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-08-09 18:52:11 -07:00
parent 3c031b080c
commit b107ff17c1
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widget/android/AndroidBridge.cpp
View File

@ -47,7 +47,7 @@ using namespace mozilla;
NS_IMPL_ISUPPORTS0(nsFilePickerCallback) NS_IMPL_ISUPPORTS0(nsFilePickerCallback)
StaticRefPtr<AndroidBridge> AndroidBridge::sBridge; nsRefPtr<AndroidBridge> AndroidBridge::sBridge = nullptr;
static unsigned sJavaEnvThreadIndex = 0; static unsigned sJavaEnvThreadIndex = 0;
static void JavaThreadDetachFunc(void *arg); static void JavaThreadDetachFunc(void *arg);
@ -1431,7 +1431,7 @@ namespace mozilla {
nsCOMPtr<nsIThread> mMainThread; nsCOMPtr<nsIThread> mMainThread;
}; };
StaticRefPtr<TracerRunnable> sTracerRunnable; nsCOMPtr<TracerRunnable> sTracerRunnable;
bool InitWidgetTracing() { bool InitWidgetTracing() {
if (!sTracerRunnable) if (!sTracerRunnable)

2
widget/android/AndroidBridge.h
View File

@ -421,7 +421,7 @@ public:
const int32_t aPort, const int32_t aPort,
nsACString & aResult); nsACString & aResult);
protected: protected:
static StaticRefPtr<AndroidBridge> sBridge; static nsRefPtr<AndroidBridge> sBridge;
nsTArray<nsCOMPtr<nsIMobileMessageCallback> > mSmsRequests; nsTArray<nsCOMPtr<nsIMobileMessageCallback> > mSmsRequests;
// the global JavaVM // the global JavaVM

16
widget/android/AndroidGraphicBuffer.cpp
View File

@ -89,21 +89,7 @@ static bool gTryRealloc = true;
static class GLFunctions static class GLFunctions
{ {
public: public:
MOZ_CONSTEXPR GLFunctions() : mInitialized(false), GLFunctions() : mInitialized(false)
fGetDisplay(nullptr),
fEGLGetError(nullptr),
fCreateImageKHR(nullptr),
fDestroyImageKHR(nullptr),
fImageTargetTexture2DOES(nullptr),
fBindTexture(nullptr),
fGLGetError(nullptr),
fGraphicBufferCtor(nullptr),
fGraphicBufferDtor(nullptr),
fGraphicBufferLock(nullptr),
fGraphicBufferLockRect(nullptr),
fGraphicBufferUnlock(nullptr),
fGraphicBufferGetNativeBuffer(nullptr),
fGraphicBufferReallocate(nullptr)
{ {
} }