Changeset 231707 in webkit

Timestamp:

May 11, 2018 10:37:04 AM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][MiniBrowser] Move WK1 related code into MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=185418

Reviewed by Alex Christensen.

All WK1 related code should be moved into MiniBrowser for the preparation
of Bug 184770.

This change moves the initilization code of MiniBrowse into MiniBrowser::init().

• MiniBrowser/win/Common.cpp:

(getAppDataFolder): Removed static keyword to be called from MiniBrowser.cpp.
(setCacheFolder): This is only for WK1. Moved into MiniBrowser.cpp.

• MiniBrowser/win/Common.h: Added.
• MiniBrowser/win/MiniBrowser.cpp:

(MiniBrowser::init): Moved the initilization code from wWinMain.
(MiniBrowser::setCacheFolder): Moved from Common.cpp and made it a method.

• MiniBrowser/win/MiniBrowser.h:

(MiniBrowser::setCacheFolder): Changed to a private method.
(MiniBrowser::subclassForLayeredWindow): Changed to a private method.

• MiniBrowser/win/WinMain.cpp:

(wWinMain): Moved MiniBrowse initilization code into MiniBrowser.cpp.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/win/Common.cpp (modified) (3 diffs)
• MiniBrowser/win/Common.h (added)
• MiniBrowser/win/MiniBrowser.cpp (modified) (3 diffs)
• MiniBrowser/win/MiniBrowser.h (modified) (2 diffs)
• MiniBrowser/win/WinMain.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-05-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][MiniBrowser] Move WK1 related code into MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=185418
+
+        Reviewed by Alex Christensen.
+
+        All WK1 related code should be moved into MiniBrowser for the preparation
+        of Bug 184770.
+
+        This change moves the initilization code of MiniBrowse into MiniBrowser::init().
+
+        * MiniBrowser/win/Common.cpp:
+        (getAppDataFolder): Removed `static` keyword to be called from MiniBrowser.cpp.
+        (setCacheFolder): This is only for WK1. Moved into MiniBrowser.cpp.
+        * MiniBrowser/win/Common.h: Added.
+        * MiniBrowser/win/MiniBrowser.cpp:
+        (MiniBrowser::init): Moved the initilization code from wWinMain.
+        (MiniBrowser::setCacheFolder): Moved from Common.cpp and made it a method.
+        * MiniBrowser/win/MiniBrowser.h:
+        (MiniBrowser::setCacheFolder): Changed to a private method.
+        (MiniBrowser::subclassForLayeredWindow): Changed to a private method.
+        * MiniBrowser/win/WinMain.cpp:
+        (wWinMain): Moved MiniBrowse initilization code into MiniBrowser.cpp.
+
 2018-05-11  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/MiniBrowser/win/Common.cpp

@@ -27 +27 @@
  */
 
-#include "AccessibilityDelegate.h"
 #include "DOMDefaultImpl.h"
-#include "PrintWebUIDelegate.h"
-#include "ResourceLoadDelegate.h"
-#include "WebDownloadDelegate.h"
 #include "MiniBrowser.h"
 #include "MiniBrowserReplace.h"
@@ -155 +151 @@
 }
 
-static bool getAppDataFolder(_bstr_t& directory)
+bool getAppDataFolder(_bstr_t& directory)
 {
     wchar_t appDataDirectory[MAX_PATH];
@@ -168 +164 @@
 
     directory = _bstr_t(appDataDirectory) + L"\\" + ::PathFindFileNameW(executablePath);
-
-    return true;
-}
-
-static bool setCacheFolder()
-{
-    IWebCachePtr webCache = gMiniBrowser->webCache();
-    if (!webCache)
-        return false;
-
-    _bstr_t appDataFolder;
-    if (!getAppDataFolder(appDataFolder))
-        return false;
-
-    appDataFolder += L"\\cache";
-    webCache->setCacheFolder(appDataFolder);
 
     return true;

trunk/Tools/MiniBrowser/win/MiniBrowser.cpp

@@ -30 +30 @@
 #include "MiniBrowser.h"
 
+#include "AccessibilityDelegate.h"
+#include "Common.h"
 #include "DOMDefaultImpl.h"
 #include "MiniBrowserLibResource.h"
 #include "MiniBrowserReplace.h"
+#include "MiniBrowserWebHost.h"
+#include "PrintWebUIDelegate.h"
+#include "ResourceLoadDelegate.h"
+#include "WebDownloadDelegate.h"
 #include <WebKitLegacy/WebKitCOMAPI.h>
 #include <wtf/ExportMacros.h>
@@ -64 +70 @@
 }
 
