[webkit-reviews] review requested: [Bug 117998] need mechanism to detect (partially) hidden blocked plugins : [Attachment 206029] Patch to provide indication of (partially) hidden blocked plugin replacement elements #4 (resolving conflicts)

[bugzilla-daemon at webkit.org]

Gordon Sheridan <gordon_sheridan at apple.com> has asked  for review:
Bug 117998: need mechanism to detect (partially) hidden blocked plugins
https://bugs.webkit.org/show_bug.cgi?id=117998

Attachment 206029: Patch to provide indication of (partially) hidden blocked
plugin replacement elements #4 (resolving conflicts)
https://bugs.webkit.org/attachment.cgi?id=206029&action=review

------- Additional Comments from Gordon Sheridan <gordon_sheridan at apple.com>
This patch resolves the ChangeLog conflicts, and reverts to Jessie's original
spelling of PlugIn for the the key and wrapper functions.