зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1337718 part.2 Make EditorEventListener::ShouldHandleNativeKeyBindings() take WidgetKeyboardEvent* instead of nsIDOMKeyEvent* r=m_kato
MozReview-Commit-ID: 4JS2yJ6iXgY --HG-- extra : rebase_source : 30cbcab74da7731e446329a3263dd82cd16fdfab
This commit is contained in:
Родитель
c4cea9a380
Коммит
87c78a5bfb
|
@ -621,7 +621,7 @@ EditorEventListener::KeyPress(nsIDOMKeyEvent* aKeyEvent)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ShouldHandleNativeKeyBindings(aKeyEvent)) {
|
if (!ShouldHandleNativeKeyBindings(keypressEvent)) {
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1238,7 +1238,8 @@ EditorEventListener::IsFileControlTextBox()
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
EditorEventListener::ShouldHandleNativeKeyBindings(nsIDOMKeyEvent* aKeyEvent)
|
EditorEventListener::ShouldHandleNativeKeyBindings(
|
||||||
|
WidgetKeyboardEvent* aKeyboardEvent)
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(!DetachedFromEditor());
|
MOZ_ASSERT(!DetachedFromEditor());
|
||||||
|
|
||||||
|
@ -1250,8 +1251,7 @@ EditorEventListener::ShouldHandleNativeKeyBindings(nsIDOMKeyEvent* aKeyEvent)
|
||||||
// unnecessary. IsAcceptableInputEvent currently makes a similar check for
|
// unnecessary. IsAcceptableInputEvent currently makes a similar check for
|
||||||
// mouse events.
|
// mouse events.
|
||||||
|
|
||||||
nsCOMPtr<nsIDOMEventTarget> target;
|
nsCOMPtr<nsIDOMEventTarget> target = aKeyboardEvent->GetDOMEventTarget();
|
||||||
aKeyEvent->AsEvent()->GetTarget(getter_AddRefs(target));
|
|
||||||
nsCOMPtr<nsIContent> targetContent = do_QueryInterface(target);
|
nsCOMPtr<nsIContent> targetContent = do_QueryInterface(target);
|
||||||
if (!targetContent) {
|
if (!targetContent) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -83,7 +83,7 @@ protected:
|
||||||
bool NotifyIMEOfMouseButtonEvent(nsIDOMMouseEvent* aMouseEvent);
|
bool NotifyIMEOfMouseButtonEvent(nsIDOMMouseEvent* aMouseEvent);
|
||||||
bool EditorHasFocus();
|
bool EditorHasFocus();
|
||||||
bool IsFileControlTextBox();
|
bool IsFileControlTextBox();
|
||||||
bool ShouldHandleNativeKeyBindings(nsIDOMKeyEvent* aKeyEvent);
|
bool ShouldHandleNativeKeyBindings(WidgetKeyboardEvent* aKeyboardEvent);
|
||||||
nsresult HandleMiddleClickPaste(nsIDOMMouseEvent* aMouseEvent);
|
nsresult HandleMiddleClickPaste(nsIDOMMouseEvent* aMouseEvent);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче