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

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

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-01-15 14:34:01 +01:00
parent 97d559982e
commit f5eef5390a
41 changed files with 318 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/ceftests/os_rendering_unittest.cc
View File

@@ -20,7 +20,7 @@
#include <X11/keysym.h>
#elif defined(OS_WIN)
// Required for resource_util_win, which uses this as an extern
HINSTANCE hInst = ::GetModuleHandle(NULL);
HINSTANCE hInst = ::GetModuleHandle(nullptr);
#endif
namespace {
@@ -400,7 +400,7 @@ class OSRTestHandler : public RoutingTestHandler,
return new CefStreamResourceHandler("text/html", stream);
}
return NULL;
return nullptr;
}
// CefRenderHandler methods
@@ -1153,7 +1153,7 @@ class OSRTestHandler : public RoutingTestHandler,
const CefCursorInfo& custom_cursor_info) override {
if (test_type_ == OSR_TEST_CURSOR && started()) {
EXPECT_EQ(CT_HAND, type);
EXPECT_EQ(NULL, custom_cursor_info.buffer);
EXPECT_EQ(nullptr, custom_cursor_info.buffer);
DestroySucceededTestSoon();
}
}
@@ -1180,7 +1180,7 @@ class OSRTestHandler : public RoutingTestHandler,
const CefRect& dragdiv = GetElementBounds("dragdiv");
EXPECT_TRUE(drag_data->HasImage());
CefRefPtr<CefImage> image = drag_data->GetImage();
EXPECT_TRUE(image.get() != NULL);
EXPECT_TRUE(image.get() != nullptr);
if (image.get()) {
// Drag image height seems to always be + 1px greater than the drag rect
// on Linux. Therefore allow it to be +/- 1px.
@@ -1338,7 +1338,8 @@ class OSRTestHandler : public RoutingTestHandler,
#else
#error "Unsupported platform"
#endif
CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, NULL, NULL);
CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, nullptr,
nullptr);
}
CefRect GetScaledRect(const CefRect& rect) const {