зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1216885 - Make nsISelectionPrivate not inherit from nsISelection. r=smaug
nsISelectionPrivate is accessible to script, while nsISelection is not, so making the former inherit from the latter means script doesn't have a complete view of the inheritance chain so the XPIDL compiler produces an error. It turns out that nothing in script relies on this inheritance, which makes sense because I'm not sure how it would even work, so just remove it. MozReview-Commit-ID: 3Py2T7cprlD --HG-- extra : rebase_source : 89fac3ad0f7a30c1c71da79d554ebfa153d5fb33
This commit is contained in:
Родитель
09780eb044
Коммит
58abe33226
|
@ -56,8 +56,9 @@ struct RangeData
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace dom {
|
namespace dom {
|
||||||
|
|
||||||
class Selection final : public nsISelectionPrivate,
|
class Selection final : public nsISelection,
|
||||||
public nsWrapperCache,
|
public nsWrapperCache,
|
||||||
|
public nsISelectionPrivate,
|
||||||
public nsSupportsWeakReference
|
public nsSupportsWeakReference
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
|
@ -68,7 +69,7 @@ public:
|
||||||
explicit Selection(nsFrameSelection *aList);
|
explicit Selection(nsFrameSelection *aList);
|
||||||
|
|
||||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Selection, nsISelectionPrivate)
|
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Selection, nsISelection)
|
||||||
NS_DECL_NSISELECTION
|
NS_DECL_NSISELECTION
|
||||||
NS_DECL_NSISELECTIONPRIVATE
|
NS_DECL_NSISELECTIONPRIVATE
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ native nsDirection(nsDirection);
|
||||||
native ScrollAxis(nsIPresShell::ScrollAxis);
|
native ScrollAxis(nsIPresShell::ScrollAxis);
|
||||||
|
|
||||||
[scriptable, builtinclass, uuid(0c9f4f74-ee7e-4fe9-be6b-0ba856368178)]
|
[scriptable, builtinclass, uuid(0c9f4f74-ee7e-4fe9-be6b-0ba856368178)]
|
||||||
interface nsISelectionPrivate : nsISelection
|
interface nsISelectionPrivate : nsISupports
|
||||||
{
|
{
|
||||||
const short ENDOFPRECEDINGLINE=0;
|
const short ENDOFPRECEDINGLINE=0;
|
||||||
const short STARTOFNEXTLINE=1;
|
const short STARTOFNEXTLINE=1;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче