Bug 712105 - Use default cursor rather than last cursor for 'cursor: context-menu' on Windows and OS/2. r=jimm
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 31 Jul 2013 21:15:25 -0400
changeset 153130 60f975a050ddf0b25604d9756367b17982d6876c
parent 153129 c27c61da54fee190efc7fc404fe521b6d9ad0c61
child 153131 1e31542e117c60f5035db781d495d3144df4d9b1
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs712105
milestone25.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 712105 - Use default cursor rather than last cursor for 'cursor: context-menu' on Windows and OS/2. r=jimm
widget/os2/nsWindow.cpp
widget/windows/nsWindow.cpp
--- a/widget/os2/nsWindow.cpp
+++ b/widget/os2/nsWindow.cpp
@@ -1186,16 +1186,17 @@ NS_METHOD nsWindow::SetCursor(nsCursor a
       newPointer = WinQuerySysPointer(HWND_DESKTOP, SPTR_WAIT, FALSE);
       break;
 
     case eCursor_hyperlink:
       newPointer = sPtrArray[IDC_SELECTANCHOR-IDC_BASE];
       break;
 
     case eCursor_standard:
+    case eCursor_context_menu: // XXX See bug 258960.
       newPointer = WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE);
       break;
 
     case eCursor_n_resize:
     case eCursor_s_resize:
       newPointer = WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
       break;
 
@@ -1245,20 +1246,16 @@ NS_METHOD nsWindow::SetCursor(nsCursor a
     case eCursor_grabbing:
       newPointer = sPtrArray[IDC_GRABBING-IDC_BASE];
       break;
 
     case eCursor_spinning:
       newPointer = sPtrArray[IDC_ARROWWAIT-IDC_BASE];
       break;
 
-    case eCursor_context_menu:
-      // XXX this CSS3 cursor needs to be implemented
-      break;
-
     case eCursor_zoom_in:
       newPointer = sPtrArray[IDC_ZOOMIN-IDC_BASE];
       break;
 
     case eCursor_zoom_out:
       newPointer = sPtrArray[IDC_ZOOMOUT-IDC_BASE];
       break;
 
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -2353,16 +2353,17 @@ NS_METHOD nsWindow::SetCursor(nsCursor a
 
     case eCursor_hyperlink:
     {
       newCursor = ::LoadCursor(NULL, IDC_HAND);
       break;
     }
 
     case eCursor_standard:
+    case eCursor_context_menu: // XXX See bug 258960.
       newCursor = ::LoadCursor(NULL, IDC_ARROW);
       break;
 
     case eCursor_n_resize:
     case eCursor_s_resize:
       newCursor = ::LoadCursor(NULL, IDC_SIZENS);
       break;
 
@@ -2412,20 +2413,16 @@ NS_METHOD nsWindow::SetCursor(nsCursor a
     case eCursor_grabbing:
       newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_GRABBING));
       break;
 
     case eCursor_spinning:
       newCursor = ::LoadCursor(NULL, IDC_APPSTARTING);
       break;
 
-    case eCursor_context_menu:
-      // XXX this CSS3 cursor needs to be implemented
-      break;
-
     case eCursor_zoom_in:
       newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ZOOMIN));
       break;
 
     case eCursor_zoom_out:
       newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ZOOMOUT));
       break;