Attachment 342737 Details for Bug 186623 – FIX

[patch] FIX

186623.diff (text/plain), 2.99 KB, created by Basuke Suzuki on 2018-06-14 10:14:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-06-14 10:14:28 PDT

Size: 2.99 KB

patch

obsolete

>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 19587e7bf5c..4935c07c544 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-14  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Fix build break after r232815 (SupportedPluginIdentifier)
>+        https://bugs.webkit.org/show_bug.cgi?id=186623
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebPluginInfoProvider.cpp:
>+        (WebPluginInfoProvider::pluginInfo):
>+        (WebPluginInfoProvider::webVisiblePluginInfo):
>+        * WebCoreSupport/WebPluginInfoProvider.h:
>+
> 2018-06-13  Chris Dumez  <cdumez@apple.com>
> 
>         PSON: http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion.html ASSERTS with process swap enabled
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.cpp b/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.cpp
>index 15942a8125c..1a45ab8de28 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.cpp
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.cpp
>@@ -49,7 +49,7 @@ void WebPluginInfoProvider::refreshPlugins()
>     PluginDatabase::installedPlugins()->refresh();
> }
> 
>-Vector<WebCore::PluginInfo> WebPluginInfoProvider::pluginInfo(WebCore::Page& page, std::optional<Vector<WebCore::SupportedPluginName>>&)
>+Vector<WebCore::PluginInfo> WebPluginInfoProvider::pluginInfo(WebCore::Page& page, std::optional<Vector<WebCore::SupportedPluginIdentifier>>&)
> {
>     Vector<WebCore::PluginInfo> outPlugins;
>     const Vector<PluginPackage*>& plugins = PluginDatabase::installedPlugins()->plugins();
>@@ -86,6 +86,6 @@ Vector<WebCore::PluginInfo> WebPluginInfoProvider::pluginInfo(WebCore::Page& pag
> 
> Vector<WebCore::PluginInfo> WebPluginInfoProvider::webVisiblePluginInfo(WebCore::Page& page, const WebCore::URL&)
> {
>-    std::optional<Vector<WebCore::SupportedPluginName>> supportedPluginNames;
>+    std::optional<Vector<WebCore::SupportedPluginIdentifier>> supportedPluginNames;
>     return pluginInfo(page, supportedPluginNames);
> }
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.h b/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.h
>index 119615aace5..801bcb7b462 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.h
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebPluginInfoProvider.h
>@@ -36,7 +36,7 @@ public:
> 
> private:
>     void refreshPlugins() final;
>-    Vector<WebCore::PluginInfo> pluginInfo(WebCore::Page&, std::optional<Vector<WebCore::SupportedPluginName>>&) final;
>+    Vector<WebCore::PluginInfo> pluginInfo(WebCore::Page&, std::optional<Vector<WebCore::SupportedPluginIdentifier>>&) final;
>     Vector<WebCore::PluginInfo> webVisiblePluginInfo(WebCore::Page&i, const WebCore::URL&) final;
> #if PLATFORM(MAC)
>     void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) final;

Actions: View | Formatted Diff | Diff

Attachments on bug 186623: 342737