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