Changeset 206540 in webkit

Timestamp:

Sep 28, 2016, 1:35:52 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

WKSharedAPICast should not warn about acceptable custom context menu tag values
​https://bugs.webkit.org/show_bug.cgi?id=162597
<rdar://problem/28487627>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-09-28
Reviewed by Tim Horton.

• Shared/API/c/WKSharedAPICast.h:

(WebKit::toAPI):
(WebKit::toImpl):
Don't log an error when casting ContextMenu types if it is within
the Custom ContextMenu tag range.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKSharedAPICast.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-28  Joseph Pecoraro  <pecoraro@apple.com>
+
+        WKSharedAPICast should not warn about acceptable custom context menu tag values
+        https://bugs.webkit.org/show_bug.cgi?id=162597
+        <rdar://problem/28487627>
+
+        Reviewed by Tim Horton.
+
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toImpl):
+        Don't log an error when casting ContextMenu types if it is within
+        the Custom ContextMenu tag range.
+
 2016-09-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

@@ -508 +508 @@
         return kWKContextMenuItemTagShareMenu;
     default:
-        if (action < WebCore::ContextMenuItemBaseApplicationTag)
-            LOG_ERROR("ContextMenuAction %i is an unknown tag but is below the allowable custom tag value of %i", action, WebCore::  ContextMenuItemBaseApplicationTag);
+        if (action < WebCore::ContextMenuItemBaseApplicationTag && !(action >= WebCore::ContextMenuItemBaseCustomTag && action <= WebCore::ContextMenuItemLastCustomTag))
+            LOG_ERROR("ContextMenuAction %i is an unknown tag but is below the allowable custom tag value of %i", action, WebCore::ContextMenuItemBaseApplicationTag);
         return static_cast<WKContextMenuItemTag>(action);
     }
@@ -703 +703 @@
     case kWKContextMenuItemTagOpenLinkInThisWindow:
     default:
-        if (tag < kWKContextMenuItemBaseApplicationTag)
+        if (tag < kWKContextMenuItemBaseApplicationTag && !(tag >= WebCore::ContextMenuItemBaseCustomTag && tag <= WebCore::ContextMenuItemLastCustomTag))
             LOG_ERROR("WKContextMenuItemTag %i is an unknown tag but is below the allowable custom tag value of %i", tag, kWKContextMenuItemBaseApplicationTag);
         return static_cast<WebCore::ContextMenuAction>(tag);