<!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>[178001] 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/178001">178001</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 15:40:04 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Extend WinLauncher with support for Page Zoom
https://bugs.webkit.org/show_bug.cgi?id=140152
Reviewed by Anders Carlsson.
* WinLauncher/Common.cpp:
(WndProc):
* WinLauncher/WinLauncher.cpp:
(WinLauncher::resetZoom):
(WinLauncher::zoomIn):
(WinLauncher::zoomOut):
* WinLauncher/WinLauncher.h:
* WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc:
* WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h:
* win/DLLLauncher/DLLLauncherMain.cpp:
(wWinMain):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWinLauncherCommoncpp">trunk/Tools/WinLauncher/Common.cpp</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchercpp">trunk/Tools/WinLauncher/WinLauncher.cpp</a></li>
<li><a href="#trunkToolsWinLauncherWinLauncherh">trunk/Tools/WinLauncher/WinLauncher.h</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibrc">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibResourceh">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h</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 (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/ChangeLog 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Extend WinLauncher with support for Page Zoom
+ https://bugs.webkit.org/show_bug.cgi?id=140152
+
+ Reviewed by Anders Carlsson.
+
+ * WinLauncher/Common.cpp:
+ (WndProc):
+ * WinLauncher/WinLauncher.cpp:
+ (WinLauncher::resetZoom):
+ (WinLauncher::zoomIn):
+ (WinLauncher::zoomOut):
+ * WinLauncher/WinLauncher.h:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h:
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (wWinMain):
+
</ins><span class="cx"> 2015-01-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix API tests that are broken under HiDPI
</span></span></pre></div>
<a id="trunkToolsWinLauncherCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/Common.cpp (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/Common.cpp 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/WinLauncher/Common.cpp 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -480,6 +480,18 @@
</span><span class="cx"> else
</span><span class="cx"> DialogBox(hInst, MAKEINTRESOURCE(IDD_USER_AGENT), hWnd, CustomUserAgent);
</span><span class="cx"> break;
</span><ins>+ case IDM_ACTUAL_SIZE:
+ if (gWinLauncher)
+ gWinLauncher->resetZoom();
+ break;
+ case IDM_ZOOM_IN:
+ if (gWinLauncher)
+ gWinLauncher->zoomIn();
+ break;
+ case IDM_ZOOM_OUT:
+ if (gWinLauncher)
+ gWinLauncher->zoomOut();
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> return CallWindowProc(parentProc, hWnd, message, wParam, lParam);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLaunchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.cpp 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -444,3 +444,32 @@
</span><span class="cx">
</span><span class="cx"> return userAgent;
</span><span class="cx"> }
</span><ins>+
+typedef _com_ptr_t<_com_IIID<IWebIBActions, &__uuidof(IWebIBActions)>> IWebIBActionsPtr;
+
+void WinLauncher::resetZoom()
+{
+ IWebIBActionsPtr webActions;
+ if (FAILED(m_webView->QueryInterface(IID_IWebIBActions, reinterpret_cast<void**>(&webActions.GetInterfacePtr()))))
+ return;
+
+ webActions->resetPageZoom(nullptr);
+}
+
+void WinLauncher::zoomIn()
+{
+ IWebIBActionsPtr webActions;
+ if (FAILED(m_webView->QueryInterface(IID_IWebIBActions, reinterpret_cast<void**>(&webActions.GetInterfacePtr()))))
+ return;
+
+ webActions->zoomPageIn(nullptr);
+}
+
+void WinLauncher::zoomOut()
+{
+ IWebIBActionsPtr webActions;
+ if (FAILED(m_webView->QueryInterface(IID_IWebIBActions, reinterpret_cast<void**>(&webActions.GetInterfacePtr()))))
+ return;
+
+ webActions->zoomPageOut(nullptr);
+}
</ins></span></pre></div>
<a id="trunkToolsWinLauncherWinLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.h (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.h 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/WinLauncher/WinLauncher.h 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -84,6 +84,10 @@
</span><span class="cx">
</span><span class="cx"> PageLoadTestClient& pageLoadTestClient() { return *m_pageLoadTestClient; }
</span><span class="cx">
</span><ins>+ void resetZoom();
+ void zoomIn();
+ void zoomOut();
+
</ins><span class="cx"> private:
</span><span class="cx"> std::vector<IWebHistoryItemPtr> m_historyItems;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -43,6 +43,12 @@
</span><span class="cx"> MENUITEM "&Print\tCtrl-P", IDM_PRINT
</span><span class="cx"> MENUITEM "E&xit", IDM_EXIT
</span><span class="cx"> END
</span><ins>+ POPUP "&View"
+ BEGIN
+ MENUITEM "Actual Size", IDM_ACTUAL_SIZE
+ MENUITEM "Zoom In\tCtrl++", IDM_ZOOM_IN
+ MENUITEM "Zoom Out\tCtrl+-", IDM_ZOOM_OUT
+ END
</ins><span class="cx"> POPUP "&History"
</span><span class="cx"> BEGIN
</span><span class="cx"> MENUITEM "Back", IDM_HISTORY_BACKWARD
</span><span class="lines">@@ -111,8 +117,10 @@
</span><span class="cx">
</span><span class="cx"> IDC_WINLAUNCHER ACCELERATORS
</span><span class="cx"> BEGIN
</span><del>- "?", IDM_ABOUT, ASCII, ALT
- "/", IDM_ABOUT, ASCII, ALT
</del><ins>+ "/", IDM_ABOUT, ASCII, ALT, NOINVERT
+ "?", IDM_ABOUT, ASCII, ALT, NOINVERT
+ VK_ADD, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT
+ VK_SUBTRACT, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT
</ins><span class="cx"> END
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibResource.h 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> #define IDM_UA_FIREFOX_MAC 168
</span><span class="cx"> #define IDM_UA_FIREFOX_WIN 169
</span><span class="cx"> #define IDM_UA_OTHER 170
</span><ins>+#define IDM_ACTUAL_SIZE 171
+#define IDM_ZOOM_IN 172
+#define IDM_ZOOM_OUT 173
</ins><span class="cx"> #define IDC_EMPTY_URL_CACHE 1000
</span><span class="cx"> #define IDC_RETURN_FREE_MEMORY 1001
</span><span class="cx"> #define IDC_EMPTY_WEBCORE_CACHE 1002
</span><span class="lines">@@ -107,8 +110,8 @@
</span><span class="cx"> #ifdef APSTUDIO_INVOKED
</span><span class="cx"> #ifndef APSTUDIO_READONLY_SYMBOLS
</span><span class="cx"> #define _APS_NO_MFC 1
</span><del>-#define _APS_NEXT_RESOURCE_VALUE 171
-#define _APS_NEXT_COMMAND_VALUE 32771
</del><ins>+#define _APS_NEXT_RESOURCE_VALUE 174
+#define _APS_NEXT_COMMAND_VALUE 32776
</ins><span class="cx"> #define _APS_NEXT_CONTROL_VALUE 1053
</span><span class="cx"> #define _APS_NEXT_SYMED_VALUE 110
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolswinDLLLauncherDLLLauncherMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (178000 => 178001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-01-06 23:16:51 UTC (rev 178000)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-01-06 23:40:04 UTC (rev 178001)
</span><span class="lines">@@ -187,6 +187,8 @@
</span><span class="cx"> int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><ins>+ _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF);
+
</ins><span class="cx"> enableTerminationOnHeapCorruption();
</span><span class="cx">
</span><span class="cx"> // Get the path of our executable.
</span></span></pre>
</div>
</div>
</body>
</html>