Bug 1665453 - Rename EarlyBlankWindow to PreXULSkeletonUI r=agashlin

This is just a more correct name for what's going on.

Differential Revision: https://phabricator.services.mozilla.com/D91004

browser/app/nsBrowserApp.cpp

@@ -11,7 +11,7 @@
 #if defined(XP_WIN)
 #  include <windows.h>
 #  include <stdlib.h>
-#  include "mozilla/EarlyBlankWindow.h"
+#  include "mozilla/PreXULSkeletonUI.h"
 #elif defined(XP_UNIX)
 #  include <sys/resource.h>
 #  include <unistd.h>
@@ -319,7 +319,7 @@ int main(int argc, char* argv[], char* envp[]) {
 #endif
 
 #if defined(XP_WIN)
-  mozilla::CreateAndStoreEarlyBlankWindow(GetModuleHandle(nullptr));
+  mozilla::CreateAndStorePreXULSkeletonUI(GetModuleHandle(nullptr));
 #endif
 
   nsresult rv = InitXPCOMGlue(LibLoadingStrategy::ReadAhead);

mozglue/misc/PreXULSkeletonUI.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "EarlyBlankWindow.h"
+#include "PreXULSkeletonUI.h"
 
 #include <algorithm>
 
@@ -16,12 +16,12 @@
 
 namespace mozilla {
 
-static const wchar_t kEarlyBlankWindowKeyPath[] =
+static const wchar_t kPreXULSkeletonUIKeyPath[] =
     L"SOFTWARE"
-    L"\\" MOZ_APP_VENDOR L"\\" MOZ_APP_BASENAME L"\\EarlyBlankWindowSettings";
+    L"\\" MOZ_APP_VENDOR L"\\" MOZ_APP_BASENAME L"\\PreXULSkeletonUISettings";
 
-static bool sEarlyBlankWindowEnabled = false;
-static HWND sEarlyBlankWindowHandle;
+static bool sPreXULSkeletonUIEnabled = false;
+static HWND sPreXULSkeletonUIWindow;
 static LPWSTR const gStockApplicationIcon = MAKEINTRESOURCEW(32512);
 static LPWSTR const gIDCWait = MAKEINTRESOURCEW(32514);
 
@@ -69,7 +69,7 @@ static double sCSSToDevPixelScaling;
 // window proc to paint into the nonclient area similarly to what we do in
 // nsWindow, but it would be nontrivial code duplication, and the added
 // complexity would not be worth it, given that we can just change the
-// window style to our liking when we consume sEarlyBlankWindowHandle from
+// window style to our liking when we consume sPreXULSkeletonUIWindow from
 // nsWindow.
 static DWORD sWindowStyle = WS_POPUP;
 
@@ -292,7 +292,7 @@ void DrawSkeletonUI(HWND hWnd) {
   free(pixelBuffer);
 }
 
-LRESULT WINAPI EarlyBlankWindowProc(HWND hWnd, UINT msg, WPARAM wParam,
+LRESULT WINAPI PreXULSkeletonUIProc(HWND hWnd, UINT msg, WPARAM wParam,
                                     LPARAM lParam) {
   if (msg == WM_NCCREATE && sEnableNonClientDpiScaling) {
     sEnableNonClientDpiScaling(hWnd);
@@ -301,10 +301,10 @@ LRESULT WINAPI EarlyBlankWindowProc(HWND hWnd, UINT msg, WPARAM wParam,
   return ::DefWindowProcW(hWnd, msg, wParam, lParam);
 }
 
-bool OpenEarlyBlankWindowRegKey(HKEY& key) {
+bool OpenPreXULSkeletonUIRegKey(HKEY& key) {
   DWORD disposition;
   LSTATUS result =
-      ::RegCreateKeyExW(HKEY_CURRENT_USER, kEarlyBlankWindowKeyPath, 0, nullptr,
+      ::RegCreateKeyExW(HKEY_CURRENT_USER, kPreXULSkeletonUIKeyPath, 0, nullptr,
                         0, KEY_ALL_ACCESS, nullptr, &key, &disposition);
 
   if (result != ERROR_SUCCESS) {
@@ -323,9 +323,9 @@ bool OpenEarlyBlankWindowRegKey(HKEY& key) {
   return false;
 }
 
-void CreateAndStoreEarlyBlankWindow(HINSTANCE hInstance) {
+void CreateAndStorePreXULSkeletonUI(HINSTANCE hInstance) {
   HKEY regKey;
-  if (!IsWin10OrLater() || !OpenEarlyBlankWindowRegKey(regKey)) {
+  if (!IsWin10OrLater() || !OpenPreXULSkeletonUIRegKey(regKey)) {
     return;
   }
   AutoCloseRegKey closeKey(regKey);
@@ -338,7 +338,7 @@ void CreateAndStoreEarlyBlankWindow(HINSTANCE hInstance) {
   if (result != ERROR_SUCCESS || enabled == 0) {
     return;
   }
-  sEarlyBlankWindowEnabled = true;
+  sPreXULSkeletonUIEnabled = true;
 
   // EnableNonClientDpiScaling must be called during the initialization of
   // the window, so we have to find it and store it before we create our
@@ -388,7 +388,7 @@ void CreateAndStoreEarlyBlankWindow(HINSTANCE hInstance) {
 
   WNDCLASSW wc;
   wc.style = CS_DBLCLKS;
-  wc.lpfnWndProc = EarlyBlankWindowProc;
+  wc.lpfnWndProc = PreXULSkeletonUIProc;
   wc.cbClsExtra = 0;
   wc.cbWndExtra = 0;
   wc.hInstance = hInstance;
@@ -444,33 +444,33 @@ void CreateAndStoreEarlyBlankWindow(HINSTANCE hInstance) {
     return;
   }
 
-  sEarlyBlankWindowHandle =
+  sPreXULSkeletonUIWindow =
       sCreateWindowExW(sWindowStyleEx, L"MozillaWindowClass", L"", sWindowStyle,
                        screenX, screenY, sWindowWidth, sWindowHeight, nullptr,
                        nullptr, hInstance, nullptr);
 
-  sShowWindow(sEarlyBlankWindowHandle, SW_SHOWNORMAL);
-  sSetWindowPos(sEarlyBlankWindowHandle, 0, 0, 0, 0, 0,
+  sShowWindow(sPreXULSkeletonUIWindow, SW_SHOWNORMAL);
+  sSetWindowPos(sPreXULSkeletonUIWindow, 0, 0, 0, 0, 0,
                 SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
                     SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
-  DrawSkeletonUI(sEarlyBlankWindowHandle);
-  sRedrawWindow(sEarlyBlankWindowHandle, NULL, NULL, RDW_INVALIDATE);
+  DrawSkeletonUI(sPreXULSkeletonUIWindow);
+  sRedrawWindow(sPreXULSkeletonUIWindow, NULL, NULL, RDW_INVALIDATE);
 }
 
-HWND ConsumeEarlyBlankWindowHandle() {
-  HWND result = sEarlyBlankWindowHandle;
-  sEarlyBlankWindowHandle = nullptr;
+HWND ConsumePreXULSkeletonUIHandle() {
+  HWND result = sPreXULSkeletonUIWindow;
+  sPreXULSkeletonUIWindow = nullptr;
   return result;
 }
 
-void PersistEarlyBlankWindowValues(int screenX, int screenY, int width,
+void PersistPreXULSkeletonUIValues(int screenX, int screenY, int width,
                                    int height, double cssToDevPixelScaling) {
-  if (!sEarlyBlankWindowEnabled) {
+  if (!sPreXULSkeletonUIEnabled) {
     return;
   }
 
   HKEY regKey;
-  if (!OpenEarlyBlankWindowRegKey(regKey)) {
+  if (!OpenPreXULSkeletonUIRegKey(regKey)) {
     return;
   }
   AutoCloseRegKey closeKey(regKey);
@@ -514,11 +514,11 @@ void PersistEarlyBlankWindowValues(int screenX, int screenY, int width,
   }
 }
 
-MFBT_API bool GetEarlyBlankWindowEnabled() { return sEarlyBlankWindowEnabled; }
+MFBT_API bool GetPreXULSkeletonUIEnabled() { return sPreXULSkeletonUIEnabled; }
 
-MFBT_API void SetEarlyBlankWindowEnabled(bool value) {
+MFBT_API void SetPreXULSkeletonUIEnabled(bool value) {
   HKEY regKey;
-  if (!OpenEarlyBlankWindowRegKey(regKey)) {
+  if (!OpenPreXULSkeletonUIRegKey(regKey)) {
     return;
   }
   AutoCloseRegKey closeKey(regKey);
@@ -531,7 +531,7 @@ MFBT_API void SetEarlyBlankWindowEnabled(bool value) {
     return;
   }
 
-  sEarlyBlankWindowEnabled = true;
+  sPreXULSkeletonUIEnabled = true;
 }
 
 }  // namespace mozilla

mozglue/misc/PreXULSkeletonUI.h

@@ -4,21 +4,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#ifndef EarlyBlankWindow_h_
-#define EarlyBlankWindow_h_
+#ifndef PreXULSkeletonUI_h_
+#define PreXULSkeletonUI_h_
 
 #include <windows.h>
 #include "mozilla/Types.h"
 
 namespace mozilla {
 
-MFBT_API void CreateAndStoreEarlyBlankWindow(HINSTANCE hInstance);
-MFBT_API HWND ConsumeEarlyBlankWindowHandle();
-MFBT_API void PersistEarlyBlankWindowValues(int screenX, int screenY, int width,
+MFBT_API void CreateAndStorePreXULSkeletonUI(HINSTANCE hInstance);
+MFBT_API HWND ConsumePreXULSkeletonUIHandle();
+MFBT_API void PersistPreXULSkeletonUIValues(int screenX, int screenY, int width,
                                             int height,
                                             double cssToDevPixelScaling);
-MFBT_API bool GetEarlyBlankWindowEnabled();
-MFBT_API void SetEarlyBlankWindowEnabled(bool value);
+MFBT_API bool GetPreXULSkeletonUIEnabled();
+MFBT_API void SetPreXULSkeletonUIEnabled(bool value);
 
 }  // namespace mozilla
 

mozglue/misc/moz.build

@@ -25,7 +25,7 @@ EXPORTS.mozilla.glue += [
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla += [
-        'EarlyBlankWindow.h',
+        'PreXULSkeletonUI.h',
         'StackWalk_windows.h',
         'TimeStamp_windows.h',
         'WindowsDpiAwareness.h',
@@ -59,7 +59,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'WindowsUnicode.h',
     ]
     SOURCES += [
-        'EarlyBlankWindow.cpp',
+        'PreXULSkeletonUI.cpp',
         'TimeStamp_windows.cpp',
         'WindowsMapRemoteView.cpp',
         'WindowsProcessMitigations.cpp',

toolkit/xre/nsAppRunner.cpp

@@ -101,7 +101,7 @@
 #  include <intrin.h>
 #  include <math.h>
 #  include "cairo/cairo-features.h"
-#  include "mozilla/EarlyBlankWindow.h"
+#  include "mozilla/PreXULSkeletonUI.h"
 #  include "mozilla/DllPrefetchExperimentRegistryInfo.h"
 #  include "mozilla/WindowsDllBlocklist.h"
 #  include "mozilla/WindowsProcessMitigations.h"
@@ -1612,8 +1612,8 @@ static void ReflectSkeletonUIPrefToRegistry(const char* aPref, void* aData) {
     shouldBeEnabled = themeId.EqualsLiteral("default-theme@mozilla.org");
   }
 
-  if (GetEarlyBlankWindowEnabled() != shouldBeEnabled) {
-    SetEarlyBlankWindowEnabled(shouldBeEnabled);
+  if (GetPreXULSkeletonUIEnabled() != shouldBeEnabled) {
+    SetPreXULSkeletonUIEnabled(shouldBeEnabled);
   }
 }
 

widget/windows/nsWindow.cpp

@@ -60,7 +60,7 @@
 
 #include "mozilla/AppShutdown.h"
 #include "mozilla/AutoRestore.h"
-#include "mozilla/EarlyBlankWindow.h"
+#include "mozilla/PreXULSkeletonUI.h"
 #include "mozilla/Logging.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MiscEvents.h"
@@ -893,7 +893,7 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
   }
 
   if (aInitData->mWindowType == eWindowType_toplevel && !aParent) {
-    mWnd = ConsumeEarlyBlankWindowHandle();
+    mWnd = ConsumePreXULSkeletonUIHandle();
     if (mWnd) {
       mWasPreXulSkeletonUI = true;
       ::SetWindowLongPtrW(mWnd, GWL_STYLE, style);

xpfe/appshell/AppWindow.cpp

@@ -63,7 +63,7 @@
 #include "mozilla/EventDispatcher.h"
 
 #ifdef XP_WIN
-#  include "mozilla/EarlyBlankWindow.h"
+#  include "mozilla/PreXULSkeletonUI.h"
 #endif
 
 #ifdef MOZ_NEW_XULSTORE
@@ -1797,7 +1797,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
     return NS_OK;
   }
 
-  PersistEarlyBlankWindowValues(aRect.X(), aRect.Y(), aRect.Width(),
+  PersistPreXULSkeletonUIValues(aRect.X(), aRect.Y(), aRect.Width(),
                                 aRect.Height(),
                                 mWindow->GetDefaultScale().scale);
 #endif