corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 750901 - Elm to mc migration work - metro related changes to Windows widget src to support building metro winrt bits (nsWidgetFactory, nsWindowGfx, nsToolkit, WinUtils). Also landing nsIWinMetroUtils.idl. r=bbondy

Browse Source
This commit is contained in:
Jim Mathies
2012-11-02 06:54:44 -05:00
parent a28a0a7bee
commit 1af6ce1ff7
19 changed files with 370 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
widget/windows/nsToolkit.cpp
View File

@@ -27,7 +27,9 @@ static const unsigned long kD3DUsageDelay = 5000;
static void
StartAllowingD3D9(nsITimer *aTimer, void *aClosure)
{
nsWindow::StartAllowingD3D9(true);
if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
nsWindow::StartAllowingD3D9(true);
}
}
MouseTrailer* nsToolkit::gMouseTrailer;
@@ -47,11 +49,13 @@ nsToolkit::nsToolkit()
gMouseTrailer = &mMouseTrailer;
mD3D9Timer = do_CreateInstance("@mozilla.org/timer;1");
mD3D9Timer->InitWithFuncCallback(::StartAllowingD3D9,
NULL,
kD3DUsageDelay,
nsITimer::TYPE_ONE_SHOT);
if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
mD3D9Timer = do_CreateInstance("@mozilla.org/timer;1");
mD3D9Timer->InitWithFuncCallback(::StartAllowingD3D9,
NULL,
kD3DUsageDelay,
nsITimer::TYPE_ONE_SHOT);
}
}
@@ -83,8 +87,10 @@ nsToolkit::Shutdown()
void
nsToolkit::StartAllowingD3D9()
{
nsToolkit::GetToolkit()->mD3D9Timer->Cancel();
nsWindow::StartAllowingD3D9(false);
if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
nsToolkit::GetToolkit()->mD3D9Timer->Cancel();
nsWindow::StartAllowingD3D9(false);
}
}
//-------------------------------------------------------------------------