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

Bug 812564. Remove non-OMCT nsWindow code. r=blassey

Browse Source 
We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.Bug 812564. Remove non-OMCT nsWindow code. r=blassey

We don't need this anymore.

--HG--
extra : rebase_source : 766ff357c7ff737958f7f7304e9984d2a00307e5
This commit is contained in:
Jeff Muizelaar 2012-11-16 11:33:28 -08:00
parent 3c93ca46a2
commit 553e2b006d
1 changed files with 0 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
widget/android/nsWindow.cpp
View File

@ -60,12 +60,10 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
static gfxIntSize gAndroidBounds = gfxIntSize(0, 0);
static gfxIntSize gAndroidScreenBounds;
#ifdef MOZ_ANDROID_OMTC
#include "mozilla/layers/CompositorChild.h"
#include "mozilla/layers/CompositorParent.h"
#include "mozilla/Mutex.h"
#include "nsThreadUtils.h"
#endif
class ContentCreationNotifier;
@ -175,9 +173,7 @@ nsWindow::~nsWindow()
if (top->mFocus == this)
top->mFocus = nullptr;
ALOG("nsWindow %p destructor", (void*)this);
#ifdef MOZ_ANDROID_OMTC
SetCompositor(NULL, NULL);
#endif
}
bool
@ -694,7 +690,6 @@ nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
mUseAcceleratedRendering = GetShouldAccelerate();
#ifdef MOZ_ANDROID_OMTC
bool useCompositor = UseOffMainThreadCompositing();
if (useCompositor) {
@ -707,7 +702,6 @@ nsWindow::GetLayerManager(PLayersChild*, LayersBackend, LayerManagerPersistence,
// If we get here, then off main thread compositing failed to initialize.
sFailedToCreateGLContext = true;
}
#endif
if (!mUseAcceleratedRendering ||
sFailedToCreateGLContext)
@ -772,14 +766,12 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
if (ae->Type() == AndroidGeckoEvent::FORCED_RESIZE || nw != gAndroidBounds.width ||
nh != gAndroidBounds.height) {
#ifdef MOZ_ANDROID_OMTC
if (sCompositorParent != 0 && gAndroidBounds.width == 0) {
// Propagate size change to compositor. This is sometimes essential
// on startup, because the window size may not have been available
// when the compositor was created.
ScheduleResumeComposition(nw, nh);
}
#endif
gAndroidBounds.width = nw;
gAndroidBounds.height = nh;
@ -925,7 +917,6 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
sValidSurface = false;
break;
#ifdef MOZ_ANDROID_OMTC
case AndroidGeckoEvent::COMPOSITOR_PAUSE:
// The compositor gets paused when the app is about to go into the
// background. While the compositor is paused, we need to ensure that
@ -948,7 +939,6 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
sCompositorPaused = false;
win->RedrawAll();
break;
#endif
case AndroidGeckoEvent::GECKO_EVENT_SYNC:
AndroidBridge::Bridge()->AcknowledgeEventSync();
@ -1102,7 +1092,6 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
return;
AutoLocalJNIFrame jniFrame;
#ifdef MOZ_ANDROID_OMTC
// We're paused, or we haven't been given a window-size yet, so do nothing
if (sCompositorPaused || gAndroidBounds.width <= 0 || gAndroidBounds.height <= 0) {
return;
@ -1122,128 +1111,6 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
DrawTo(targetSurface, ae->Rect());
}
layers::renderTraceEventEnd("Widget draw to", "434646");
return;
#endif
if (!sSurfaceExists) {
return;
}
AndroidGeckoSurfaceView& sview(AndroidBridge::Bridge()->SurfaceView());
NS_ASSERTION(!sview.isNull(), "SurfaceView is null!");
AndroidBridge::Bridge()->HideProgressDialogOnce();
if (GetLayerManager(nullptr)->GetBackendType() == mozilla::layers::LAYERS_BASIC) {
if (sNativeWindow) {
unsigned char *bits;
int width, height, format, stride;
if (!AndroidBridge::Bridge()->LockWindow(sNativeWindow, &bits, &width, &height, &format, &stride)) {
ALOG("failed to lock buffer - skipping draw");
return;
}
if (!bits || format != AndroidBridge::WINDOW_FORMAT_RGB_565 ||
width != mBounds.width || height != mBounds.height) {
ALOG("surface is not expected dimensions or format - skipping draw");
AndroidBridge::Bridge()->UnlockWindow(sNativeWindow);
return;
}
nsRefPtr<gfxImageSurface> targetSurface =
new gfxImageSurface(bits,
gfxIntSize(mBounds.width, mBounds.height),
stride * 2,
gfxASurface::ImageFormatRGB16_565);
if (targetSurface->CairoStatus()) {
ALOG("### Failed to create a valid surface from the bitmap");
} else {
DrawTo(targetSurface);
}
AndroidBridge::Bridge()->UnlockWindow(sNativeWindow);
} else if (AndroidBridge::Bridge()->HasNativeBitmapAccess()) {
jobject bitmap = sview.GetSoftwareDrawBitmap(&jniFrame);
if (!bitmap) {
ALOG("no bitmap to draw into - skipping draw");
return;
}
if (!AndroidBridge::Bridge()->ValidateBitmap(bitmap, mBounds.width, mBounds.height))
return;
void *buf = AndroidBridge::Bridge()->LockBitmap(bitmap);
if (buf == nullptr) {
ALOG("### Software drawing, but failed to lock bitmap.");
return;
}
nsRefPtr<gfxImageSurface> targetSurface =
new gfxImageSurface((unsigned char *)buf,
gfxIntSize(mBounds.width, mBounds.height),
mBounds.width * 2,
gfxASurface::ImageFormatRGB16_565);
if (targetSurface->CairoStatus()) {
ALOG("### Failed to create a valid surface from the bitmap");
} else {
DrawTo(targetSurface);
}
AndroidBridge::Bridge()->UnlockBitmap(bitmap);
sview.Draw2D(bitmap, mBounds.width, mBounds.height);
} else {
jobject bytebuf = sview.GetSoftwareDrawBuffer(&jniFrame);
if (!bytebuf) {
ALOG("no buffer to draw into - skipping draw");
return;
}
void *buf = env->GetDirectBufferAddress(bytebuf);
int cap = env->GetDirectBufferCapacity(bytebuf);
if (!buf || cap != (mBounds.width * mBounds.height * 2)) {
ALOG("### Software drawing, but unexpected buffer size %d expected %d (or no buffer %p)!", cap, mBounds.width * mBounds.height * 2, buf);
return;
}
nsRefPtr<gfxImageSurface> targetSurface =
new gfxImageSurface((unsigned char *)buf,
gfxIntSize(mBounds.width, mBounds.height),
mBounds.width * 2,
gfxASurface::ImageFormatRGB16_565);
if (targetSurface->CairoStatus()) {
ALOG("### Failed to create a valid surface");
} else {
DrawTo(targetSurface);
}
sview.Draw2D(bytebuf, mBounds.width * 2);
}
} else {
int drawType = sview.BeginDrawing();
if (drawType == AndroidGeckoSurfaceView::DRAW_DISABLED) {
return;
}
if (drawType == AndroidGeckoSurfaceView::DRAW_ERROR) {
ALOG("##### BeginDrawing failed!");
return;
}
if (!sValidSurface) {
sGLContext->RenewSurface();
sValidSurface = true;
}
NS_ASSERTION(sGLContext, "Drawing with GLES without a GL context?");
DrawTo(nullptr);
sview.EndDrawing();
}
}
void
@ -2248,7 +2115,6 @@ nsWindow::GetIMEUpdatePreference()
return nsIMEUpdatePreference(true, true);
}
#ifdef MOZ_ANDROID_OMTC
void
nsWindow::DrawWindowUnderlay(LayerManager* aManager, nsIntRect aRect)
{
@ -2379,5 +2245,4 @@ nsWindow::NeedsPaint()
return !bounds.IsEmpty();
}
#endif