Merge pull request #196 from MicrosoftEdge/smoketest/1.0.1905-testing

Smoketest/1.0.1905 testing

Author: yunate

SampleApps/WebView2APISample/AppWindow.cpp

@@ -290,7 +290,7 @@ PCWSTR AppWindow::GetWindowClass()
         wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
         wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_WEBVIEW2APISAMPLE);
         wcex.lpszClassName = windowClass;
-        wcex.hIconSm = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SMALL));
+        wcex.hIconSm = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_WEBVIEW2APISAMPLE));
 
         RegisterClassExW(&wcex);
         return windowClass;
@@ -1465,26 +1465,13 @@ HRESULT AppWindow::CreateControllerWithOptions()
 
 void AppWindow::SetAppIcon(bool inPrivate)
 {
-    HICON newSmallIcon = nullptr;
-    HICON newBigIcon = nullptr;
-    if (inPrivate)
-    {
-        static HICON smallInPrivateIcon = reinterpret_cast<HICON>(LoadImage(
-            g_hInstance, MAKEINTRESOURCEW(IDI_WEBVIEW2APISAMPLE_INPRIVATE), IMAGE_ICON, 16, 16,
-            LR_DEFAULTCOLOR));
-        static HICON bigInPrivateIcon = reinterpret_cast<HICON>(LoadImage(
-            g_hInstance, MAKEINTRESOURCEW(IDI_WEBVIEW2APISAMPLE_INPRIVATE), IMAGE_ICON, 32, 32,
-            LR_DEFAULTCOLOR));
-        newSmallIcon = smallInPrivateIcon;
-        newBigIcon = bigInPrivateIcon;
-    }
-    else
-    {
-        static HICON smallIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_WEBVIEW2APISAMPLE));
-        static HICON bigIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SMALL));
-        newSmallIcon = smallIcon;
-        newBigIcon = bigIcon;
-    }
+    int iconID = inPrivate ? IDI_WEBVIEW2APISAMPLE_INPRIVATE : IDI_WEBVIEW2APISAMPLE;
+
+    HICON newSmallIcon = reinterpret_cast<HICON>(
+        LoadImage(g_hInstance, MAKEINTRESOURCEW(iconID), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
+    HICON newBigIcon = reinterpret_cast<HICON>(
+        LoadImage(g_hInstance, MAKEINTRESOURCEW(iconID), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR));
+
     reinterpret_cast<HICON>(SendMessage(
         m_mainWindow, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(newSmallIcon)));
     reinterpret_cast<HICON>(
@@ -1804,10 +1791,10 @@ void AppWindow::RegisterEventHandlers()
                     [this]
                     {
                         std::wstring message =
-                            L"A new version of the Microsoft Edge WebView2 Runtime is available on this machine. ";
+                            L"We detected there is a new version for the browser.";
                         if (m_webView)
                         {
-                            message += L"Do you want to restart the WebView2APISample app? \n\n";
+                            message += L"Do you want to restart the app? \n\n";
                             message +=
                                 L"Click No if you only want to re-create the webviews. \n";
                             message += L"Click Cancel for no action. \n";

SampleApps/WebView2APISample/ProcessComponent.cpp

@@ -180,9 +180,9 @@ bool ProcessComponent::HandleWindowMessage(
     }
     return false;
 }
-
 // Show the WebView's PID to the user.
-void ProcessComponent::ShowBrowserProcessInfo() {
+void ProcessComponent::ShowBrowserProcessInfo()
+{
     UINT32 processId;
     m_webView->get_BrowserProcessId(&processId);
 

SampleApps/WebView2APISample/ProcessComponent.h

@@ -32,7 +32,6 @@ class ProcessComponent : public ComponentBase
     void CrashBrowserProcess();
     void CrashRenderProcess();
     void PerformanceInfo();
-
     ~ProcessComponent() override;
 
     // Wait for process to exit for timeoutMs, then force quit it if it hasn't.
@@ -50,7 +49,6 @@ class ProcessComponent : public ComponentBase
 
     UINT m_browserProcessId = 0;
     wil::com_ptr<ICoreWebView2ProcessInfoCollection> m_processCollection;
-
     EventRegistrationToken m_processFailedToken = {};
     EventRegistrationToken m_processInfosChangedToken = {};
 };

SampleApps/WebView2APISample/README.md

@@ -20,6 +20,7 @@ using namespace Microsoft::WRL;
 using namespace std;
 
 static constexpr wchar_t c_samplePath[] = L"ScenarioWebViewEventMonitor.html";
+
 std::wstring WebResourceSourceToString(COREWEBVIEW2_WEB_RESOURCE_REQUEST_SOURCE_KINDS source)
 {
     switch (source)

SampleApps/WebView2APISample/ScenarioWebViewEventMonitor.cpp

@@ -1014,6 +1014,7 @@ void ScriptComponent::HandleIFrames()
                 })
                 .Get(),
             NULL));
+
         //! [AdditionalAllowedFrameAncestors_2]
         // Set up the event listeners to handle site embedding scenario. The code will take effect
         // when the site embedding page is navigated to and the embedding iframe navigates to the

SampleApps/WebView2APISample/ScriptComponent.cpp

@@ -56,6 +56,7 @@ class SettingsComponent : public ComponentBase
     wil::com_ptr<ICoreWebView2_13> m_webView2_13;
     wil::com_ptr<ICoreWebView2_14> m_webView2_14;
     wil::com_ptr<ICoreWebView2_15> m_webView2_15;
+    wil::com_ptr<ICoreWebView2_18> m_webView2_18;
     wil::com_ptr<ICoreWebView2Settings> m_settings;
     wil::com_ptr<ICoreWebView2Settings2> m_settings2;
     wil::com_ptr<ICoreWebView2Settings3> m_settings3;
@@ -67,8 +68,6 @@ class SettingsComponent : public ComponentBase
     wil::com_ptr<ICoreWebView2Controller> m_controller;
     wil::com_ptr<ICoreWebView2Controller3> m_controller3;
     wil::com_ptr<ICoreWebView2Environment> m_webViewEnvironment;
-    wil::com_ptr<ICoreWebView2Experimental5> m_webViewExperimental5;
-    wil::com_ptr<ICoreWebView2Experimental21> m_webViewExperimental21;
     wil::com_ptr<ICoreWebView2ContextMenuItem> m_displayPageUrlContextSubMenuItem;
 
     bool m_blockImages = false;

SampleApps/WebView2APISample/SettingsComponent.cpp

@@ -422,11 +422,7 @@ void ViewComponent::Suspend()
 {
     wil::com_ptr<ICoreWebView2_3> webView;
     webView = m_webView.try_query<ICoreWebView2_3>();
-    if (!webView)
-    {
-        ShowFailure(E_NOINTERFACE, L"TrySuspend API not available");
-        return;
-    }
+    CHECK_FEATURE_RETURN_EMPTY(webView);
     HRESULT hr = webView->TrySuspend(
         Callback<ICoreWebView2TrySuspendCompletedHandler>(
             [this](HRESULT errorCode, BOOL isSuccessful) -> HRESULT {
@@ -449,13 +445,9 @@ void ViewComponent::Suspend()
 //! [MemoryUsageTargetLevel]
 void ViewComponent::ToggleMemoryUsageTargetLevel()
 {
-    wil::com_ptr<ICoreWebView2Experimental5> webView;
-    webView = m_webView.try_query<ICoreWebView2Experimental5>();
-    if (!webView)
-    {
-        ShowFailure(E_NOINTERFACE, L"MemoryUsageTargetLevel API not available");
-        return;
-    }
+    wil::com_ptr<ICoreWebView2_19> webView;
+    webView = m_webView.try_query<ICoreWebView2_19>();
+    CHECK_FEATURE_RETURN_EMPTY(webView);
     COREWEBVIEW2_MEMORY_USAGE_TARGET_LEVEL memory_target_level =
         COREWEBVIEW2_MEMORY_USAGE_TARGET_LEVEL_NORMAL;
     CHECK_FAILURE(webView->get_MemoryUsageTargetLevel(&memory_target_level));
@@ -477,11 +469,7 @@ void ViewComponent::Resume()
 {
     wil::com_ptr<ICoreWebView2_3> webView;
     webView = m_webView.try_query<ICoreWebView2_3>();
-    if (!webView)
-    {
-        ShowFailure(E_NOINTERFACE, L"Resume API not available");
-        return;
-    }
+    CHECK_FEATURE_RETURN_EMPTY(webView);
     webView->Resume();
 }
 //! [Resume]