e844cdeed5
Split the class inheritance trees for nsIDragService and nsIDragSession. Remember that, before the start of this patch series, the inheritance diagram was: nsDragService -> nsBaseDragService -> nsIDragService + nsIDragSession and the only instance was a singleton. We switched it to: nsDragService -> nsDragSession -> nsBaseDragService -> nsIDragService + nsBaseDragSession -> nsIDragSession and maintained the singleton. This allowed us to allow us to move things to the new classes without breaking behavior. We are done with that, so we can now change the inheritance to its final form: nsDragService -> nsBaseDragService -> nsIDragService nsDragSession -> nsBaseDragSession -> nsIDragSession Of course, we also need to properly construct and release the nsIDragSessions (formerly part of the singleton), so that is done here as well. That happens in nsBaseDrag[Service|Session] for parent process drags and in nsDrag[Service|Session]Proxy for content. This is all fairly straightforward, except in the case of gtk, where we need to change some callback behavior. Differential Revision: https://phabricator.services.mozilla.com/D211084
66 lines
2.0 KiB
C++
66 lines
2.0 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef nsDragService_h__
|
|
#define nsDragService_h__
|
|
|
|
#include "nsBaseDragService.h"
|
|
|
|
#include "AndroidGraphics.h"
|
|
#include "mozilla/java/GeckoDragAndDropNatives.h"
|
|
|
|
class nsITransferable;
|
|
|
|
/**
|
|
* Android native nsIDragSession implementation
|
|
*/
|
|
class nsDragSession : public nsBaseDragSession {
|
|
public:
|
|
// nsIDragSession
|
|
NS_IMETHOD GetData(nsITransferable* aTransferable, uint32_t anItem) override;
|
|
NS_IMETHOD GetNumDropItems(uint32_t* aNumItems) override;
|
|
NS_IMETHOD IsDataFlavorSupported(const char* aDataFlavor,
|
|
bool* _retval) override;
|
|
NS_IMETHOD
|
|
UpdateDragImage(nsINode* aImage, int32_t aImageX, int32_t aImageY) override;
|
|
|
|
void SetData(nsITransferable* aTransferable);
|
|
|
|
void SetDropData(mozilla::java::GeckoDragAndDrop::DropData::Param aDropData);
|
|
|
|
virtual bool MustUpdateDataTransfer(mozilla::EventMessage aMessage) override;
|
|
|
|
MOZ_CAN_RUN_SCRIPT nsresult EndDragSessionImpl(
|
|
bool aDoneDrag, uint32_t aKeyModifiers) override;
|
|
|
|
protected:
|
|
virtual ~nsDragSession() = default;
|
|
|
|
// nsBaseDragSession
|
|
MOZ_CAN_RUN_SCRIPT nsresult
|
|
InvokeDragSessionImpl(nsIWidget* aWidget, nsIArray* anArrayTransferables,
|
|
const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
|
|
uint32_t aActionType) override;
|
|
|
|
mozilla::java::sdk::Bitmap::LocalRef CreateDragImage(
|
|
nsINode* aNode, const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion);
|
|
|
|
// our source data items
|
|
nsCOMPtr<nsITransferable> mTransferable;
|
|
};
|
|
|
|
/**
|
|
* Android native nsIDragService implementation
|
|
*/
|
|
class nsDragService final : public nsBaseDragService {
|
|
public:
|
|
static already_AddRefed<nsDragService> GetInstance();
|
|
|
|
protected:
|
|
already_AddRefed<nsIDragSession> CreateDragSession() override;
|
|
};
|
|
|
|
#endif // nsDragService_h__
|