Attachment 342230 Details for Bug 186387 – Patch

[patch] Patch

bug-186387-20180608111319.patch (text/plain), 7.07 KB, created by Fujii Hironori on 2018-06-07 19:13:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-06-07 19:13:21 PDT

Size: 7.07 KB

patch

obsolete

>Subversion Revision: 232608
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2d7a1e42f24e4868cd01396365aae83550b97067..9f29e82dcb51487eb9b11212171363de8fee13b0 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-06-07  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][MiniBrowser] MiniBrowser::updateDeviceScaleFactor should be a MainWindow's method
>+        https://bugs.webkit.org/show_bug.cgi?id=186387
>+
>+        Reviewed by Ryosuke Niwa.
>+
>+        MiniBrowser::updateDeviceScaleFactor does nothing for MiniBrowser.
>+        It should be a MainWindow's method.
>+
>+        * MiniBrowser/win/MainWindow.cpp:
>+        (MainWindow::init): Call MainWindow::updateDeviceScaleFactor.
>+        (MainWindow::resizeSubViews): Do not set a font every time window size is changed.
>+        (MainWindow::WndProc): Call MainWindow::updateDeviceScaleFactor on WM_DPICHANGED.
>+        (MainWindow::updateDeviceScaleFactor): Converted from
>+        MiniBrowser::updateDeviceScaleFactor and
>+        MiniBrowser::generateFontForScaleFactor. Set a URL bar's font if DPI is changed.
>+        * MiniBrowser/win/MainWindow.h:
>+        * MiniBrowser/win/MiniBrowser.cpp:
>+        (MiniBrowser::init):
>+        (MiniBrowser::generateFontForScaleFactor): Deleted.
>+        (MiniBrowser::updateDeviceScaleFactor): Deleted.
>+        * MiniBrowser/win/MiniBrowser.h:
>+        (MiniBrowser::deviceScaleFactor): Deleted.
>+        (MiniBrowser::urlBarFont): Deleted.
>+
> 2018-06-07  Jonathan Bedard  <jbedard@apple.com>
> 
>         [webkitpy] Treat svn versions as Version objects
>diff --git a/Tools/MiniBrowser/win/MainWindow.cpp b/Tools/MiniBrowser/win/MainWindow.cpp
>index 51831a31dc45b8fc5e2c57be6187c76a3da1abf4..b9aac7fbcb6956320e109e2015eca9afae84aa16 100644
>--- a/Tools/MiniBrowser/win/MainWindow.cpp
>+++ b/Tools/MiniBrowser/win/MainWindow.cpp
>@@ -34,6 +34,7 @@ float deviceScaleFactorForWindow(HWND);
> }
> 
> static constexpr int controlButtonWidth = 24;
>+static constexpr int urlBarHeight = 24;
> 
> static WNDPROC DefEditProc = nullptr;
> 
>@@ -119,6 +120,7 @@ bool MainWindow::init(HINSTANCE hInstance, bool usesLayeredWebView, bool pageLoa
>     if (FAILED(hr))
>         return false;
> 
>+    updateDeviceScaleFactor();
>     resizeSubViews();
>     SetFocus(m_hURLBarWnd);
>     return true;
>@@ -131,7 +133,6 @@ void MainWindow::resizeSubViews()
>     RECT rcClient;
>     GetClientRect(m_hMainWnd, &rcClient);
> 
>-    constexpr int urlBarHeight = 24;
>     int height = scaleFactor * urlBarHeight;
>     int width = scaleFactor * controlButtonWidth;
> 
>@@ -139,8 +140,6 @@ void MainWindow::resizeSubViews()
>     MoveWindow(m_hForwardButtonWnd, width, 0, width, height, TRUE);
>     MoveWindow(m_hURLBarWnd, width * 2, 0, rcClient.right, height, TRUE);
> 
>-    ::SendMessage(m_hURLBarWnd, static_cast<UINT>(WM_SETFONT), reinterpret_cast<WPARAM>(m_browserWindow->urlBarFont()), TRUE);
>-
>     if (m_browserWindow->usesLayeredWebView() || !m_browserWindow->hwnd())
>         return;
>     MoveWindow(m_browserWindow->hwnd(), 0, height, rcClient.right, rcClient.bottom - height, TRUE);
>@@ -229,7 +228,7 @@ LRESULT CALLBACK MainWindow::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
>         thisWindow->resizeSubViews();
>         break;
>     case WM_DPICHANGED:
>-        thisWindow->browserWindow()->updateDeviceScaleFactor();
>+        thisWindow->updateDeviceScaleFactor();
>         return DefWindowProc(hWnd, message, wParam, lParam);
>     default:
>         return DefWindowProc(hWnd, message, wParam, lParam);
>@@ -418,3 +417,14 @@ void MainWindow::onURLBarEnter()
>     _bstr_t bstr(strPtr);
>     loadURL(bstr.GetBSTR());
> }
>+
>+void MainWindow::updateDeviceScaleFactor()
>+{
>+    if (m_hURLBarFont)
>+        ::DeleteObject(m_hURLBarFont);
>+    auto scaleFactor = WebCore::deviceScaleFactorForWindow(m_hMainWnd);
>+    int fontHeight = scaleFactor * urlBarHeight * 3 / 4;
>+    m_hURLBarFont = ::CreateFont(fontHeight, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET,
>+        OUT_TT_ONLY_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY, FF_DONTCARE, L"Times New Roman");
>+    ::SendMessage(m_hURLBarWnd, static_cast<UINT>(WM_SETFONT), reinterpret_cast<WPARAM>(m_hURLBarFont), TRUE);
>+}
>diff --git a/Tools/MiniBrowser/win/MainWindow.h b/Tools/MiniBrowser/win/MainWindow.h
>index 81d8dd018c3c2f8993a8c718f9a5416acb7231c6..2de4b47756c58395dc703298da263ba7edf86064 100644
>--- a/Tools/MiniBrowser/win/MainWindow.h
>+++ b/Tools/MiniBrowser/win/MainWindow.h
>@@ -54,11 +54,13 @@ private:
>     MainWindow();
>     bool toggleMenuItem(UINT menuID);
>     void onURLBarEnter();
>+    void updateDeviceScaleFactor();
> 
>     HWND m_hMainWnd { nullptr };
>     HWND m_hURLBarWnd { nullptr };
>     HWND m_hBackButtonWnd { nullptr };
>     HWND m_hForwardButtonWnd { nullptr };
>     HWND m_hCacheWnd { nullptr };
>+    HGDIOBJ m_hURLBarFont { nullptr };
>     RefPtr<MiniBrowser> m_browserWindow;
> };
>diff --git a/Tools/MiniBrowser/win/MiniBrowser.cpp b/Tools/MiniBrowser/win/MiniBrowser.cpp
>index c57815b94225b217090f7cadb7c3d97928ce2c18..602ad6fd032cb4250ce5df9357885ad523937752 100644
>--- a/Tools/MiniBrowser/win/MiniBrowser.cpp
>+++ b/Tools/MiniBrowser/win/MiniBrowser.cpp
>@@ -88,8 +88,6 @@ ULONG MiniBrowser::Release()
> 
> HRESULT MiniBrowser::init()
> {
>-    updateDeviceScaleFactor();
>-
>     HRESULT hr = WebKitCreateInstance(CLSID_WebView, 0, IID_IWebView, reinterpret_cast<void**>(&m_webView.GetInterfacePtr()));
>     if (FAILED(hr))
>         return hr;
>@@ -627,22 +625,6 @@ void MiniBrowser::showLayerTree()
>     OutputDebugString(L"\n\n");
> }
> 
>-void MiniBrowser::generateFontForScaleFactor(float scaleFactor)
>-{
>-    if (m_hURLBarFont)
>-        ::DeleteObject(m_hURLBarFont);
>-
>-    m_hURLBarFont = ::CreateFont(scaleFactor * 18, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET,
>-        OUT_TT_ONLY_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY, FF_DONTCARE, L"Times New Roman");
>-}
>-
>-
>-void MiniBrowser::updateDeviceScaleFactor()
>-{
>-    m_deviceScaleFactor = WebCore::deviceScaleFactorForWindow(m_hMainWnd);
>-    generateFontForScaleFactor(m_deviceScaleFactor);
>-}
>-
> static BOOL CALLBACK AbortProc(HDC hDC, int Error)
> {
>     MSG msg;
>diff --git a/Tools/MiniBrowser/win/MiniBrowser.h b/Tools/MiniBrowser/win/MiniBrowser.h
>index 5ecf71600a5178d41e4b564a163410382a60ec3e..ec5428c5abffadb361156698780fdc5789f1585c 100644
>--- a/Tools/MiniBrowser/win/MiniBrowser.h
>+++ b/Tools/MiniBrowser/win/MiniBrowser.h
>@@ -100,10 +100,6 @@ public:
> 
>     void showLayerTree();
> 
>-    float deviceScaleFactor() { return m_deviceScaleFactor; }
>-    void updateDeviceScaleFactor();
>-
>-    HGDIOBJ urlBarFont() { return m_hURLBarFont; }
>     HWND hwnd() { return m_viewWnd; }
> 
>     void print();
>@@ -113,7 +109,6 @@ public:
> private:
>     MiniBrowser(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView, bool pageLoadTesting);
>     void subclassForLayeredWindow();
>-    void generateFontForScaleFactor(float);
>     bool setCacheFolder();
> 
>     std::vector<IWebHistoryItemPtr> m_historyItems;
>@@ -139,9 +134,7 @@ private:
> 
>     HWND m_hMainWnd { nullptr };
>     HWND m_hURLBarWnd { nullptr };
>-    HGDIOBJ m_hURLBarFont { nullptr };
>     HWND m_viewWnd { nullptr };
> 
>-    float m_deviceScaleFactor { 1.0f };
>     bool m_useLayeredWebView;
> };

Actions: View | Formatted Diff | Diff

Attachments on bug 186387: 342139 | 342230