Commit 0ee493da authored by Darwin Huang's avatar Darwin Huang Committed by Commit Bot

ui/base/clipboard: Change NULL to nullptr

No logic changes.
(Many affected Windows type "objects" are really just struct pointers.)

Reference: https://cs.chromium.org/chromium/src/base/win/windows_types.h?l=79
Change-Id: Ib7ab8cd5f36f57c053f47d49dfde1597ba05d553
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1710784
Auto-Submit: Darwin Huang <huangdarwin@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#679833}
parent bd0cae50
......@@ -128,7 +128,7 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) {
WriteHTML(&(params[0].front()), params[0].size(),
&(params[1].front()), params[1].size());
} else if (params.size() == 1) {
WriteHTML(&(params[0].front()), params[0].size(), NULL, 0);
WriteHTML(&(params[0].front()), params[0].size(), nullptr, 0);
}
break;
......
......@@ -176,11 +176,11 @@ class AuraClipboard {
return sequence_number_;
}
// Returns the data currently on the top of the clipboard stack, NULL if the
// clipboard stack is empty.
// Returns the data currently on the top of the clipboard stack, nullptr if
// the clipboard stack is empty.
const ClipboardData* GetData() const {
if (data_list_.empty())
return NULL;
return nullptr;
return data_list_.front().get();
}
......
......@@ -274,7 +274,7 @@ ClipboardAuraX11::AuraX11Details::AuraX11Details()
InputOnly,
CopyFromParent, // visual
0,
NULL)),
nullptr)),
selection_requestor_(x_display_, x_window_, this),
clipboard_owner_(x_display_, x_window_, gfx::GetAtom(kClipboard)),
primary_owner_(x_display_, x_window_, XA_PRIMARY) {
......@@ -396,7 +396,7 @@ TargetList ClipboardAuraX11::AuraX11Details::WaitAndGetTargetsList(
for (const auto& text_atom : types) {
::Atom type = x11::None;
if (selection_requestor_.PerformBlockingConvertSelection(
selection_name, text_atom, NULL, NULL, &type) &&
selection_name, text_atom, nullptr, nullptr, &type) &&
type == text_atom) {
out.push_back(text_atom);
}
......
......@@ -345,7 +345,8 @@ void ClipboardMac::WriteBitmap(const SkBitmap& bitmap) {
NSPasteboard* pb = GetPasteboard();
[pb addTypes:@[ NSTIFFPboardType ] owner:nil];
NSData* tiff_data = [image TIFFRepresentation];
LOG_IF(ERROR, tiff_data == NULL) << "Failed to allocate image for clipboard";
LOG_IF(ERROR, tiff_data == nullptr)
<< "Failed to allocate image for clipboard";
if (tiff_data) {
[pb setData:tiff_data forType:NSTIFFPboardType];
}
......
......@@ -645,7 +645,7 @@ TYPED_TEST(ClipboardTest, WebSmartPasteTest) {
void HtmlTestHelper(const std::string& cf_html,
const std::string& expected_html) {
std::string html;
ClipboardUtil::CFHtmlToHtml(cf_html, &html, NULL);
ClipboardUtil::CFHtmlToHtml(cf_html, &html, nullptr);
EXPECT_EQ(html, expected_html);
}
......
......@@ -855,8 +855,8 @@ void ClipboardUtil::CFHtmlToHtml(const std::string& cf_html,
size_t fragment_start = std::string::npos;
size_t fragment_end = std::string::npos;
ClipboardUtil::CFHtmlExtractMetadata(
cf_html, base_url, NULL, &fragment_start, &fragment_end);
ClipboardUtil::CFHtmlExtractMetadata(cf_html, base_url, nullptr,
&fragment_start, &fragment_end);
if (html &&
fragment_start != std::string::npos &&
......
......@@ -453,7 +453,7 @@ SkBitmap ClipboardWin::ReadImage(ClipboardType type) const {
false, 0, &dst_bits);
{
base::win::ScopedCreateDC hdc(CreateCompatibleDC(NULL));
base::win::ScopedCreateDC hdc(CreateCompatibleDC(nullptr));
HBITMAP old_hbitmap =
static_cast<HBITMAP>(SelectObject(hdc.Get(), dst_hbitmap));
::SetDIBitsToDevice(hdc.Get(), 0, 0, bitmap->bmiHeader.biWidth,
......@@ -565,9 +565,8 @@ void ClipboardWin::WriteObjects(ClipboardType type, const ObjectMap& objects) {
::EmptyClipboard();
for (ObjectMap::const_iterator iter = objects.begin(); iter != objects.end();
++iter) {
DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
for (const auto& object : objects) {
DispatchObject(static_cast<ObjectType>(object.first), object.second);
}
}
......@@ -616,14 +615,14 @@ void ClipboardWin::WriteBookmark(const char* title_data,
}
void ClipboardWin::WriteWebSmartPaste() {
DCHECK(clipboard_owner_->hwnd() != NULL);
DCHECK(clipboard_owner_->hwnd() != nullptr);
::SetClipboardData(
ClipboardFormatType::GetWebKitSmartPasteType().ToFormatEtc().cfFormat,
NULL);
nullptr);
}
void ClipboardWin::WriteBitmap(const SkBitmap& in_bitmap) {
HDC dc = ::GetDC(NULL);
HDC dc = ::GetDC(nullptr);
SkBitmap bitmap;
// Either points bitmap at in_bitmap, or allocates and converts pixels.
......@@ -651,7 +650,7 @@ void ClipboardWin::WriteBitmap(const SkBitmap& in_bitmap) {
// https://docs.microsoft.com/en-us/windows/win32/api/wingdi/nf-wingdi-createdibsection)
void* bits;
HBITMAP source_hbitmap =
::CreateDIBSection(dc, &bm_info, DIB_RGB_COLORS, &bits, NULL, 0);
::CreateDIBSection(dc, &bm_info, DIB_RGB_COLORS, &bits, nullptr, 0);
if (bits && source_hbitmap) {
// Copy the bitmap out of shared memory and into GDI
......@@ -663,7 +662,7 @@ void ClipboardWin::WriteBitmap(const SkBitmap& in_bitmap) {
}
::DeleteObject(source_hbitmap);
::ReleaseDC(NULL, dc);
::ReleaseDC(nullptr, dc);
}
void ClipboardWin::WriteData(const ClipboardFormatType& format,
......@@ -686,9 +685,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
// For this reason, we create a new bitmap, copy the bits over, and then
// write that to the clipboard.
HDC dc = ::GetDC(NULL);
HDC compatible_dc = ::CreateCompatibleDC(NULL);
HDC source_dc = ::CreateCompatibleDC(NULL);
HDC dc = ::GetDC(nullptr);
HDC compatible_dc = ::CreateCompatibleDC(nullptr);
HDC source_dc = ::CreateCompatibleDC(nullptr);
// This is the HBITMAP we will eventually write to the clipboard
HBITMAP hbitmap = ::CreateCompatibleBitmap(dc, size.width(), size.height());
......@@ -696,7 +695,7 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
// Failed to create the bitmap
::DeleteDC(compatible_dc);
::DeleteDC(source_dc);
::ReleaseDC(NULL, dc);
::ReleaseDC(nullptr, dc);
return;
}
......@@ -724,13 +723,13 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
::DeleteObject(old_source);
::DeleteDC(compatible_dc);
::DeleteDC(source_dc);
::ReleaseDC(NULL, dc);
::ReleaseDC(nullptr, dc);
WriteToClipboard(CF_BITMAP, hbitmap);
}
void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
DCHECK(clipboard_owner_->hwnd() != NULL);
DCHECK(clipboard_owner_->hwnd() != nullptr);
if (handle && !::SetClipboardData(format, handle)) {
DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
FreeData(format, handle);
......@@ -739,9 +738,9 @@ void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
HWND ClipboardWin::GetClipboardWindow() const {
if (!clipboard_owner_)
return NULL;
return nullptr;
if (clipboard_owner_->hwnd() == NULL)
if (clipboard_owner_->hwnd() == nullptr)
clipboard_owner_->Create(base::Bind(&ClipboardOwnerWndProc));
return clipboard_owner_->hwnd();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment