mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:43:44 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 895274 part.155 Rename NS_QUERY_EDITOR_RECT to eQueryEditorRect r=smaug (74e932536f) - Bug 895274 part.156 Rename NS_QUERY_CONTENT_STATE to eQueryContentState r=smaug (f4a51e204a) - Bug 895274 part.157 Rename NS_QUERY_CHARACTER_AT_POINT to eQueryCharacterAtPoint r=smaug (6d9e90ad3b) - Bug 895274 part.158 Rename NS_QUERY_DOM_WIDGET_HITTEST to eQueryDOMWidgetHittest r=smaug (6f2a3f4254) - Bug 895274 part.140 Rename NS_VOLUMECHANGE to eVolumeChange r=smaug (874a0753c3) - Bug 895274 part.159 Rename NS_NOTIFYPAINT_START to ePaintEventFirst r=smaug (f736154b47) - Bug 895274 part.160 Rename NS_AFTERPAINT to eAfterPaint r=smaug (5de66bb8be) - Bug 895274 part.161 Rename NS_CONTENT_COMMAND_EVENT_START to eContentCommandEventFirst r=smaug (c7e8a02019) - Bug 895274 part.162 Rename NS_CONTENT_COMMAND_PASTE_TRANSFERABLE to eContentCommandPasteTransferable r=smaug (18fa878452) - Bug 895274 part.163 Rename NS_CONTENT_COMMAND_CUT to eContentCommandCut r=smaug (1c3f6b8edc) - Bug 895274 part.164 Rename NS_CONTENT_COMMAND_COPY to eContentCommandCopy r=smaug (81f0bb72b9) - Bug 895274 part.165 Rename NS_CONTENT_COMMAND_PASTE to eContentCommandPaste r=smaug (689c779c5c) - Bug 895274 part.166 Rename NS_CONTENT_COMMAND_DELETE to eContentCommandDelete r=smaug (39e08c0e83) - Bug 895274 part.167 Rename NS_CONTENT_COMMAND_UNDO to eContentCommandUndo r=smaug (8e7deef845) - Bug 895274 part.168 Rename NS_CONTENT_COMMAND_REDO to eContentCommandRedo r=smaug (1fe84ff23b) - Bug 895274 part.169 Rename NS_CONTENT_COMMAND_SCROLL to eContentCommandScroll r=smaug (c33ee94df0) - Bug 895274 part.171 Rename NS_ANIMATION_START to eAnimationStart r=smaug (17d52b1a77) - Bug 895274 part.172 Rename NS_ANIMATION_END to eAnimationEnd r=smaug (4ebb43e533) - Bug 895274 part.173 Rename NS_ANIMATION_ITERATION to eAnimationIteration r=smaug (1e62da736c) - Bug 895274 part.174 Rename NS_NOTIFYSCRIPT_START to eScriptEventFirst r=smaug (ef80d7b39a) - Bug 895274 part.175 Rename NS_BEFORE_SCRIPT_EXECUTE to eBeforeScriptExecute r=smaug (e29384af8d) - Bug 895274 part.176 Rename NS_AFTER_SCRIPT_EXECUTE to eAfterScriptExecute r=smaug (4a06741336) - Bug 895274 part.177 Rename NS_OPENCLOSE_EVENT_START to eOpenCloseEventFirst r=smaug (cd7f0cc550) - Bug 895274 part.178 Rename NS_OPEN to eOpen r=smaug (11380035a7) - Bug 895274 part.179 Remove NS_CLOSE due to unused r=smaug (a07e7b30dd) - Bug 895274 part.180 Rename NS_FULL_SCREEN_EVENT_START to eFullscreenEventFirst r=smaug (a934ba9c99) - Bug 895274 part.181 Rename NS_FULLSCREENCHANGE to eFullscreenChange r=smaug (b4ea2761a0) - Bug 895274 part.182 Rename NS_FULLSCREENERROR to eFullscreenError r=smaug (910a1d77af) - Bug 895274 part.183 Rename NS_WHEEL_EVENT_START to eWheelEventFirst r=smaug (b7277d4c57) - Bug 1171029 - Only omit legacy scroll events on GTK3. r=karlt (03eaad6c98)
This commit is contained in:
@@ -1946,10 +1946,10 @@ nsDOMWindowUtils::SendQueryContentEvent(uint32_t aType,
|
||||
message = NS_QUERY_TEXT_RECT;
|
||||
break;
|
||||
case QUERY_EDITOR_RECT:
|
||||
message = NS_QUERY_EDITOR_RECT;
|
||||
message = eQueryEditorRect;
|
||||
break;
|
||||
case QUERY_CHARACTER_AT_POINT:
|
||||
message = NS_QUERY_CHARACTER_AT_POINT;
|
||||
message = eQueryCharacterAtPoint;
|
||||
break;
|
||||
default:
|
||||
return NS_ERROR_INVALID_ARG;
|
||||
@@ -1961,9 +1961,9 @@ nsDOMWindowUtils::SendQueryContentEvent(uint32_t aType,
|
||||
bool useNativeLineBreak =
|
||||
!(aAdditionalFlags & QUERY_CONTENT_FLAG_USE_XP_LINE_BREAK);
|
||||
|
||||
if (message == NS_QUERY_CHARACTER_AT_POINT) {
|
||||
if (message == eQueryCharacterAtPoint) {
|
||||
// Looking for the widget at the point.
|
||||
WidgetQueryContentEvent dummyEvent(true, NS_QUERY_CONTENT_STATE, widget);
|
||||
WidgetQueryContentEvent dummyEvent(true, eQueryContentState, widget);
|
||||
dummyEvent.mUseNativeLineBreak = useNativeLineBreak;
|
||||
InitEvent(dummyEvent, &pt);
|
||||
nsIFrame* popupFrame =
|
||||
@@ -2062,25 +2062,26 @@ nsDOMWindowUtils::SendContentCommandEvent(const nsAString& aType,
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
EventMessage msg;
|
||||
if (aType.EqualsLiteral("cut"))
|
||||
msg = NS_CONTENT_COMMAND_CUT;
|
||||
else if (aType.EqualsLiteral("copy"))
|
||||
msg = NS_CONTENT_COMMAND_COPY;
|
||||
else if (aType.EqualsLiteral("paste"))
|
||||
msg = NS_CONTENT_COMMAND_PASTE;
|
||||
else if (aType.EqualsLiteral("delete"))
|
||||
msg = NS_CONTENT_COMMAND_DELETE;
|
||||
else if (aType.EqualsLiteral("undo"))
|
||||
msg = NS_CONTENT_COMMAND_UNDO;
|
||||
else if (aType.EqualsLiteral("redo"))
|
||||
msg = NS_CONTENT_COMMAND_REDO;
|
||||
else if (aType.EqualsLiteral("pasteTransferable"))
|
||||
msg = NS_CONTENT_COMMAND_PASTE_TRANSFERABLE;
|
||||
else
|
||||
if (aType.EqualsLiteral("cut")) {
|
||||
msg = eContentCommandCut;
|
||||
} else if (aType.EqualsLiteral("copy")) {
|
||||
msg = eContentCommandCopy;
|
||||
} else if (aType.EqualsLiteral("paste")) {
|
||||
msg = eContentCommandPaste;
|
||||
} else if (aType.EqualsLiteral("delete")) {
|
||||
msg = eContentCommandDelete;
|
||||
} else if (aType.EqualsLiteral("undo")) {
|
||||
msg = eContentCommandUndo;
|
||||
} else if (aType.EqualsLiteral("redo")) {
|
||||
msg = eContentCommandRedo;
|
||||
} else if (aType.EqualsLiteral("pasteTransferable")) {
|
||||
msg = eContentCommandPasteTransferable;
|
||||
} else {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
WidgetContentCommandEvent event(true, msg, widget);
|
||||
if (msg == NS_CONTENT_COMMAND_PASTE_TRANSFERABLE) {
|
||||
if (msg == eContentCommandPasteTransferable) {
|
||||
event.mTransferable = aTransferable;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user