Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1280513 part.1 Rename LogKeyStateImpl() to MouseScrollHandler::MaybeLogKeyState() r=m_kato

Browse Source 
MozReview-Commit-ID: DGDrRO3Y9jD

--HG--
extra : rebase_source : d1b8253ab276a115b8b3a17c9646b05427bcc4dc
This commit is contained in:
Masayuki Nakano 2016-06-17 03:03:44 +09:00
parent 1eac929388
commit a369ad3acf
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
widget/windows/WinMouseScrollHandler.cpp
View File

@ -34,32 +34,6 @@ static const char* GetBoolName(bool aBool)
return aBool ? "TRUE" : "FALSE";
}
static void LogKeyStateImpl()
{
if (!MOZ_LOG_TEST(gMouseScrollLog, LogLevel::Debug)) {
return;
}
BYTE keyboardState[256];
if (::GetKeyboardState(keyboardState)) {
for (size_t i = 0; i < ArrayLength(keyboardState); i++) {
if (keyboardState[i]) {
MOZ_LOG(gMouseScrollLog, LogLevel::Debug,
(" Current key state: keyboardState[0x%02X]=0x%02X (%s)",
i, keyboardState[i],
((keyboardState[i] & 0x81) == 0x81) ? "Pressed and Toggled" :
(keyboardState[i] & 0x80) ? "Pressed" :
(keyboardState[i] & 0x01) ? "Toggled" : "Unknown"));
}
}
} else {
MOZ_LOG(gMouseScrollLog, LogLevel::Debug,
("MouseScroll::Device::Elantech::HandleKeyMessage(): Failed to print "
"current keyboard state"));
}
}
#define LOG_KEYSTATE() LogKeyStateImpl()
MouseScrollHandler* MouseScrollHandler::sInstance = nullptr;
bool MouseScrollHandler::Device::sFakeScrollableWindowNeeded = false;
@ -149,6 +123,32 @@ MouseScrollHandler::~MouseScrollHandler()
delete mSynthesizingEvent;
}
/* static */
void
MouseScrollHandler::MaybeLogKeyState()
{
if (!MOZ_LOG_TEST(gMouseScrollLog, LogLevel::Debug)) {
return;
}
BYTE keyboardState[256];
if (::GetKeyboardState(keyboardState)) {
for (size_t i = 0; i < ArrayLength(keyboardState); i++) {
if (keyboardState[i]) {
MOZ_LOG(gMouseScrollLog, LogLevel::Debug,
(" Current key state: keyboardState[0x%02X]=0x%02X (%s)",
i, keyboardState[i],
((keyboardState[i] & 0x81) == 0x81) ? "Pressed and Toggled" :
(keyboardState[i] & 0x80) ? "Pressed" :
(keyboardState[i] & 0x01) ? "Toggled" : "Unknown"));
}
}
} else {
MOZ_LOG(gMouseScrollLog, LogLevel::Debug,
("MouseScroll::MaybeLogKeyState(): Failed to print current keyboard "
"state"));
}
}
/* static */
bool
MouseScrollHandler::NeedsMessage(UINT aMsg)
@ -235,7 +235,7 @@ MouseScrollHandler::ProcessMessage(nsWindowBase* aWidget, UINT msg,
aWidget, msg == WM_KEYDOWN ? "WM_KEYDOWN" :
msg == WM_KEYUP ? "WM_KEYUP" : "Unknown", msg, wParam,
::GetMessageTime()));
LOG_KEYSTATE();
MaybeLogKeyState();
if (Device::Elantech::HandleKeyMessage(aWidget, msg, wParam, lParam)) {
aResult.mResult = 0;
aResult.mConsumed = true;
@ -399,7 +399,7 @@ MouseScrollHandler::ProcessNativeMouseWheelMessage(nsWindowBase* aWidget,
aMessage == WM_MOUSEHWHEEL ? "WM_MOUSEHWHEEL" :
aMessage == WM_VSCROLL ? "WM_VSCROLL" : "WM_HSCROLL",
aWParam, aLParam, point.x, point.y));
LOG_KEYSTATE();
MaybeLogKeyState();
HWND underCursorWnd = ::WindowFromPoint(point);
if (!underCursorWnd) {

2
widget/windows/WinMouseScrollHandler.h
View File

@ -66,6 +66,8 @@ private:
bool mIsWaitingInternalMessage;
static void MaybeLogKeyState();
static MouseScrollHandler* sInstance;
/**