Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1425652 - mosueDown, mouseUp and mouseMove should be removed from nsIHTMLObjectResizer. r=masayuki

Browse Source 
comm-central and bluegriffon don't use mosueDown, mouseUp and mouseMove in
nsIHTMLObjectResizer, so we should remove these methods from this interface.

MozReview-Commit-ID: BnSkkH7f0xc

--HG--
extra : rebase_source : 40811e1a0b714e3ef30fd9ac5e4f840241de3780
This commit is contained in:
Makoto Kato 2018-01-10 12:47:16 +09:00
parent 3c49d82e69
commit 3f840ba7f5
4 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
editor/libeditor/HTMLEditor.h
View File

@ -130,8 +130,6 @@ public:
using EditorBase::RemoveAttributeOrEquivalent;
using EditorBase::SetAttributeOrEquivalent;
nsresult MouseMove(nsIDOMMouseEvent* aMouseEvent);
// nsStubMutationObserver overrides
NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED
NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED
@ -444,6 +442,30 @@ public:
mDefaultParagraphSeparator = aSep;
}
/**
* event callback when a mouse button is pressed
* @param aX [IN] horizontal position of the pointer
* @param aY [IN] vertical position of the pointer
* @param aTarget [IN] the element triggering the event
* @param aMouseEvent [IN] the event
*/
nsresult OnMouseDown(int32_t aX, int32_t aY, nsIDOMElement* aTarget,
nsIDOMEvent* aMouseEvent);
/**
* event callback when a mouse button is released
* @param aX [IN] horizontal position of the pointer
* @param aY [IN] vertical position of the pointer
* @param aTarget [IN] the element triggering the event
*/
nsresult OnMouseUp(int32_t aX, int32_t aY, nsIDOMElement* aTarget);
/**
* event callback when the mouse pointer is moved
* @param aMouseEvent [IN] the event
*/
nsresult OnMouseMove(nsIDOMMouseEvent* aMouseEvent);
protected:
class BlobReader final : public nsIEditorBlobListener
{

4
editor/libeditor/HTMLEditorEventListener.cpp
View File

@ -62,7 +62,7 @@ HTMLEditorEventListener::MouseUp(nsIDOMMouseEvent* aMouseEvent)
int32_t clientX, clientY;
aMouseEvent->GetClientX(&clientX);
aMouseEvent->GetClientY(&clientY);
htmlEditor->MouseUp(clientX, clientY, element);
htmlEditor->OnMouseUp(clientX, clientY, element);
return EditorEventListener::MouseUp(aMouseEvent);
}
@ -194,7 +194,7 @@ HTMLEditorEventListener::MouseDown(nsIDOMMouseEvent* aMouseEvent)
int32_t clientX, clientY;
aMouseEvent->GetClientX(&clientX);
aMouseEvent->GetClientY(&clientY);
htmlEditor->MouseDown(clientX, clientY, element, aMouseEvent->AsEvent());
htmlEditor->OnMouseDown(clientX, clientY, element, aMouseEvent->AsEvent());
}
return EditorEventListener::MouseDown(aMouseEvent);

32
editor/libeditor/HTMLEditorObjectResizer.cpp
View File

@ -121,7 +121,7 @@ ResizerMouseMotionListener::HandleEvent(nsIDOMEvent* aMouseEvent)
RefPtr<HTMLEditor> htmlEditor = mHTMLEditorWeak.get();
if (htmlEditor) {
// check if we have to redisplay a resizing shadow
htmlEditor->MouseMove(mouseEvent);
htmlEditor->OnMouseMove(mouseEvent);
}
return NS_OK;
@ -548,11 +548,11 @@ HTMLEditor::StartResizing(nsIDOMElement* aHandle)
return result;
}
NS_IMETHODIMP
HTMLEditor::MouseDown(int32_t aClientX,
int32_t aClientY,
nsIDOMElement* aTarget,
nsIDOMEvent* aEvent)
nsresult
HTMLEditor::OnMouseDown(int32_t aClientX,
int32_t aClientY,
nsIDOMElement* aTarget,
nsIDOMEvent* aEvent)
{
bool anonElement = false;
if (aTarget && NS_SUCCEEDED(aTarget->HasAttribute(NS_LITERAL_STRING("_moz_anonclass"), &anonElement)))
@ -580,10 +580,10 @@ HTMLEditor::MouseDown(int32_t aClientX,
return NS_OK;
}
NS_IMETHODIMP
HTMLEditor::MouseUp(int32_t aClientX,
int32_t aClientY,
nsIDOMElement* aTarget)
nsresult
HTMLEditor::OnMouseUp(int32_t aClientX,
int32_t aClientY,
nsIDOMElement* aTarget)
{
if (mIsResizing) {
// we are resizing and release the mouse button, so let's
@ -805,18 +805,8 @@ HTMLEditor::GetNewResizingHeight(int32_t aX,
return std::max(resized, 1);
}
NS_IMETHODIMP
HTMLEditor::MouseMove(nsIDOMEvent* aMouseEvent)
{
nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aMouseEvent);
if (NS_WARN_IF(!mouseEvent)) {
return NS_OK;
}
return MouseMove(mouseEvent);
}
nsresult
HTMLEditor::MouseMove(nsIDOMMouseEvent* aMouseEvent)
HTMLEditor::OnMouseMove(nsIDOMMouseEvent* aMouseEvent)
{
MOZ_ASSERT(aMouseEvent);

25
editor/nsIHTMLObjectResizer.idl
View File

@ -47,30 +47,5 @@ interface nsIHTMLObjectResizer : nsISupports
* Refresh visible resizers
*/
void refreshResizers();
/**
* event callback when a mouse button is pressed
* @param aX [IN] horizontal position of the pointer
* @param aY [IN] vertical position of the pointer
* @param aTarget [IN] the element triggering the event
* @param aMouseEvent [IN] the event
*/
void mouseDown(in long aX, in long aY,
in nsIDOMElement aTarget, in nsIDOMEvent aMouseEvent);
/**
* event callback when a mouse button is released
* @param aX [IN] horizontal position of the pointer
* @param aY [IN] vertical position of the pointer
* @param aTarget [IN] the element triggering the event
*/
void mouseUp(in long aX, in long aY,
in nsIDOMElement aTarget);
/**
* event callback when the mouse pointer is moved
* @param aMouseEvent [IN] the event
*/
void mouseMove(in nsIDOMEvent aMouseEvent);
};