Remove CEF-specific integer and char16 typedef's (see #3507)

This commit is contained in:
Marshall Greenblatt
2023-06-01 17:06:15 +03:00
parent 695ee2a041
commit 5042d71408
150 changed files with 597 additions and 621 deletions

View File

@@ -62,7 +62,7 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump {
int Run() override;
// MainMessageLoopExternalPump methods:
void OnScheduleMessagePumpWork(int64 delay_ms) override;
void OnScheduleMessagePumpWork(int64_t delay_ms) override;
// Internal methods used for processing the pump callbacks. They are public
// for simplicity but should not be used directly. HandlePrepare is called
@@ -76,7 +76,7 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump {
protected:
// MainMessageLoopExternalPump methods:
void SetTimer(int64 delay_ms) override;
void SetTimer(int64_t delay_ms) override;
void KillTimer() override;
bool IsTimerPending() override;
@@ -226,12 +226,12 @@ int MainMessageLoopExternalPumpLinux::Run() {
}
void MainMessageLoopExternalPumpLinux::OnScheduleMessagePumpWork(
int64 delay_ms) {
int64_t delay_ms) {
// This can be called on any thread, so we don't want to touch any state
// variables as we would then need locks all over. This ensures that if we
// are sleeping in a poll that we will wake up.
if (HANDLE_EINTR(write(wakeup_pipe_write_, &delay_ms, sizeof(int64))) !=
sizeof(int64)) {
if (HANDLE_EINTR(write(wakeup_pipe_write_, &delay_ms, sizeof(int64_t))) !=
sizeof(int64_t)) {
NOTREACHED() << "Could not write to the UI message loop wakeup pipe!";
}
}
@@ -250,16 +250,16 @@ bool MainMessageLoopExternalPumpLinux::HandleCheck() {
// The glib poll will tell us whether there was data, so this read shouldn't
// block.
if (wakeup_gpollfd_->revents & G_IO_IN) {
int64 delay_ms[2];
int64_t delay_ms[2];
const size_t num_bytes =
HANDLE_EINTR(read(wakeup_pipe_read_, delay_ms, sizeof(int64) * 2));
if (num_bytes < sizeof(int64)) {
HANDLE_EINTR(read(wakeup_pipe_read_, delay_ms, sizeof(int64_t) * 2));
if (num_bytes < sizeof(int64_t)) {
NOTREACHED() << "Error reading from the wakeup pipe.";
}
if (num_bytes == sizeof(int64)) {
if (num_bytes == sizeof(int64_t)) {
OnScheduleWork(delay_ms[0]);
}
if (num_bytes == sizeof(int64) * 2) {
if (num_bytes == sizeof(int64_t) * 2) {
OnScheduleWork(delay_ms[1]);
}
}
@@ -277,7 +277,7 @@ void MainMessageLoopExternalPumpLinux::HandleDispatch() {
OnTimerTimeout();
}
void MainMessageLoopExternalPumpLinux::SetTimer(int64 delay_ms) {
void MainMessageLoopExternalPumpLinux::SetTimer(int64_t delay_ms) {
DCHECK_GT(delay_ms, 0);
CefTime now;