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

Uncomment TransformLayerUserData and move it into Layers to fix build bustage

Browse Source
This commit is contained in:
Patrick Walton 2012-02-10 18:55:48 -08:00
parent 3b99552765
commit aae9e0d362
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/layers/Layers.h
View File

@ -1345,6 +1345,17 @@ protected:
bool mDirty;
};
#ifdef MOZ_WIDGET_ANDROID
class TransformLayerUserData : public LayerUserData {
public:
gfx3DMatrix matrix;
TransformLayerUserData(gfx3DMatrix& aMatrix) : matrix(aMatrix) {}
virtual ~TransformLayerUserData() {}
};
#endif
}
}

4
gfx/layers/ipc/CompositorParent.cpp
View File

@ -186,14 +186,12 @@ CompositorParent::Composite()
//layer->AsShadowLayer()->SetShadowTransform(worldTransform);
#endif
#if 0
#ifdef MOZ_WIDGET_ANDROID
// Hang the transform of the root layer off the layer manager.
gfx3DMatrix transform = layer->GetTransform();
transform *= worldTransform;
transform *= v;
TransformLayerUserData* transformUserData = new TransformLayerUserData(transform);
mLayerManager->SetUserData(nsGkAtoms::transform, transformUserData);
#endif
#endif
mLayerManager->EndEmptyTransaction();

4
widget/android/AndroidJavaWrappers.cpp
View File

@ -694,15 +694,11 @@ AndroidGeckoGLLayerClient::Init(jobject jobj)
void
AndroidLayerRendererFrame::Init(jobject jobj)
{
#if 0
if (!isNull()) {
Dispose();
}
wrapped_obj = GetJNIForThread()->NewGlobalRef(jobj);
#else
wrapped_obj = jobj;
#endif
}
void

8
widget/android/nsWindow.h
View File

@ -260,12 +260,4 @@ private:
#endif
};
class TransformLayerUserData : public mozilla::layers::LayerUserData {
public:
gfx3DMatrix matrix;
TransformLayerUserData(gfx3DMatrix& aMatrix) : matrix(aMatrix) {}
virtual ~TransformLayerUserData() {}
};
#endif /* NSWINDOW_H_ */