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

Make OMTC changes not effect desktop

Browse Source
This commit is contained in:
Benoit Girard 2012-02-13 17:17:12 -05:00
parent 742823221f
commit 5ec8cb5563
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/opengl/LayerManagerOGL.cpp
View File

@ -782,7 +782,7 @@ LayerManagerOGL::Render()
mGLContext->fEnable(LOCAL_GL_SCISSOR_TEST);
mGLContext->fClearColor(1.0, 1.0, 1.0, 0.0);
mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
// Allow widget to render a custom background.

2
layout/base/FrameLayerBuilder.cpp
View File

@ -872,7 +872,7 @@ ContainerState::CreateOrRecycleThebesLayer(nsIFrame* aActiveScrolledRoot)
layer->SetTransform(gfx3DMatrix::From2D(matrix));
// FIXME: Temporary workaround for bug 681192 and bug 724786. Uncomment this code before review!
#if 0
#ifndef MOZ_JAVA_COMPOSITOR
// Calculate exact position of the top-left of the active scrolled root.
// This might not be 0,0 due to the snapping in ScaleToNearestPixels.
gfxPoint activeScrolledRootTopLeft = scaledOffset - matrix.GetTranslation();

6
widget/android/nsWindow.cpp
View File

@ -921,8 +921,14 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
nsTArray<nsIntPoint> points = ae->Points();
NS_ASSERTION(points.Length() != 3, "Size changed does not have enough coordinates");
#ifdef MOZ_JAVA_COMPOSITOR
int nw = points[1].x;
int nh = points[1].y;
#else
int nw = points[0].x;
int nh = points[0].y;
#endif
if (ae->Type() == AndroidGeckoEvent::FORCED_RESIZE || nw != gAndroidBounds.width ||
nh != gAndroidBounds.height) {