bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

cefclient: Convert NULL to nullptr (see issue #2861)

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-01-15 15:28:12 +01:00
parent b785d34d29
commit d02d252690
53 changed files with 173 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cefclient/browser/osr_accessibility_node_win.cc
View File

@@ -218,7 +218,7 @@ struct CefIAccessible : public IAccessible {
// Remove the node reference when OsrAXNode is destroyed, so that
// MSAA clients get CO_E_OBJNOTCONNECTED
void MarkDestroyed() { node_ = NULL; }
void MarkDestroyed() { node_ = nullptr; }
protected:
virtual ~CefIAccessible() {}
@@ -242,7 +242,7 @@ STDMETHODIMP CefIAccessible::QueryInterface(REFIID riid, void** ppvObject) {
else if (riid == IID_IUnknown)
*ppvObject = static_cast<IUnknown*>(this);
else
*ppvObject = NULL;
*ppvObject = nullptr;
if (*ppvObject)
reinterpret_cast<IUnknown*>(*ppvObject)->AddRef();
@@ -317,7 +317,7 @@ STDMETHODIMP CefIAccessible::get_accChild(VARIANT varChild,
int numChilds = node_->GetChildCount();
// Mark Leaf node if there are no child
if (numChilds <= 0) {
*ppdispChild = NULL;
*ppdispChild = nullptr;
return S_FALSE;
} else {
if (ppdispChild && VALID_CHILDID(varChild)) {
@@ -332,7 +332,7 @@ STDMETHODIMP CefIAccessible::get_accChild(VARIANT varChild,
*ppdispChild = child->GetNativeAccessibleObject(node_);
}
if (*ppdispChild == NULL)
if (*ppdispChild == nullptr)
retCode = S_FALSE;
else
(*ppdispChild)->AddRef();
@@ -449,9 +449,9 @@ STDMETHODIMP CefIAccessible::get_accFocus(VARIANT* pFocusChild) {
HRESULT retCode = DATACHECK(node_);
if (SUCCEEDED(retCode)) {
OsrAXNode* focusedNode = node_->GetAccessibilityHelper()->GetFocusedNode();
CefNativeAccessible* nativeObj = NULL;
CefNativeAccessible* nativeObj = nullptr;
if (focusedNode)
nativeObj = focusedNode->GetNativeAccessibleObject(NULL);
nativeObj = focusedNode->GetNativeAccessibleObject(nullptr);
if (nativeObj) {
if (nativeObj == this) {
@@ -663,7 +663,7 @@ void OsrAXNode::Destroy() {
CefIAccessible* ptr = static_cast<CefIAccessible*>(platform_accessibility_);
if (ptr)
ptr->MarkDestroyed();
platform_accessibility_ = NULL;
platform_accessibility_ = nullptr;
}
// Create and return NSAccessibility Implementation Object for Window
@@ -687,7 +687,7 @@ void OsrAXNode::NotifyAccessibilityEvent(std::string event_type) const {}
void OsrAXNode::Destroy() {}
CefNativeAccessible* OsrAXNode::GetNativeAccessibleObject(OsrAXNode* parent) {
return NULL;
return nullptr;
}
} // namespace client