зеркало из https://github.com/mozilla/gecko-dev.git
Bug 895274 part.156 Rename NS_QUERY_CONTENT_STATE to eQueryContentState r=smaug
This commit is contained in:
Родитель
bb413ca230
Коммит
b9be65c10e
|
@ -1956,7 +1956,7 @@ nsDOMWindowUtils::SendQueryContentEvent(uint32_t aType,
|
|||
|
||||
if (message == NS_QUERY_CHARACTER_AT_POINT) {
|
||||
// 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 =
|
||||
|
|
|
@ -806,7 +806,7 @@ ContentEventHandler::HandleQueryContentEvent(WidgetQueryContentEvent* aEvent)
|
|||
return OnQueryTextRect(aEvent);
|
||||
case eQueryEditorRect:
|
||||
return OnQueryEditorRect(aEvent);
|
||||
case NS_QUERY_CONTENT_STATE:
|
||||
case eQueryContentState:
|
||||
return OnQueryContentState(aEvent);
|
||||
case eQuerySelectionAsTransferable:
|
||||
return OnQuerySelectionAsTransferable(aEvent);
|
||||
|
|
|
@ -52,7 +52,7 @@ public:
|
|||
nsresult OnQueryTextRect(WidgetQueryContentEvent* aEvent);
|
||||
// eQueryEditorRect event handler
|
||||
nsresult OnQueryEditorRect(WidgetQueryContentEvent* aEvent);
|
||||
// NS_QUERY_CONTENT_STATE event handler
|
||||
// eQueryContentState event handler
|
||||
nsresult OnQueryContentState(WidgetQueryContentEvent* aEvent);
|
||||
// eQuerySelectionAsTransferable event handler
|
||||
nsresult OnQuerySelectionAsTransferable(WidgetQueryContentEvent* aEvent);
|
||||
|
|
|
@ -797,7 +797,7 @@ EventStateManager::HandleQueryContentEvent(WidgetQueryContentEvent* aEvent)
|
|||
GetCrossProcessTarget()->HandleQueryContentEvent(*aEvent);
|
||||
return;
|
||||
// Following events have not been supported in e10s mode yet.
|
||||
case NS_QUERY_CONTENT_STATE:
|
||||
case eQueryContentState:
|
||||
case eQuerySelectionAsTransferable:
|
||||
case NS_QUERY_CHARACTER_AT_POINT:
|
||||
case NS_QUERY_DOM_WIDGET_HITTEST:
|
||||
|
|
|
@ -61,8 +61,8 @@ ToChar(EventMessage aEventMessage)
|
|||
return "NS_QUERY_TEXT_RECT";
|
||||
case eQueryEditorRect:
|
||||
return "eQueryEditorRect";
|
||||
case NS_QUERY_CONTENT_STATE:
|
||||
return "NS_QUERY_CONTENT_STATE";
|
||||
case eQueryContentState:
|
||||
return "eQueryContentState";
|
||||
case eQuerySelectionAsTransferable:
|
||||
return "eQuerySelectionAsTransferable";
|
||||
case NS_QUERY_CHARACTER_AT_POINT:
|
||||
|
|
|
@ -232,7 +232,7 @@ NS_EVENT_MESSAGE(NS_QUERY_TEXT_RECT, eQueryContentEventFirst + 4)
|
|||
NS_EVENT_MESSAGE(eQueryEditorRect, eQueryContentEventFirst + 5)
|
||||
// Query for the current state of the content. The particular members of
|
||||
// mReply that are set for each query content event will be valid on success.
|
||||
NS_EVENT_MESSAGE(NS_QUERY_CONTENT_STATE, eQueryContentEventFirst + 6)
|
||||
NS_EVENT_MESSAGE(eQueryContentState, eQueryContentEventFirst + 6)
|
||||
// Query for the selection in the form of a nsITransferable.
|
||||
NS_EVENT_MESSAGE(eQuerySelectionAsTransferable, eQueryContentEventFirst + 7)
|
||||
// Query for character at a point. This returns the character offset, its
|
||||
|
|
|
@ -6048,8 +6048,7 @@ PanGestureTypeForEvent(NSEvent* aEvent)
|
|||
|
||||
// Determine if there is a selection (if sending to the service).
|
||||
if (sendType) {
|
||||
WidgetQueryContentEvent event(true, NS_QUERY_CONTENT_STATE,
|
||||
mGeckoChild);
|
||||
WidgetQueryContentEvent event(true, eQueryContentState, mGeckoChild);
|
||||
// This might destroy our widget (and null out mGeckoChild).
|
||||
mGeckoChild->DispatchWindowEvent(event);
|
||||
if (!mGeckoChild || !event.mSucceeded || !event.mReply.mHasSelection)
|
||||
|
|
Загрузка…
Ссылка в новой задаче