From fead0c5ad9191317f0798272e19185049e03e2a5 Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Wed, 26 Aug 2020 09:06:42 -0700 Subject: [PATCH] Allow embedded images in SVGs to be displayed (#6163) * Add DLIMAGES to WebBrowserExt ambient control flags to allow display of img links in SVGs. We still specify FORCEOFFLINE so we are not actually performing a download. This is to target SVGs with xlink base64 encoded data. * Fix unit test --- .../UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs | 1 - src/modules/previewpane/common/controls/WebBrowserExt.cs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs index 42bef6b1c8..b10b411c95 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/WebBrowserExtUnitTests.cs @@ -46,7 +46,6 @@ namespace UnitTests_PreviewHandlerCommon var actualFlags = (int)extendedSite.InvokeMember(DISPIDAMBIENTDLCONTROL, BindingFlags.InvokeMethod, null, null, null, null, null, null); // Assert - Assert.IsTrue((actualFlags & (int)WebBrowserDownloadControlFlags.DLIMAGES) == 0); Assert.IsTrue((actualFlags & (int)WebBrowserDownloadControlFlags.VIDEOS) == 0); Assert.IsTrue((actualFlags & (int)WebBrowserDownloadControlFlags.BGSOUNDS) == 0); Assert.IsTrue((actualFlags & (int)WebBrowserDownloadControlFlags.DOWNLOADONLY) == 0); diff --git a/src/modules/previewpane/common/controls/WebBrowserExt.cs b/src/modules/previewpane/common/controls/WebBrowserExt.cs index 9fb8b253a8..c62eb6e389 100644 --- a/src/modules/previewpane/common/controls/WebBrowserExt.cs +++ b/src/modules/previewpane/common/controls/WebBrowserExt.cs @@ -54,6 +54,7 @@ namespace PreviewHandlerCommon if (name.Equals(DISPIDAMBIENTDLCONTROL)) { result = Convert.ToInt32( + WebBrowserDownloadControlFlags.DLIMAGES | WebBrowserDownloadControlFlags.PRAGMA_NO_CACHE | WebBrowserDownloadControlFlags.FORCEOFFLINE | WebBrowserDownloadControlFlags.NO_CLIENTPULL |