perf(tabbookmark): apply short circuit evaluation to HandleBookmark

Bush2021 · Bush2021 · commit 203adf4dd196 · 2025-12-03T13:47:51.000-05:00
We do not and should not call `IsOnNewTab` if `IsOnBookmarkBar` is false. Otherwise, even though users click on web pages, the code may still call `IsOnNewTab` which is unnecessary and may lead to incorrect results.
diff --git a/src/tabbookmark.cc b/src/tabbookmark.cc
@@ -205,33 +205,34 @@ bool HandleBookmark(WPARAM wParam, PMOUSEHOOKSTRUCT pmouse) {
 
   POINT pt = pmouse->pt;
   HWND hwnd = WindowFromPoint(pt);
-  NodePtr top_container_view = GetTopContainerView(
-      GetFocus());  // Must use `GetFocus()`, otherwise when opening bookmarks
-                    // in a bookmark folder (and similar expanded menus),
-                    // `top_container_view` cannot be obtained, making it
-                    // impossible to correctly determine `is_on_new_tab`. See
-                    // #98.
 
-  bool is_on_bookmark = IsOnBookmark(hwnd, pt);
-  bool is_on_expanded_list = IsOnExpandedList(hwnd, pt);
-  if (is_on_bookmark && is_on_expanded_list) {
+  if (!IsOnBookmark(hwnd, pt)) {
+    return false;
+  }
+
+  if (IsOnExpandedList(hwnd, pt)) {
     // This is only used to determine the expanded dropdown menu of the address
     // bar. When the mouse clicks on it, it may penetrate through to the
     // background, causing a misjudgment that it is on the bookmark. Related
     // issue: https://github.com/Bush2021/chrome_plus/issues/162
     return false;
   }
 
-  bool is_on_new_tab = IsOnNewTab(top_container_view);
-  if (is_on_bookmark && !is_on_new_tab) {
+  NodePtr top_container_view = GetTopContainerView(
+      GetFocus());  // Must use `GetFocus()`, otherwise when opening bookmarks
+                    // in a bookmark folder (and similar expanded menus),
+                    // `top_container_view` cannot be obtained, making it
+                    // impossible to correctly determine `is_on_new_tab`. See
+                    // #98.
+
+  if (!IsOnNewTab(top_container_view)) {
     if (mode == 1) {
       SendKey(VK_MBUTTON, VK_SHIFT);
     } else if (mode == 2) {
       SendKey(VK_MBUTTON);
     }
     return true;
   }
-
   return false;
 }
 
