Bug 1200194 - Tweak formatting and debug logging. r=roc

No logic change is involved.

--HG--
extra : commitid : KCG4QMsPhdY
extra : rebase_source : 2dc984fe27992b95e51f9bc1c5af52fcafc57844
This commit is contained in:
Ting-Yu Lin 2015-09-09 16:47:20 +08:00
Родитель cf9ff442dd
Коммит d8ee309227
3 изменённых файлов: 25 добавлений и 13 удалений

Просмотреть файл

@ -112,7 +112,7 @@ AccessibleCaret::SetSelectionBarEnabled(bool aEnabled)
return;
}
AC_LOG("%s, enabled %d", __FUNCTION__, aEnabled);
AC_LOG("Set selection bar %s", __FUNCTION__, aEnabled ? "Enabled" : "Disabled");
ErrorResult rv;
CaretElement()->ClassList()->Toggle(NS_LITERAL_STRING("no-bar"),

Просмотреть файл

@ -611,8 +611,17 @@ AccessibleCaretEventHub::HandleKeyboardEvent(WidgetKeyboardEvent* aEvent)
{
switch (aEvent->mMessage) {
case eKeyUp:
AC_LOGV("eKeyUp, state: %s", mState->Name());
mManager->OnKeyboardEvent();
break;
case eKeyDown:
AC_LOGV("eKeyDown, state: %s", mState->Name());
mManager->OnKeyboardEvent();
break;
case eKeyPress:
AC_LOGV("eKeyPress, state: %s", mState->Name());
mManager->OnKeyboardEvent();
break;

Просмотреть файл

@ -175,7 +175,7 @@ AccessibleCaretManager::UpdateCaretsForCursorMode()
void
AccessibleCaretManager::UpdateCaretsForSelectionMode()
{
AC_LOG("%s, selection: %p", __FUNCTION__, GetSelection());
AC_LOG("%s: selection: %p", __FUNCTION__, GetSelection());
int32_t startOffset = 0;
nsIFrame* startFrame = FindFirstNodeWithFrame(false, &startOffset);
@ -189,21 +189,24 @@ AccessibleCaretManager::UpdateCaretsForSelectionMode()
return;
}
auto updateSingleCaret = [](AccessibleCaret * aCaret, nsIFrame * aFrame,
int32_t aOffset)->PositionChangedResult
auto updateSingleCaret = [](AccessibleCaret* aCaret, nsIFrame* aFrame,
int32_t aOffset) -> PositionChangedResult
{
PositionChangedResult result = aCaret->SetPosition(aFrame, aOffset);
aCaret->SetSelectionBarEnabled(true);
switch (result) {
case PositionChangedResult::NotChanged:
// Do nothing
break;
case PositionChangedResult::Changed:
aCaret->SetAppearance(Appearance::Normal);
break;
case PositionChangedResult::Invisible:
aCaret->SetAppearance(Appearance::NormalNotShown);
break;
case PositionChangedResult::NotChanged:
// Do nothing
break;
case PositionChangedResult::Changed:
aCaret->SetAppearance(Appearance::Normal);
break;
case PositionChangedResult::Invisible:
aCaret->SetAppearance(Appearance::NormalNotShown);
break;
}
return result;
};