Merge MC->JM
authorBrian Hackett <bhackett1024@gmail.com>
Fri, 16 Sep 2011 20:30:25 -0700
changeset 78396 175a483e9165be7dc64f248019bab7b8e58dc27c
parent 78395 b9cf8ba34cee9be38529827eb9053d893fddc012 (current diff)
parent 78359 fb5d856370133212aac2961eeaacd0e99aaa78ab (diff)
child 78397 acc41ac331ce4a2d52c0e5e0ad0b1e00850bead9
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone9.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
Merge MC->JM
--- a/widget/src/windows/WinTaskbar.cpp
+++ b/widget/src/windows/WinTaskbar.cpp
@@ -454,25 +454,25 @@ WinTaskbar::PrepareFullScreen(nsIDOMWind
 }
 
 /* void prepareFullScreen(in voidPtr aWindow, in boolean aFullScreen); */
 NS_IMETHODIMP
 WinTaskbar::PrepareFullScreenHWND(void *aHWND, PRBool aFullScreen) {
   if (!Initialize())
     return NS_ERROR_NOT_AVAILABLE;
 
-    NS_ENSURE_ARG_POINTER(aHWND);
+  NS_ENSURE_ARG_POINTER(aHWND);
 
-    if (!::IsWindow((HWND)aHWND)) 
-      return NS_ERROR_INVALID_ARG;
+  if (!::IsWindow((HWND)aHWND)) 
+    return NS_ERROR_INVALID_ARG;
 
-    HRESULT hr = mTaskbar->MarkFullscreenWindow((HWND)aHWND, aFullScreen);
-    if (FAILED(hr)) {
-      return NS_ERROR_UNEXPECTED;
-    }
+  HRESULT hr = mTaskbar->MarkFullscreenWindow((HWND)aHWND, aFullScreen);
+  if (FAILED(hr)) {
+    return NS_ERROR_UNEXPECTED;
+  }
 
-    return NS_OK;
+  return NS_OK;
 }
 
 } // namespace widget
 } // namespace mozilla
 
 #endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7