<!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>[188703] trunk/Source/WebKit/win</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/188703">188703</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-08-20 14:36:57 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Miscellaneous Windows Cleanups
https://bugs.webkit.org/show_bug.cgi?id=148240
Reviewed by Dean Jackson.
Correct some C++ style issues in the Windows code.
* AccessibleBase.cpp:
* AccessibleTextImpl.cpp:
* CFDictionaryPropertyBag.cpp:
* DOMCoreClasses.cpp:
* DOMEventsClasses.cpp:
* MemoryStream.cpp:
* MemoryStream.h:
* WebCoreSupport/WebDesktopNotificationsDelegate.cpp:
* WebCoreSupport/WebEditorClient.cpp:
* WebCoreSupport/WebEditorClient.h:
* WebDownload.cpp:
* WebDownloadCurl.cpp:
* WebError.cpp:
* WebHistoryItem.cpp:
* WebJavaScriptCollector.cpp:
* WebNotificationCenter.cpp:
* WebPreferences.cpp:
* WebURLAuthenticationChallengeSenderCurl.cpp:
* WebURLCredential.cpp:
* WebView.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinAccessibleBasecpp">trunk/Source/WebKit/win/AccessibleBase.cpp</a></li>
<li><a href="#trunkSourceWebKitwinAccessibleTextImplcpp">trunk/Source/WebKit/win/AccessibleTextImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitwinCFDictionaryPropertyBagcpp">trunk/Source/WebKit/win/CFDictionaryPropertyBag.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinDOMCSSClassesh">trunk/Source/WebKit/win/DOMCSSClasses.h</a></li>
<li><a href="#trunkSourceWebKitwinDOMCoreClassescpp">trunk/Source/WebKit/win/DOMCoreClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinDOMCoreClassesh">trunk/Source/WebKit/win/DOMCoreClasses.h</a></li>
<li><a href="#trunkSourceWebKitwinDOMEventsClassescpp">trunk/Source/WebKit/win/DOMEventsClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinDOMEventsClassesh">trunk/Source/WebKit/win/DOMEventsClasses.h</a></li>
<li><a href="#trunkSourceWebKitwinDOMHTMLClassesh">trunk/Source/WebKit/win/DOMHTMLClasses.h</a></li>
<li><a href="#trunkSourceWebKitwinMemoryStreamcpp">trunk/Source/WebKit/win/MemoryStream.cpp</a></li>
<li><a href="#trunkSourceWebKitwinMemoryStreamh">trunk/Source/WebKit/win/MemoryStream.h</a></li>
<li><a href="#trunkSourceWebKitwinWebApplicationCachecpp">trunk/Source/WebKit/win/WebApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebDesktopNotificationsDelegatecpp">trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebDownloadcpp">trunk/Source/WebKit/win/WebDownload.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDownloadCurlcpp">trunk/Source/WebKit/win/WebDownloadCurl.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebErrorcpp">trunk/Source/WebKit/win/WebError.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebHistoryItemcpp">trunk/Source/WebKit/win/WebHistoryItem.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebJavaScriptCollectorcpp">trunk/Source/WebKit/win/WebJavaScriptCollector.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitClassFactorycpp">trunk/Source/WebKit/win/WebKitClassFactory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebNotificationCentercpp">trunk/Source/WebKit/win/WebNotificationCenter.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebURLAuthenticationChallengeSenderCurlcpp">trunk/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebURLCredentialcpp">trunk/Source/WebKit/win/WebURLCredential.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebURLProtectionSpacecpp">trunk/Source/WebKit/win/WebURLProtectionSpace.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebURLResponsecpp">trunk/Source/WebKit/win/WebURLResponse.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebWorkersPrivatecpp">trunk/Source/WebKit/win/WebWorkersPrivate.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinAccessibleBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/AccessibleBase.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/AccessibleBase.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/AccessibleBase.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> return S_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE AccessibleBase::get_accDescription(VARIANT vChild, __deref_opt_out BSTR* description)
</del><ins>+HRESULT AccessibleBase::get_accDescription(VARIANT vChild, __deref_opt_out BSTR* description)
</ins><span class="cx"> {
</span><span class="cx"> if (!description)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> return S_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE AccessibleBase::get_accRole(VARIANT vChild, _Out_ VARIANT* pvRole)
</del><ins>+HRESULT AccessibleBase::get_accRole(VARIANT vChild, _Out_ VARIANT* pvRole)
</ins><span class="cx"> {
</span><span class="cx"> if (!pvRole)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE AccessibleBase::accSelect(long selectionFlags, VARIANT vChild)
</del><ins>+HRESULT AccessibleBase::accSelect(long selectionFlags, VARIANT vChild)
</ins><span class="cx"> {
</span><span class="cx"> // According to MSDN, these combinations are invalid.
</span><span class="cx"> if (((selectionFlags & (SELFLAG_ADDSELECTION | SELFLAG_REMOVESELECTION)) == (SELFLAG_ADDSELECTION | SELFLAG_REMOVESELECTION))
</span><span class="lines">@@ -669,12 +669,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE AccessibleBase::get_accSelection(_Out_ VARIANT*)
</del><ins>+HRESULT AccessibleBase::get_accSelection(_Out_ VARIANT*)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE AccessibleBase::get_accFocus(_Out_ VARIANT* pvFocusedChild)
</del><ins>+HRESULT AccessibleBase::get_accFocus(_Out_ VARIANT* pvFocusedChild)
</ins><span class="cx"> {
</span><span class="cx"> if (!pvFocusedChild)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE AccessibleBase::get_accDefaultAction(VARIANT vChild, __deref_opt_out BSTR* action)
</del><ins>+HRESULT AccessibleBase::get_accDefaultAction(VARIANT vChild, __deref_opt_out BSTR* action)
</ins><span class="cx"> {
</span><span class="cx"> if (!action)
</span><span class="cx"> return E_POINTER;
</span></span></pre></div>
<a id="trunkSourceWebKitwinAccessibleTextImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/AccessibleTextImpl.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/AccessibleTextImpl.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/AccessibleTextImpl.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE AccessibleText::Release(void)
</del><ins>+ULONG AccessibleText::Release()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_refCount > 0);
</span><span class="cx"> if (--m_refCount)
</span></span></pre></div>
<a id="trunkSourceWebKitwinCFDictionaryPropertyBagcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/CFDictionaryPropertyBag.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/CFDictionaryPropertyBag.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/CFDictionaryPropertyBag.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE CFDictionaryPropertyBag::AddRef()
</del><ins>+ULONG CFDictionaryPropertyBag::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE CFDictionaryPropertyBag::Release(void)
</del><ins>+ULONG CFDictionaryPropertyBag::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE CFDictionaryPropertyBag::Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog * /*pErrorLog*/)
</del><ins>+HRESULT CFDictionaryPropertyBag::Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog * /*pErrorLog*/)
</ins><span class="cx"> {
</span><span class="cx"> if (!pszPropName)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE CFDictionaryPropertyBag::Write(_In_ LPCOLESTR pszPropName, _In_ VARIANT* pVar)
</del><ins>+HRESULT CFDictionaryPropertyBag::Write(_In_ LPCOLESTR pszPropName, _In_ VARIANT* pVar)
</ins><span class="cx"> {
</span><span class="cx"> if (!pszPropName || !pVar)
</span><span class="cx"> return E_POINTER;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-08-20 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Miscellaneous Windows Cleanups
+ https://bugs.webkit.org/show_bug.cgi?id=148240
+
+ Reviewed by Dean Jackson.
+
+ Correct some C++ style issues in the Windows code.
+
+ * AccessibleBase.cpp:
+ * AccessibleTextImpl.cpp:
+ * CFDictionaryPropertyBag.cpp:
+ * DOMCoreClasses.cpp:
+ * DOMEventsClasses.cpp:
+ * MemoryStream.cpp:
+ * MemoryStream.h:
+ * WebCoreSupport/WebDesktopNotificationsDelegate.cpp:
+ * WebCoreSupport/WebEditorClient.cpp:
+ * WebCoreSupport/WebEditorClient.h:
+ * WebDownload.cpp:
+ * WebDownloadCurl.cpp:
+ * WebError.cpp:
+ * WebHistoryItem.cpp:
+ * WebJavaScriptCollector.cpp:
+ * WebNotificationCenter.cpp:
+ * WebPreferences.cpp:
+ * WebURLAuthenticationChallengeSenderCurl.cpp:
+ * WebURLCredential.cpp:
+ * WebView.cpp:
+
</ins><span class="cx"> 2015-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Build fix after r188662.
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCSSClassesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCSSClasses.h (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCSSClasses.h 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/DOMCSSClasses.h 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCoreClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -1011,7 +1011,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE DOMElement::lineBoxRects(__inout_ecount_full(cRects) RECT* /*rects*/, int cRects)
</del><ins>+HRESULT DOMElement::lineBoxRects(__inout_ecount_full(cRects) RECT* /*rects*/, int cRects)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCoreClassesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCoreClasses.h (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCoreClasses.h 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/DOMCoreClasses.h 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return WebScriptObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return WebScriptObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return WebScriptObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMNode::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMNode::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMNode::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMNode::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMNode::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMNode::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMEventsClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMEventsClasses.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMEventsClasses.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/DOMEventsClasses.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE DOMEvent::preventDefault()
</del><ins>+HRESULT DOMEvent::preventDefault()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return E_NOTIMPL;
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMEventsClassesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMEventsClasses.h (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMEventsClasses.h 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/DOMEventsClasses.h 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMEvent::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMEvent::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMEvent::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMUIEvent::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMUIEvent::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMUIEvent::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMUIEvent::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMUIEvent::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMUIEvent::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMEvent::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMEvent::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMEvent::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMHTMLClassesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMHTMLClasses.h (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMHTMLClasses.h 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/DOMHTMLClasses.h 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMObject::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMObject::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMObject::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -785,7 +785,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMHTMLElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMHTMLElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMHTMLElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMHTMLElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -1549,7 +1549,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMHTMLElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMHTMLElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -1926,7 +1926,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMHTMLElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMHTMLElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -2345,7 +2345,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMHTMLElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMHTMLElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span><span class="lines">@@ -2733,7 +2733,7 @@
</span><span class="cx"> // IUnknown
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return DOMHTMLElement::AddRef(); }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return DOMHTMLElement::Release(); }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return DOMHTMLElement::Release(); }
</ins><span class="cx">
</span><span class="cx"> // IWebScriptObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE throwException(_In_ BSTR exceptionMessage, _Out_ BOOL* result)
</span></span></pre></div>
<a id="trunkSourceWebKitwinMemoryStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/MemoryStream.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/MemoryStream.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/MemoryStream.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2007, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,9 +32,7 @@
</span><span class="cx"> // MemoryStream ---------------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> MemoryStream::MemoryStream(PassRefPtr<SharedBuffer> buffer)
</span><del>- : m_refCount(0)
- , m_buffer(buffer)
- , m_pos(0)
</del><ins>+ : m_buffer(buffer)
</ins><span class="cx"> {
</span><span class="cx"> gClassCount++;
</span><span class="cx"> gClassNameCount().add("MemoryStream");
</span><span class="lines">@@ -71,12 +69,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE MemoryStream::AddRef()
</del><ins>+ULONG MemoryStream::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE MemoryStream::Release(void)
</del><ins>+ULONG MemoryStream::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span><span class="lines">@@ -87,10 +85,7 @@
</span><span class="cx">
</span><span class="cx"> // ISequentialStream ----------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Read(
- /* [length_is][size_is][out] */ void* pv,
- /* [in] */ ULONG cb,
- /* [out] */ ULONG* pcbRead)
</del><ins>+HRESULT MemoryStream::Read(/* [length_is][size_is][out] */ void* pv, /* [in] */ ULONG cb, /* [out] */ ULONG* pcbRead)
</ins><span class="cx"> {
</span><span class="cx"> *pcbRead = 0;
</span><span class="cx">
</span><span class="lines">@@ -111,10 +106,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Write(
- /* [size_is][in] */ const void* /*pv*/,
- /* [in] */ ULONG /*cb*/,
- /* [out] */ ULONG* /*pcbWritten*/)
</del><ins>+HRESULT MemoryStream::Write(/* [size_is][in] */ const void* /*pv*/, /* [in] */ ULONG /*cb*/, /* [out] */ ULONG* /*pcbWritten*/)
</ins><span class="cx"> {
</span><span class="cx"> // we use this for read-only streams
</span><span class="cx"> return STG_E_ACCESSDENIED;
</span><span class="lines">@@ -122,10 +114,7 @@
</span><span class="cx">
</span><span class="cx"> // IStream --------------------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Seek(
- /* [in] */ LARGE_INTEGER dlibMove,
- /* [in] */ DWORD dwOrigin,
- /* [out] */ ULARGE_INTEGER* plibNewPosition)
</del><ins>+HRESULT MemoryStream::Seek(/* [in] */ LARGE_INTEGER dlibMove, /* [in] */ DWORD dwOrigin, /* [out] */ ULARGE_INTEGER* plibNewPosition)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_buffer)
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -174,17 +163,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::SetSize(
- /* [in] */ ULARGE_INTEGER /*libNewSize*/)
</del><ins>+HRESULT MemoryStream::SetSize(ULARGE_INTEGER /*libNewSize*/)
</ins><span class="cx"> {
</span><span class="cx"> return STG_E_INVALIDFUNCTION;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::CopyTo(
- /* [unique][in] */ IStream* pstm,
- /* [in] */ ULARGE_INTEGER cb,
- /* [out] */ ULARGE_INTEGER* pcbRead,
- /* [out] */ ULARGE_INTEGER* pcbWritten)
</del><ins>+HRESULT MemoryStream::CopyTo(/* [unique][in] */ IStream* pstm, /* [in] */ ULARGE_INTEGER cb, /* [out] */ ULARGE_INTEGER* pcbRead, /* [out] */ ULARGE_INTEGER* pcbWritten)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_buffer)
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -208,36 +192,27 @@
</span><span class="cx"> return hr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Commit(
- /* [in] */ DWORD /*grfCommitFlags*/)
</del><ins>+HRESULT MemoryStream::Commit(DWORD /*grfCommitFlags*/)
</ins><span class="cx"> {
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Revert( void)
</del><ins>+HRESULT MemoryStream::Revert()
</ins><span class="cx"> {
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::LockRegion(
- /* [in] */ ULARGE_INTEGER /*libOffset*/,
- /* [in] */ ULARGE_INTEGER /*cb*/,
- /* [in] */ DWORD /*dwLockType*/)
</del><ins>+HRESULT MemoryStream::LockRegion(ULARGE_INTEGER /*libOffset*/, ULARGE_INTEGER /*cb*/, DWORD /*dwLockType*/)
</ins><span class="cx"> {
</span><span class="cx"> return STG_E_INVALIDFUNCTION;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::UnlockRegion(
- /* [in] */ ULARGE_INTEGER /*libOffset*/,
- /* [in] */ ULARGE_INTEGER /*cb*/,
- /* [in] */ DWORD /*dwLockType*/)
</del><ins>+HRESULT MemoryStream::UnlockRegion(ULARGE_INTEGER /*libOffset*/, ULARGE_INTEGER /*cb*/, DWORD /*dwLockType*/)
</ins><span class="cx"> {
</span><span class="cx"> return STG_E_INVALIDFUNCTION;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Stat(
- /* [out] */ STATSTG* pstatstg,
- /* [in] */ DWORD /*grfStatFlag*/)
</del><ins>+HRESULT MemoryStream::Stat(_Out_ STATSTG* pstatstg, DWORD /*grfStatFlag*/)
</ins><span class="cx"> {
</span><span class="cx"> if (!pstatstg)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -251,8 +226,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE MemoryStream::Clone(
- /* [out] */ IStream** ppstm)
</del><ins>+HRESULT MemoryStream::Clone(_COM_Outptr_ IStream** ppstm)
</ins><span class="cx"> {
</span><span class="cx"> MemoryStream::createInstance(m_buffer).copyRefTo(ppstm);
</span><span class="cx"> // FIXME: MSDN says we should be returning STG_E_INSUFFICIENT_MEMORY instead of E_OUTOFMEMORY here.
</span></span></pre></div>
<a id="trunkSourceWebKitwinMemoryStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/MemoryStream.h (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/MemoryStream.h 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/MemoryStream.h 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2007, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -65,8 +65,7 @@
</span><span class="cx"> /* [in] */ DWORD dwOrigin,
</span><span class="cx"> /* [out] */ ULARGE_INTEGER* plibNewPosition);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE SetSize(
- /* [in] */ ULARGE_INTEGER libNewSize);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE SetSize(ULARGE_INTEGER libNewSize);
</ins><span class="cx">
</span><span class="cx"> virtual /* [local] */ HRESULT STDMETHODCALLTYPE CopyTo(
</span><span class="cx"> /* [unique][in] */ IStream* pstm,
</span><span class="lines">@@ -74,32 +73,17 @@
</span><span class="cx"> /* [out] */ ULARGE_INTEGER* pcbRead,
</span><span class="cx"> /* [out] */ ULARGE_INTEGER* pcbWritten);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE Commit(
- /* [in] */ DWORD grfCommitFlags);
-
- virtual HRESULT STDMETHODCALLTYPE Revert( void);
-
- virtual HRESULT STDMETHODCALLTYPE LockRegion(
- /* [in] */ ULARGE_INTEGER libOffset,
- /* [in] */ ULARGE_INTEGER cb,
- /* [in] */ DWORD dwLockType);
-
- virtual HRESULT STDMETHODCALLTYPE UnlockRegion(
- /* [in] */ ULARGE_INTEGER libOffset,
- /* [in] */ ULARGE_INTEGER cb,
- /* [in] */ DWORD dwLockType);
-
- virtual HRESULT STDMETHODCALLTYPE Stat(
- /* [out] */ STATSTG* pstatstg,
- /* [in] */ DWORD grfStatFlag);
-
- virtual HRESULT STDMETHODCALLTYPE Clone(
- /* [out] */ IStream** ppstm);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE Commit(DWORD grfCommitFlags);
+ virtual HRESULT STDMETHODCALLTYPE Revert();
+ virtual HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
+ virtual HRESULT STDMETHODCALLTYPE UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
+ virtual HRESULT STDMETHODCALLTYPE Stat(_Out_ STATSTG*, DWORD grfStatFlag);
+ virtual HRESULT STDMETHODCALLTYPE Clone(_COM_Outptr_ IStream** ppstm);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- ULONG m_refCount;
</del><span class="cx"> RefPtr<WebCore::SharedBuffer> m_buffer;
</span><del>- size_t m_pos;
</del><ins>+ size_t m_pos { 0 };
+ ULONG m_refCount { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebApplicationCache.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebApplicationCache.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebApplicationCache.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebApplicationCache::Release(void)
</del><ins>+ULONG WebApplicationCache::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebDesktopNotificationsDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebDesktopNotificationsDelegate.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -81,12 +81,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE NotificationCOMWrapper::AddRef()
</del><ins>+ULONG NotificationCOMWrapper::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE NotificationCOMWrapper::Release()
</del><ins>+ULONG NotificationCOMWrapper::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span><span class="lines">@@ -94,49 +94,49 @@
</span><span class="cx"> return newRef;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::isHTML(BOOL* result)
</del><ins>+HRESULT NotificationCOMWrapper::isHTML(BOOL* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = m_inner->isHTML();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::contentsURL(BSTR* result)
</del><ins>+HRESULT NotificationCOMWrapper::contentsURL(BSTR* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = BString(m_inner->url()).release();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::iconURL(BSTR* result)
</del><ins>+HRESULT NotificationCOMWrapper::iconURL(BSTR* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = BString(m_inner->contents().icon()).release();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::title(BSTR* result)
</del><ins>+HRESULT NotificationCOMWrapper::title(BSTR* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = BString(m_inner->contents().title()).release();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::text(BSTR* result)
</del><ins>+HRESULT NotificationCOMWrapper::text(BSTR* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = BString(m_inner->contents().body()).release();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::notifyDisplay()
</del><ins>+HRESULT NotificationCOMWrapper::notifyDisplay()
</ins><span class="cx"> {
</span><span class="cx"> m_inner->dispatchDisplayEvent();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::notifyError()
</del><ins>+HRESULT NotificationCOMWrapper::notifyError()
</ins><span class="cx"> {
</span><span class="cx"> m_inner->dispatchErrorEvent();
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE NotificationCOMWrapper::notifyClose(BOOL xplicit)
</del><ins>+HRESULT NotificationCOMWrapper::notifyClose(BOOL xplicit)
</ins><span class="cx"> {
</span><span class="cx"> m_inner->dispatchCloseEvent();
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2007, 2011, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -103,12 +103,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebEditorUndoTarget::AddRef()
</del><ins>+ULONG WebEditorUndoTarget::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebEditorUndoTarget::Release(void)
</del><ins>+ULONG WebEditorUndoTarget::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span><span class="lines">@@ -117,9 +117,7 @@
</span><span class="cx"> return newRef;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebEditorUndoTarget::invoke(
- /* [in] */ BSTR /*actionName*/,
- /* [in] */ IUnknown *obj)
</del><ins>+HRESULT WebEditorUndoTarget::invoke(/* [in] */ BSTR /*actionName*/, /* [in] */ IUnknown *obj)
</ins><span class="cx"> {
</span><span class="cx"> IWebUndoCommand* undoCommand = 0;
</span><span class="cx"> if (SUCCEEDED(obj->QueryInterface(IID_IWebUndoCommand, (void**)&undoCommand))) {
</span><span class="lines">@@ -553,12 +551,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebEditorUndoCommand::AddRef()
</del><ins>+ULONG WebEditorUndoCommand::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebEditorUndoCommand::Release(void)
</del><ins>+ULONG WebEditorUndoCommand::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2007 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDownload.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDownload.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebDownload.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> // IUnknown -------------------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</del><ins>+HRESULT WebDownload::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!ppvObject)
</span><span class="cx"> return E_POINTER;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDownloadCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDownloadCurl.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDownloadCurl.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebDownloadCurl.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> // IWebDownload -------------------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::initWithRequest(
</del><ins>+HRESULT WebDownload::initWithRequest(
</ins><span class="cx"> /* [in] */ IWebURLRequest* request,
</span><span class="cx"> /* [in] */ IWebDownloadDelegate* delegate)
</span><span class="cx"> {
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::initToResumeWithBundle(
</del><ins>+HRESULT WebDownload::initToResumeWithBundle(
</ins><span class="cx"> /* [in] */ BSTR bundlePath,
</span><span class="cx"> /* [in] */ IWebDownloadDelegate* delegate)
</span><span class="cx"> {
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::start()
</del><ins>+HRESULT WebDownload::start()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_download)
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::cancel()
</del><ins>+HRESULT WebDownload::cancel()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_download)
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -129,13 +129,13 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::cancelForResume()
</del><ins>+HRESULT WebDownload::cancelForResume()
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::deletesFileUponFailure(
</del><ins>+HRESULT WebDownload::deletesFileUponFailure(
</ins><span class="cx"> /* [out, retval] */ BOOL* result)
</span><span class="cx"> {
</span><span class="cx"> if (!m_download)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::setDeletesFileUponFailure(
</del><ins>+HRESULT WebDownload::setDeletesFileUponFailure(
</ins><span class="cx"> /* [in] */ BOOL deletesFileUponFailure)
</span><span class="cx"> {
</span><span class="cx"> if (!m_download)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::setDestination(
</del><ins>+HRESULT WebDownload::setDestination(
</ins><span class="cx"> /* [in] */ BSTR path,
</span><span class="cx"> /* [in] */ BOOL allowOverwrite)
</span><span class="cx"> {
</span><span class="lines">@@ -170,21 +170,21 @@
</span><span class="cx">
</span><span class="cx"> // IWebURLAuthenticationChallengeSender -------------------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::cancelAuthenticationChallenge(
</del><ins>+HRESULT WebDownload::cancelAuthenticationChallenge(
</ins><span class="cx"> /* [in] */ IWebURLAuthenticationChallenge*)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::continueWithoutCredentialForAuthenticationChallenge(
</del><ins>+HRESULT WebDownload::continueWithoutCredentialForAuthenticationChallenge(
</ins><span class="cx"> /* [in] */ IWebURLAuthenticationChallenge* challenge)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebDownload::useCredential(
</del><ins>+HRESULT WebDownload::useCredential(
</ins><span class="cx"> /* [in] */ IWebURLCredential* credential,
</span><span class="cx"> /* [in] */ IWebURLAuthenticationChallenge* challenge)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebError.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebError.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebError.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> // IUnknown -------------------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebError::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</del><ins>+HRESULT WebError::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!ppvObject)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebError::localizedRecoverySuggestion(__deref_opt_out BSTR* result)
</del><ins>+HRESULT WebError::localizedRecoverySuggestion(__deref_opt_out BSTR* result)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> if (!result)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebError::recoverAttempter(__deref_opt_out IUnknown** result)
</del><ins>+HRESULT WebError::recoverAttempter(__deref_opt_out IUnknown** result)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> if (!result)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebFrame::Release(void)
</del><ins>+ULONG WebFrame::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void)
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This function should be removed from the IWebHistoryItem interface.
</span><del>-HRESULT STDMETHODCALLTYPE WebHistoryItem::visitedWithTitle(_In_ BSTR title, BOOL increaseVisitCount)
</del><ins>+HRESULT WebHistoryItem::visitedWithTitle(_In_ BSTR title, BOOL increaseVisitCount)
</ins><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebHistoryItem::icon(__deref_opt_out HBITMAP* hBitmap)
</del><ins>+HRESULT WebHistoryItem::icon(__deref_opt_out HBITMAP* hBitmap)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> if (!hBitmap)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebJavaScriptCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebJavaScriptCollector.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebJavaScriptCollector.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebJavaScriptCollector.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -74,12 +74,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebJavaScriptCollector::AddRef()
</del><ins>+ULONG WebJavaScriptCollector::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebJavaScriptCollector::Release(void)
</del><ins>+ULONG WebJavaScriptCollector::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitClassFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitClassFactory.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitClassFactory.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebKitClassFactory.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebKitClassFactory::Release(void)
</del><ins>+ULONG WebKitClassFactory::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef && !gLockCount)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebNotificationCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebNotificationCenter.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebNotificationCenter.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebNotificationCenter.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -90,12 +90,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebNotificationCenter::AddRef()
</del><ins>+ULONG WebNotificationCenter::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebNotificationCenter::Release()
</del><ins>+ULONG WebNotificationCenter::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -541,12 +541,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebPreferences::AddRef()
</del><ins>+ULONG WebPreferences::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebPreferences::Release(void)
</del><ins>+ULONG WebPreferences::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebURLAuthenticationChallengeSenderCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> // IWebURLAuthenticationChallengeSender -------------------------------------------------------------------
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::cancelAuthenticationChallenge(
</del><ins>+HRESULT WebURLAuthenticationChallengeSender::cancelAuthenticationChallenge(
</ins><span class="cx"> /* [in] */ IWebURLAuthenticationChallenge* challenge)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::continueWithoutCredentialForAuthenticationChallenge(
</del><ins>+HRESULT WebURLAuthenticationChallengeSender::continueWithoutCredentialForAuthenticationChallenge(
</ins><span class="cx"> /* [in] */ IWebURLAuthenticationChallenge* challenge)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::useCredential(
</del><ins>+HRESULT WebURLAuthenticationChallengeSender::useCredential(
</ins><span class="cx"> /* [in] */ IWebURLCredential* credential,
</span><span class="cx"> /* [in] */ IWebURLAuthenticationChallenge* challenge)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebURLCredentialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebURLCredential.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebURLCredential.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebURLCredential.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebURLCredential::AddRef()
</del><ins>+ULONG WebURLCredential::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebURLCredential::Release(void)
</del><ins>+ULONG WebURLCredential::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebURLProtectionSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebURLProtectionSpace.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebURLProtectionSpace.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebURLProtectionSpace.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebURLProtectionSpace::Release(void)
</del><ins>+ULONG WebURLProtectionSpace::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebURLResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebURLResponse.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebURLResponse.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebURLResponse.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebURLResponse::Release(void)
</del><ins>+ULONG WebURLResponse::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID, _Outptr_ void**) { return E_FAIL; }
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() { return 0; }
</span><del>- virtual ULONG STDMETHODCALLTYPE Release(void) { return 0; }
</del><ins>+ virtual ULONG STDMETHODCALLTYPE Release() { return 0; }
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> // IWebNotificationObserver
</span><span class="lines">@@ -2654,7 +2654,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebView::Release(void)
</del><ins>+ULONG WebView::Release()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_deletionHasBegun);
</span><span class="cx">
</span><span class="lines">@@ -3243,7 +3243,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::setPageSizeMultiplier(float multiplier)
</del><ins>+HRESULT WebView::setPageSizeMultiplier(float multiplier)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_mainFrame)
</span><span class="cx"> return E_UNEXPECTED;
</span><span class="lines">@@ -3273,7 +3273,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::pageSizeMultiplier(_Out_ float* multiplier)
</del><ins>+HRESULT WebView::pageSizeMultiplier(_Out_ float* multiplier)
</ins><span class="cx"> {
</span><span class="cx"> if (!multiplier)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -4063,7 +4063,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::goForward(_In_opt_ IUnknown* /*sender*/)
</del><ins>+HRESULT WebView::goForward(_In_opt_ IUnknown* /*sender*/)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return E_NOTIMPL;
</span><span class="lines">@@ -5455,10 +5455,9 @@
</span><span class="cx"> return operation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::DragEnter(
- IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
</del><ins>+HRESULT WebView::DragEnter(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
</ins><span class="cx"> {
</span><del>- m_dragData = 0;
</del><ins>+ m_dragData = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (m_dropTargetHelper)
</span><span class="cx"> m_dropTargetHelper->DragEnter(m_viewWindow, pDataObject, (POINT*)&pt, *pdwEffect);
</span><span class="lines">@@ -5475,8 +5474,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::DragOver(
- DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
</del><ins>+HRESULT WebView::DragOver(DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
</ins><span class="cx"> {
</span><span class="cx"> if (m_dropTargetHelper)
</span><span class="cx"> m_dropTargetHelper->DragOver((POINT*)&pt, *pdwEffect);
</span><span class="lines">@@ -5494,7 +5492,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::DragLeave()
</del><ins>+HRESULT WebView::DragLeave()
</ins><span class="cx"> {
</span><span class="cx"> if (m_dropTargetHelper)
</span><span class="cx"> m_dropTargetHelper->DragLeave();
</span><span class="lines">@@ -5508,8 +5506,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::Drop(
- IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
</del><ins>+HRESULT WebView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect)
</ins><span class="cx"> {
</span><span class="cx"> if (m_dropTargetHelper)
</span><span class="cx"> m_dropTargetHelper->Drop(pDataObject, (POINT*)&pt, *pdwEffect);
</span><span class="lines">@@ -5560,7 +5557,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::clearFocusNode()
</del><ins>+HRESULT WebView::clearFocusNode()
</ins><span class="cx"> {
</span><span class="cx"> if (m_page)
</span><span class="cx"> m_page->focusController().setFocusedElement(0, 0);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebWorkersPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebWorkersPrivate.cpp (188702 => 188703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebWorkersPrivate.cpp 2015-08-20 21:32:50 UTC (rev 188702)
+++ trunk/Source/WebKit/win/WebWorkersPrivate.cpp 2015-08-20 21:36:57 UTC (rev 188703)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG WebWorkersPrivate::Release(void)
</del><ins>+ULONG WebWorkersPrivate::Release()
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef)
</span></span></pre>
</div>
</div>
</body>
</html>