<!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>[170481] 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/170481">170481</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-26 09:52:21 -0700 (Thu, 26 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed gardening. Use consistent line-endings in file.
* WinLauncher/WinLauncher.h: Use '\n' EOL marker, not DOS-style
'\r\n' EOL.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWinLauncherWinLauncherh">trunk/Tools/WinLauncher/WinLauncher.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170480 => 170481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-26 15:30:23 UTC (rev 170480)
+++ trunk/Tools/ChangeLog 2014-06-26 16:52:21 UTC (rev 170481)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-06-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed gardening. Use consistent line-endings in file.
+
+ * WinLauncher/WinLauncher.h: Use '\n' EOL marker, not DOS-style
+ '\r\n' EOL.
+
</ins><span class="cx"> 2014-06-25 László Langó <llango.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [JavaScriptCore] Make build-jsc output format better.
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.h (170480 => 170481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.h 2014-06-26 15:30:23 UTC (rev 170480)
+++ trunk/Tools/WinLauncher/WinLauncher.h 2014-06-26 16:52:21 UTC (rev 170481)
</span><span class="lines">@@ -1,31 +1,31 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <WebKit/WebKit.h>
-#include <vector>
-
</del><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <WebKit/WebKit.h>
+#include <vector>
+
</ins><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebFrame, &__uuidof(IWebFrame)>> IWebFramePtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebView, &__uuidof(IWebView)>> IWebViewPtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebViewPrivate, &__uuidof(IWebViewPrivate)>> IWebViewPrivatePtr;
</span><span class="lines">@@ -37,54 +37,54 @@
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebUIDelegate, &__uuidof(IWebUIDelegate)>> IWebUIDelegatePtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IAccessibilityDelegate, &__uuidof(IAccessibilityDelegate)>> IAccessibilityDelegatePtr;
</span><span class="cx"> typedef _com_ptr_t<_com_IIID<IWebInspector, &__uuidof(IWebInspector)>> IWebInspectorPtr;
</span><del>-
-class WinLauncher
-{
-public:
- WinLauncher(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false);
-
- HRESULT init();
- HRESULT prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL, HWND& viewWnd);
-
</del><ins>+
+class WinLauncher
+{
+public:
+ WinLauncher(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false);
+
+ HRESULT init();
+ HRESULT prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL, HWND& viewWnd);
+
</ins><span class="cx"> HRESULT loadURL(const BSTR& passedURL);
</span><del>-
- void showLastVisitedSites(IWebView& webView);
- void launchInspector();
- void navigateForwardOrBackward(HWND hWnd, UINT menuID);
</del><ins>+
+ void showLastVisitedSites(IWebView& webView);
+ void launchInspector();
+ void navigateForwardOrBackward(HWND hWnd, UINT menuID);
</ins><span class="cx"> void navigateToHistory(HWND hWnd, UINT menuID);
</span><del>- bool seedInitialDefaultPreferences();
- bool setToDefaultPreferences();
-
- HRESULT setFrameLoadDelegate(IWebFrameLoadDelegate*);
</del><ins>+ bool seedInitialDefaultPreferences();
+ bool setToDefaultPreferences();
+
+ HRESULT setFrameLoadDelegate(IWebFrameLoadDelegate*);
</ins><span class="cx"> HRESULT setUIDelegate(IWebUIDelegate*);
</span><span class="cx"> HRESULT setAccessibilityDelegate(IAccessibilityDelegate*);
</span><span class="cx">
</span><span class="cx"> IWebPreferencesPtr standardPreferences() { return m_standardPreferences; }
</span><span class="cx"> IWebPreferencesPrivatePtr privatePreferences() { return m_prefsPrivate; }
</span><span class="cx"> IWebFramePtr mainFrame();
</span><del>-
- bool hasWebView() const { return !!m_webView; }
- bool usesLayeredWebView() const { return m_useLayeredWebView; }
- bool goBack();
- bool goForward();
-
-private:
</del><ins>+
+ bool hasWebView() const { return !!m_webView; }
+ bool usesLayeredWebView() const { return m_useLayeredWebView; }
+ bool goBack();
+ bool goForward();
+
+private:
</ins><span class="cx"> std::vector<IWebHistoryItemPtr> m_historyItems;
</span><del>-
- IWebViewPtr m_webView;
</del><ins>+
+ IWebViewPtr m_webView;
</ins><span class="cx"> IWebViewPrivatePtr m_webViewPrivate;
</span><del>-
- IWebHistoryPtr m_webHistory;
- IWebInspectorPtr m_inspector;
</del><ins>+
+ IWebHistoryPtr m_webHistory;
+ IWebInspectorPtr m_inspector;
</ins><span class="cx"> IWebPreferencesPtr m_standardPreferences;
</span><span class="cx"> IWebPreferencesPrivatePtr m_prefsPrivate;
</span><del>-
- IWebFrameLoadDelegatePtr m_frameLoadDelegate;
- IWebUIDelegatePtr m_uiDelegate;
- IAccessibilityDelegatePtr m_accessibilityDelegate;
-
- HWND m_hMainWnd;
</del><ins>+
+ IWebFrameLoadDelegatePtr m_frameLoadDelegate;
+ IWebUIDelegatePtr m_uiDelegate;
+ IAccessibilityDelegatePtr m_accessibilityDelegate;
+
+ HWND m_hMainWnd;
</ins><span class="cx"> HWND m_hURLBarWnd;
</span><del>-
- bool m_useLayeredWebView;
-};
</del><ins>+
+ bool m_useLayeredWebView;
+};
</ins></span></pre>
</div>
</div>
</body>
</html>