<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190082] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190082">190082</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-09-21 15:02:38 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Use command-line argument to launch in regular or High DPI mode.
https://bugs.webkit.org/show_bug.cgi?id=149417
Reviewed by Dean Jackson.
* MiniBrowser/win/Common.cpp:
(parseCommandLine): Ignore the '--highDPI' argument. It's used at the
very start of execution, before the MiniBrowser.dll is loaded.
* win/DLLLauncher/DLLLauncherMain.cpp:
(shouldUseHighDPI): Check for '--highDPI', and use this mode if
present. On WinCairo, always use High DPI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowserwinCommoncpp">trunk/Tools/MiniBrowser/win/Common.cpp</a></li>
<li><a href="#trunkToolswinDLLLauncherDLLLauncherMaincpp">trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190081 => 190082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-21 21:52:09 UTC (rev 190081)
+++ trunk/Tools/ChangeLog 2015-09-21 22:02:38 UTC (rev 190082)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-21 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use command-line argument to launch in regular or High DPI mode.
+ https://bugs.webkit.org/show_bug.cgi?id=149417
+
+ Reviewed by Dean Jackson.
+
+ * MiniBrowser/win/Common.cpp:
+ (parseCommandLine): Ignore the '--highDPI' argument. It's used at the
+ very start of execution, before the MiniBrowser.dll is loaded.
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (shouldUseHighDPI): Check for '--highDPI', and use this mode if
+ present. On WinCairo, always use High DPI.
+
</ins><span class="cx"> 2015-09-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> 32-bit Mac build fix attempt after r190065.
</span></span></pre></div>
<a id="trunkToolsMiniBrowserwinCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/win/Common.cpp (190081 => 190082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/win/Common.cpp 2015-09-21 21:52:09 UTC (rev 190081)
+++ trunk/Tools/MiniBrowser/win/Common.cpp 2015-09-21 22:02:38 UTC (rev 190082)
</span><span class="lines">@@ -848,10 +848,12 @@
</span><span class="cx"> usesLayeredWebView = true;
</span><span class="cx"> else if (!wcsicmp(argv[i], L"--desktop"))
</span><span class="cx"> useFullDesktop = true;
</span><ins>+ else if (!wcsicmp(argv[i], L"--performance"))
+ pageLoadTesting = true;
+ else if (!wcsicmp(argv[i], L"--highDPI"))
+ continue; // ignore
</ins><span class="cx"> else if (!requestedURL)
</span><span class="cx"> requestedURL = argv[i];
</span><del>- else if (!wcsicmp(argv[i], L"--performance"))
- pageLoadTesting = true;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolswinDLLLauncherDLLLauncherMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (190081 => 190082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-09-21 21:52:09 UTC (rev 190081)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-09-21 22:02:38 UTC (rev 190082)
</span><span class="lines">@@ -178,6 +178,22 @@
</span><span class="cx"> return errorMessage;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldUseHighDPI()
+{
+#ifdef WIN_CAIRO
+ return true;
+#else
+ int argc = 0;
+ WCHAR** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+ for (int i = 1; i < argc; ++i) {
+ if (!wcsicmp(argv[i], L"--highDPI"))
+ return true;
+ }
+
+ return false;
+#endif
+}
+
</ins><span class="cx"> #if USE_CONSOLE_ENTRY_POINT
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> #else
</span><span class="lines">@@ -193,8 +209,10 @@
</span><span class="cx"> _set_FMA3_enable(0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- BOOL didIt = SetProcessDPIAware();
- _ASSERT(didIt);
</del><ins>+ if (shouldUseHighDPI()) {
+ BOOL didIt = SetProcessDPIAware();
+ _ASSERT(didIt);
+ }
</ins><span class="cx">
</span><span class="cx"> #ifdef _CRTDBG_MAP_ALLOC
</span><span class="cx"> _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
</span></span></pre>
</div>
</div>
</body>
</html>