mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: replace _ASSERT with DCHECK in toast.cc (#13598)

Browse source 
_ASSERT was triggering errors about unused values when in debug mode
This commit is contained in:
Jeremy Apthorp 2018-07-10 08:01:26 -07:00 • committed by Shelley Vohr
parent bc2ea0e705
commit 3a58545a59
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
brightray/browser/win/win32_desktop_notifications/toast.cc
View file

@ -5,6 +5,7 @@
#include <uxtheme.h> #include <uxtheme.h>
#include <windowsx.h> #include <windowsx.h>
#include <algorithm> #include <algorithm>
#include "base/logging.h"
#include "brightray/browser/win/win32_desktop_notifications/common.h" #include "brightray/browser/win/win32_desktop_notifications/common.h"
#pragma comment(lib, "msimg32.lib") #pragma comment(lib, "msimg32.lib")
@ -566,7 +567,7 @@ void DesktopNotificationController::Toast::UpdateBufferSize() {
auto b1 = UpdateLayeredWindowIndirect(hwnd_, &ulw); auto b1 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
ulw.prcDirty = &dirty2; ulw.prcDirty = &dirty2;
auto b2 = UpdateLayeredWindowIndirect(hwnd_, &ulw); auto b2 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
_ASSERT(b1 && b2); DCHECK(b1 && b2);
} }
return; return;
@ -745,14 +746,14 @@ HDWP DesktopNotificationController::Toast::Animate(HDWP hdwp,
} }
void DesktopNotificationController::Toast::StartEaseIn() { void DesktopNotificationController::Toast::StartEaseIn() {
_ASSERT(!ease_in_active_); DCHECK(!ease_in_active_);
ease_in_start_ = GetTickCount(); ease_in_start_ = GetTickCount();
ease_in_active_ = true; ease_in_active_ = true;
data_->controller->StartAnimation(); data_->controller->StartAnimation();
} }
void DesktopNotificationController::Toast::StartEaseOut() { void DesktopNotificationController::Toast::StartEaseOut() {
_ASSERT(!ease_out_active_); DCHECK(!ease_out_active_);
ease_out_start_ = GetTickCount(); ease_out_start_ = GetTickCount();
ease_out_active_ = true; ease_out_active_ = true;
data_->controller->StartAnimation(); data_->controller->StartAnimation();