Changeset 188969 in webkit

Timestamp:

Aug 26, 2015 10:33:49 AM (9 years ago)

Author:

Brent Fulgham

Message:

[Win] Simplify menu handling code in WinLauncher
​https://bugs.webkit.org/show_bug.cgi?id=148461

Reviewed by Zalan Bujtas.

Revise 'ToggleMenuItem' to return a boolean value indicating if
it handled the message. Revise WndProc to use this to decide if it
should pass the message on to the default handler, rather than
duplicating the logic in both places.

• WinLauncher/Common.cpp:

(ToggleMenuItem): Return true if the menu item message was handled.
(WndProc): If 'ToggleMenuItem' did not handle the message, pass
the message tothe default handler.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WinLauncher/Common.cpp (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-08-26  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Simplify menu handling code in WinLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=148461
+
+        Reviewed by Zalan Bujtas.
+
+        Revise 'ToggleMenuItem' to return a boolean value indicating if
+        it handled the message. Revise WndProc to use this to decide if it
+        should pass the message on to the default handler, rather than
+        duplicating the logic in both places.
+        
+        * WinLauncher/Common.cpp:
+        (ToggleMenuItem): Return true if the menu item message was handled.
+        (WndProc): If 'ToggleMenuItem' did not handle the message, pass
+        the message tothe default handler.
+
 2015-08-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/WinLauncher/Common.cpp

@@ -360 +360 @@
 }
 
-static void ToggleMenuItem(HWND hWnd, UINT menuID)
-{
+static bool ToggleMenuItem(HWND hWnd, UINT menuID)
+{
+    if (!gWinLauncher)
+        return false;
+
     HMENU menu = ::GetMenu(hWnd);
 
@@ -370 +373 @@
 
     if (!::GetMenuItemInfo(menu, menuID, FALSE, &info))
-        return;
+        return false;
 
     BOOL newState = !menuItemIsChecked(info);
 
     if (!gWinLauncher->standardPreferences() || !gWinLauncher->privatePreferences())
-        return;
+        return false;
 
     switch (menuID) {
@@ -423 +426 @@
         turnOffOtherUserAgents(menu);
         break;
+    default:
+        return false;
     }
 
@@ -428 +433 @@
 
     ::SetMenuItemInfo(menu, menuID, FALSE, &info);
+
+    return true;
 }
 
@@ -488 +495 @@
                 gWinLauncher->navigateForwardOrBackward(hWnd, wmId);
             break;
-        case IDM_AVFOUNDATION:
-        case IDM_ACC_COMPOSITING:
-        case IDM_WK_FULLSCREEN:
-        case IDM_COMPOSITING_BORDERS:
-        case IDM_INVERT_COLORS:
-        case IDM_DISABLE_IMAGES:
-        case IDM_DISABLE_STYLES:
-        case IDM_DISABLE_JAVASCRIPT:
-        case IDM_DISABLE_LOCAL_FILE_RESTRICTIONS:
-        case IDM_UA_DEFAULT:
-        case IDM_UA_SAFARI_8_0:
-        case IDM_UA_SAFARI_IOS_8_IPHONE:
-        case IDM_UA_SAFARI_IOS_8_IPAD:
-        case IDM_UA_IE_11:
-        case IDM_UA_CHROME_MAC:
-        case IDM_UA_CHROME_WIN:
-        case IDM_UA_FIREFOX_MAC:
-        case IDM_UA_FIREFOX_WIN:
-            ToggleMenuItem(hWnd, wmId);
-            break;
         case IDM_UA_OTHER:
             if (wmEvent)
@@ -527 +514 @@
             break;
         default:
-            return CallWindowProc(parentProc, hWnd, message, wParam, lParam);
+            if (!ToggleMenuItem(hWnd, wmId))
+                return CallWindowProc(parentProc, hWnd, message, wParam, lParam);
         }
         }