Bug 589529: Change window class names to trick scroll drivers into working again. r=roc a=blocking-2.0:beta5
authorKyle Huey <khuey@kylehuey.com>
Sat, 28 Aug 2010 14:31:53 -0400
changeset 51746 3f499de2401d0e9e02fc644ff574ae103e3a394a
parent 51745 66e15c60b1789bc351674cc2db7040da369c1a32
child 51747 edf604a16b964e354cc8a6a12e8f676a36096387
push id15413
push userkhuey@kylehuey.com
push dateMon, 30 Aug 2010 23:55:10 +0000
treeherdermozilla-central@3f499de2401d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, blocking-2
bugs589529
milestone2.0b5pre
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 589529: Change window class names to trick scroll drivers into working again. r=roc a=blocking-2.0:beta5
widget/src/windows/nsWindow.cpp
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -741,22 +741,16 @@ LPCWSTR nsWindow::WindowClass()
     }
 
     wc.lpszClassName = kClassNameContent;
     if (!::RegisterClassW(&wc) && 
       ERROR_CLASS_ALREADY_EXISTS != GetLastError()) {
       nsWindow::sIsRegistered = FALSE;
     }
 
-    wc.lpszClassName = kClassNameUI;
-    if (!::RegisterClassW(&wc) && 
-      ERROR_CLASS_ALREADY_EXISTS != GetLastError()) {
-      nsWindow::sIsRegistered = FALSE;
-    }
-
     wc.lpszClassName = kClassNameGeneral;
     ATOM generalClassAtom = ::RegisterClassW(&wc);
     if (!generalClassAtom && 
       ERROR_CLASS_ALREADY_EXISTS != GetLastError()) {
       nsWindow::sIsRegistered = FALSE;
     }
 
     wc.lpszClassName = kClassNameDialog;
@@ -774,19 +768,16 @@ LPCWSTR nsWindow::WindowClass()
     return kClassNameDialog;
   }
   if (mContentType == eContentTypeContent) {
     return kClassNameContent;
   }
   if (mContentType == eContentTypeContentFrame) {
     return kClassNameContentFrame;
   }
-  if (mContentType == eContentTypeUI) {
-    return kClassNameUI;
-  }
   return kClassNameGeneral;
 }
 
 // Return the proper popup window class
 LPCWSTR nsWindow::WindowPopupClass()
 {
   if (!nsWindow::sIsPopupClassRegistered) {
     WNDCLASSW wc;