Bug 940101 - Switching between Firefox Desktop/Firefox Metro environments not always working. r=jimm
authorBrian R. Bondy <netzen@gmail.com>
Mon, 02 Dec 2013 09:58:51 -0500
changeset 173107 e20c9dd37a86fe074f02e3d688bedf050e54f647
parent 173106 efd16375788e362ae5e48d7abcbeae005921ce7d
child 173108 ef4c8f6e3ef7010fc12075e5c34e4f33f37ec26c
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs940101
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 940101 - Switching between Firefox Desktop/Firefox Metro environments not always working. r=jimm When mShuttingDown is true, and the CEH is running, it bails out after the GetValue call and doesn't call Execute. When we return S_OK instead of E_FAIL everything works as expected.
widget/windows/winrt/FrameworkView.cpp
--- a/widget/windows/winrt/FrameworkView.cpp
+++ b/widget/windows/winrt/FrameworkView.cpp
@@ -409,17 +409,17 @@ FrameworkView::OnWindowSizeChanged(ICore
   return S_OK;
 }
 
 HRESULT
 FrameworkView::OnWindowActivated(ICoreWindow* aSender, IWindowActivatedEventArgs* aArgs)
 {
   LogFunction();
   if (mShuttingDown || !mWidget)
-    return E_FAIL;
+    return S_OK;
   CoreWindowActivationState state;
   aArgs->get_WindowActivationState(&state);
   mWinActiveState = !(state == CoreWindowActivationState::CoreWindowActivationState_Deactivated);
   SendActivationEvent();
   return S_OK;
 }
 
 HRESULT