Title: [206540] trunk/Source/WebKit2
- Revision
- 206540
- Author
- [email protected]
- Date
- 2016-09-28 13:35:52 -0700 (Wed, 28 Sep 2016)
Log 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 <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (206539 => 206540)
--- trunk/Source/WebKit2/ChangeLog 2016-09-28 20:30:44 UTC (rev 206539)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-28 20:35:52 UTC (rev 206540)
@@ -1,3 +1,17 @@
+2016-09-28 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
Adopt MediaRemote SPI to achieve desired Now Playing behavior
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (206539 => 206540)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2016-09-28 20:30:44 UTC (rev 206539)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2016-09-28 20:35:52 UTC (rev 206540)
@@ -507,8 +507,8 @@
case WebCore::ContextMenuItemTagShareMenu:
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);
}
}
@@ -702,7 +702,7 @@
#endif
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);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