-HRESULT MiniBrowser::init()
+HRESULT MiniBrowser::init(_bstr_t& requestedURL)
 {
     updateDeviceScaleFactor();
@@ -85 +91 @@
 
     hr = WebKitCreateInstance(CLSID_WebCache, 0, __uuidof(m_webCache), reinterpret_cast<void**>(&m_webCache.GetInterfacePtr()));
+    if (FAILED(hr))
+        return hr;
+
+    if (!seedInitialDefaultPreferences())
+        return E_FAIL;
+
+    if (!setToDefaultPreferences())
+        return E_FAIL;
+
+    if (!setCacheFolder())
+        return E_FAIL;
+
+    auto webHost = new MiniBrowserWebHost(this, m_hURLBarWnd);
+
+    hr = setFrameLoadDelegate(webHost);
+    if (FAILED(hr))
+        return hr;
+
+    hr = setFrameLoadDelegatePrivate(webHost);
+    if (FAILED(hr))
+        return hr;
+
+    hr = setUIDelegate(new PrintWebUIDelegate());
+    if (FAILED (hr))
+        return hr;
+
+    hr = setAccessibilityDelegate(new AccessibilityDelegate());
+    if (FAILED (hr))
+        return hr;
+
+    hr = setResourceLoadDelegate(new ResourceLoadDelegate(this));
+    if (FAILED(hr))
+        return hr;
+
+    IWebDownloadDelegatePtr downloadDelegate;
+    downloadDelegate.Attach(new WebDownloadDelegate());
+    hr = setDownloadDelegate(downloadDelegate);
+    if (FAILED(hr))
+        return hr;
+
+    RECT clientRect;
+    ::GetClientRect(m_hMainWnd, &clientRect);
+    if (usesLayeredWebView())
+        clientRect = { s_windowPosition.x, s_windowPosition.y, s_windowPosition.x + s_windowSize.cx, s_windowPosition.y + s_windowSize.cy };
+
+    hr = prepareViews(m_hMainWnd, clientRect, requestedURL.GetBSTR());
+    if (FAILED(hr))
+        return hr;
+
+    if (usesLayeredWebView())
+        subclassForLayeredWindow();
 
     return hr;
+}
+
+bool MiniBrowser::setCacheFolder()
+{
+    _bstr_t appDataFolder;
+    if (!getAppDataFolder(appDataFolder))
+        return false;
+
+    appDataFolder += L"\\cache";
+    webCache()->setCacheFolder(appDataFolder);
+
+    return true;
 }
 

trunk/Tools/MiniBrowser/win/MiniBrowser.h

@@ -50 +50 @@
     MiniBrowser(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false, bool pageLoadTesting = false);
 
-    HRESULT init();
+    HRESULT init(_bstr_t& requestedURL);
     HRESULT prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL);
 
@@ -99 +99 @@
     HGDIOBJ urlBarFont() { return m_hURLBarFont; }
     HWND hwnd() { return m_viewWnd; }
-    void subclassForLayeredWindow();
 
 private:
+    void subclassForLayeredWindow();
     void generateFontForScaleFactor(float);
+    bool setCacheFolder();
 
     std::vector<IWebHistoryItemPtr> m_historyItems;

trunk/Tools/MiniBrowser/win/WinMain.cpp

@@ -31 +31 @@
 #include "stdafx.h"
 #include "MiniBrowserLibResource.h"
-#include "MiniBrowserWebHost.h"
 #include "Common.cpp"
 
@@ -104 +103 @@
     SetFocus(hURLBarWnd);
 
-    RECT clientRect;
-    ::GetClientRect(hMainWnd, &clientRect);
-
-    if (usesLayeredWebView)
-        clientRect = { s_windowPosition.x, s_windowPosition.y, s_windowPosition.x + s_windowSize.cx, s_windowPosition.y + s_windowSize.cy };
-
-    MiniBrowserWebHost* webHost = nullptr;
-
-    IWebDownloadDelegatePtr downloadDelegate;
-    downloadDelegate.Attach(new WebDownloadDelegate());
-
     gMiniBrowser = new MiniBrowser(hMainWnd, hURLBarWnd, usesLayeredWebView, pageLoadTesting);
     if (!gMiniBrowser)
         goto exit;
-
-    if (!gMiniBrowser->seedInitialDefaultPreferences())
-        goto exit;
-
-    if (!gMiniBrowser->setToDefaultPreferences())
-        goto exit;
-
-    HRESULT hr = gMiniBrowser->init();
+    HRESULT hr = gMiniBrowser->init(requestedURL);
     if (FAILED(hr))
         goto exit;
 
-    if (!setCacheFolder())
-        goto exit;
-
-    webHost = new MiniBrowserWebHost(gMiniBrowser, hURLBarWnd);
-
-    hr = gMiniBrowser->setFrameLoadDelegate(webHost);
-    if (FAILED(hr))
-        goto exit;
-
-    hr = gMiniBrowser->setFrameLoadDelegatePrivate(webHost);
-    if (FAILED(hr))
-        goto exit;
-
-    hr = gMiniBrowser->setUIDelegate(new PrintWebUIDelegate());
-    if (FAILED (hr))
-        goto exit;
-
-    hr = gMiniBrowser->setAccessibilityDelegate(new AccessibilityDelegate());
-    if (FAILED (hr))
-        goto exit;
-
-    hr = gMiniBrowser->setResourceLoadDelegate(new ResourceLoadDelegate(gMiniBrowser));
-    if (FAILED(hr))
-        goto exit;
-
-    hr = gMiniBrowser->setDownloadDelegate(downloadDelegate);
-    if (FAILED(hr))
-        goto exit;
-
-    hr = gMiniBrowser->prepareViews(hMainWnd, clientRect, requestedURL.GetBSTR());
-    if (FAILED(hr))
-        goto exit;
     gViewWindow = gMiniBrowser->hwnd();
-
-    if (gMiniBrowser->usesLayeredWebView())
-        gMiniBrowser->subclassForLayeredWindow();
 
     resizeSubViews();