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

Various fixes related to the C++11/14 update (see issue #3140)

Browse Source 
- Convert scoped_ptr to std::unique_ptr from <memory>
- Convert arraysize to base::size from include/base/cef_cxx17_backports.h
- Convert NULL to nullptr
- Include include/base/cef_callback.h instead of include/base/cef_bind.h
- Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone;
  use .get() instead

See the issue for additional details.
This commit is contained in:
Marshall Greenblatt
2021-06-17 16:08:01 -04:00
parent 5d438ced79
commit 17fc2b3e3b
141 changed files with 580 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/shared/browser/main_message_loop_external_pump_win.cc
View File

@@ -6,6 +6,8 @@
#include <CommCtrl.h>
#include <memory>
#include "include/cef_app.h"
#include "tests/shared/browser/util_win.h"
@@ -49,8 +51,8 @@ class MainMessageLoopExternalPumpWin : public MainMessageLoopExternalPump {
};
MainMessageLoopExternalPumpWin::MainMessageLoopExternalPumpWin()
: timer_pending_(false), main_thread_target_(NULL) {
HINSTANCE hInstance = GetModuleHandle(NULL);
: timer_pending_(false), main_thread_target_(nullptr) {
HINSTANCE hInstance = GetModuleHandle(nullptr);
const wchar_t* const kClassName = L"CEFMainTargetHWND";
WNDCLASSEX wcex = {};
@@ -62,8 +64,8 @@ MainMessageLoopExternalPumpWin::MainMessageLoopExternalPumpWin()
// Create the message handling window.
main_thread_target_ =
CreateWindowW(kClassName, NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0,
HWND_MESSAGE, NULL, hInstance, NULL);
CreateWindowW(kClassName, nullptr, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0,
HWND_MESSAGE, nullptr, hInstance, nullptr);
DCHECK(main_thread_target_);
SetUserDataPtr(main_thread_target_, this);
}
@@ -75,13 +77,13 @@ MainMessageLoopExternalPumpWin::~MainMessageLoopExternalPumpWin() {
}
void MainMessageLoopExternalPumpWin::Quit() {
PostMessage(NULL, WM_QUIT, 0, 0);
PostMessage(nullptr, WM_QUIT, 0, 0);
}
int MainMessageLoopExternalPumpWin::Run() {
// Run the message loop.
MSG msg;
while (GetMessage(&msg, NULL, 0, 0)) {
while (GetMessage(&msg, nullptr, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
}
@@ -111,7 +113,7 @@ void MainMessageLoopExternalPumpWin::SetTimer(int64 delay_ms) {
DCHECK(!timer_pending_);
DCHECK_GT(delay_ms, 0);
timer_pending_ = true;
::SetTimer(main_thread_target_, 1, static_cast<UINT>(delay_ms), NULL);
::SetTimer(main_thread_target_, 1, static_cast<UINT>(delay_ms), nullptr);
}
void MainMessageLoopExternalPumpWin::KillTimer() {
@@ -144,9 +146,9 @@ LRESULT CALLBACK MainMessageLoopExternalPumpWin::WndProc(HWND hwnd,
} // namespace
// static
scoped_ptr<MainMessageLoopExternalPump> MainMessageLoopExternalPump::Create() {
return scoped_ptr<MainMessageLoopExternalPump>(
new MainMessageLoopExternalPumpWin());
std::unique_ptr<MainMessageLoopExternalPump>
MainMessageLoopExternalPump::Create() {
return std::make_unique<MainMessageLoopExternalPumpWin>();
}
} // namespace client