wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset eb6981f3c136 (bug 966157) for m5 test failures on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-12-15 12:27:36 +01:00
parent d7821c83cb
commit 87d20320a9
6 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/events/EventStateManager.cpp
View File

@ -742,9 +742,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
break;
case NS_QUERY_EDITOR_RECT:
{
if (RemoteQueryContentEvent(aEvent)) {
break;
}
// XXX remote event
ContentEventHandler handler(mPresContext);
handler.OnQueryEditorRect(aEvent->AsQueryContentEvent());
}

7
dom/ipc/PBrowser.ipdl
View File

@ -227,13 +227,6 @@ parent:
prio(urgent) sync NotifyIMEMouseButtonEvent(IMENotification notification)
returns (bool consumedByIME);
/**
* Notifies chrome to currect editor rect
*
* rect Rect of current focused editor
*/
prio(urgent) async NotifyIMEEditorRect(nsIntRect rect);
/**
* Instructs chrome to end any pending composition
*

15
dom/ipc/TabParent.cpp
View File

@ -1453,13 +1453,6 @@ TabParent::RecvNotifyIMEMouseButtonEvent(
return true;
}
bool
TabParent::RecvNotifyIMEEditorRect(const nsIntRect& aRect)
{
mIMEEditorRect = aRect;
return true;
}
bool
TabParent::RecvRequestFocus(const bool& aCanRaise)
{
@ -1605,8 +1598,6 @@ TabParent::RecvDispatchAfterKeyboardEvent(const WidgetKeyboardEvent& aEvent)
* Cocoa widget always queries selected offset, so it works on it.
*
* For NS_QUERY_CARET_RECT, fail if cached offset isn't equals to input
*
* For NS_QUERY_EDITOR_RECT, always success
*/
bool
TabParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent)
@ -1691,12 +1682,6 @@ TabParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent)
aEvent.mSucceeded = true;
}
break;
case NS_QUERY_EDITOR_RECT:
{
aEvent.mReply.mRect = mIMEEditorRect - GetChildProcessOffset();
aEvent.mSucceeded = true;
}
break;
}
return true;
}

2
dom/ipc/TabParent.h
View File

@ -178,7 +178,6 @@ public:
virtual bool RecvNotifyIMETextHint(const nsString& aText) MOZ_OVERRIDE;
virtual bool RecvNotifyIMEMouseButtonEvent(const widget::IMENotification& aEventMessage,
bool* aConsumedByIME) MOZ_OVERRIDE;
virtual bool RecvNotifyIMEEditorRect(const nsIntRect& aRect) MOZ_OVERRIDE;
virtual bool RecvEndIMEComposition(const bool& aCancel,
nsString* aComposition) MOZ_OVERRIDE;
virtual bool RecvGetInputContext(int32_t* aIMEEnabled,
@ -399,7 +398,6 @@ protected:
InfallibleTArray<nsIntRect> mIMECompositionRects;
uint32_t mIMECaretOffset;
nsIntRect mIMECaretRect;
nsIntRect mIMEEditorRect;
// The number of event series we're currently capturing.
int32_t mEventCaptureDepth;

20
widget/PuppetWidget.cpp
View File

@ -530,7 +530,6 @@ PuppetWidget::NotifyIMEOfFocusChange(bool aFocus)
IMENotification notification(NOTIFY_IME_OF_SELECTION_CHANGE);
notification.mSelectionChangeData.mCausedByComposition = false;
NotifyIMEOfSelectionChange(notification); // Update selection
NotifyIMEOfEditorRect();
} else {
mIMELastBlurSeqno = chromeSeqno;
}
@ -578,25 +577,6 @@ PuppetWidget::NotifyIMEOfUpdateComposition()
return NS_OK;
}
nsresult
PuppetWidget::NotifyIMEOfEditorRect()
{
#ifndef MOZ_CROSS_PROCESS_IME
return NS_OK;
#endif
nsEventStatus status;
WidgetQueryContentEvent editorRectEvent(true, NS_QUERY_EDITOR_RECT, this);
InitEvent(editorRectEvent);
DispatchEvent(&editorRectEvent, status);
if (editorRectEvent.mSucceeded) {
mTabChild->SendNotifyIMEEditorRect(editorRectEvent.mReply.mRect);
}
return NS_OK;
}
nsIMEUpdatePreference
PuppetWidget::GetIMEUpdatePreference()
{

1
widget/PuppetWidget.h
View File

@ -216,7 +216,6 @@ private:
nsresult NotifyIMEOfUpdateComposition();
nsresult NotifyIMEOfTextChange(const IMENotification& aIMENotification);
nsresult NotifyIMEOfMouseButtonEvent(const IMENotification& aIMENotification);
nsresult NotifyIMEOfEditorRect();
class PaintTask : public nsRunnable {
public: