Skip to content

Commit

Permalink
override -> MOZ_OVERRIDE
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmottola
rmottola committed Feb 19, 2019
1 parent 4e9c43e commit ed1ecc1
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 62 deletions.
16 changes: 8 additions & 8 deletions gfx/layers/apz/util/ChromeProcessController.h
View file
Expand Up @@ -33,28 +33,28 @@ class ChromeProcessController : public mozilla::layers::GoannaContentController

public:
explicit ChromeProcessController(nsIWidget* aWidget, APZEventState* aAPZEventState);
virtual void Destroy() override;
virtual void Destroy() MOZ_OVERRIDE;

// GoannaContentController interface
virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics) override;
virtual void PostDelayedTask(Task* aTask, int aDelayMs) override;
virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics) MOZ_OVERRIDE;
virtual void PostDelayedTask(Task* aTask, int aDelayMs) MOZ_OVERRIDE;
virtual void AcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId,
const uint32_t& aScrollGeneration) override;
const uint32_t& aScrollGeneration) MOZ_OVERRIDE;

virtual void HandleDoubleTap(const mozilla::CSSPoint& aPoint, int32_t aModifiers,
const ScrollableLayerGuid& aGuid) override {}
virtual void HandleSingleTap(const mozilla::CSSPoint& aPoint, int32_t aModifiers,
const ScrollableLayerGuid& aGuid) override;
const ScrollableLayerGuid& aGuid) MOZ_OVERRIDE;
virtual void HandleLongTap(const mozilla::CSSPoint& aPoint, int32_t aModifiers,
const ScrollableLayerGuid& aGuid,
uint64_t aInputBlockId) override;
uint64_t aInputBlockId) MOZ_OVERRIDE;
virtual void HandleLongTapUp(const CSSPoint& aPoint, int32_t aModifiers,
const ScrollableLayerGuid& aGuid) override;
const ScrollableLayerGuid& aGuid) MOZ_OVERRIDE;
virtual void SendAsyncScrollDOMEvent(bool aIsRoot, const mozilla::CSSRect &aContentRect,
const mozilla::CSSSize &aScrollableSize) override {}
virtual void NotifyAPZStateChange(const ScrollableLayerGuid& aGuid,
APZStateChange aChange,
int aArg) override;
int aArg) MOZ_OVERRIDE;
private:
nsCOMPtr<nsIWidget> mWidget;
nsRefPtr<APZEventState> mAPZEventState;
Expand Down
108 changes: 54 additions & 54 deletions layout/generic/nsGfxScrollFrame.h
View file
Expand Up @@ -533,7 +533,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS

virtual mozilla::WritingMode GetWritingMode() const override
virtual mozilla::WritingMode GetWritingMode() const MOZ_OVERRIDE
{
if (mHelper.mScrolledFrame) {
return mHelper.mScrolledFrame->GetWritingMode();
Expand Down Expand Up @@ -564,7 +564,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
nscoord GetIntrinsicVScrollbarWidth(nsRenderingContext *aRenderingContext);

virtual bool GetBorderRadii(const nsSize& aFrameSize, const nsSize& aBorderArea,
Sides aSkipSides, nscoord aRadii[8]) const override {
Sides aSkipSides, nscoord aRadii[8]) const MOZ_OVERRIDE {
return mHelper.GetBorderRadii(aFrameSize, aBorderArea, aSkipSides, aRadii);
}

Expand Down Expand Up @@ -605,7 +605,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
}

virtual bool DoesClipChildren() override { return true; }
virtual nsSplittableType GetSplittableType() const override;
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;

virtual nsPoint GetPositionOfChildIgnoringScrolling(nsIFrame* aChild) override
{ nsPoint pt = aChild->GetPosition();
Expand All @@ -619,16 +619,16 @@ class nsHTMLScrollFrame : public nsContainerFrame,
uint32_t aFilter) override;

// nsIScrollableFrame
virtual nsIFrame* GetScrolledFrame() const override {
virtual nsIFrame* GetScrolledFrame() const MOZ_OVERRIDE {
return mHelper.GetScrolledFrame();
}
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const override {
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const MOZ_OVERRIDE {
return mHelper.GetScrollbarStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const override {
virtual uint32_t GetScrollbarVisibility() const MOZ_OVERRIDE {
return mHelper.GetScrollbarVisibility();
}
virtual nsMargin GetActualScrollbarSizes() const override {
virtual nsMargin GetActualScrollbarSizes() const MOZ_OVERRIDE {
return mHelper.GetActualScrollbarSizes();
}
virtual nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState) override {
Expand All @@ -644,25 +644,25 @@ class nsHTMLScrollFrame : public nsContainerFrame,
nsBoxLayoutState bls(aPresContext, aRC, 0);
return mHelper.GetNondisappearingScrollbarWidth(&bls);
}
virtual nsRect GetScrolledRect() const override {
virtual nsRect GetScrolledRect() const MOZ_OVERRIDE {
return mHelper.GetScrolledRect();
}
virtual nsRect GetScrollPortRect() const override {
virtual nsRect GetScrollPortRect() const MOZ_OVERRIDE {
return mHelper.GetScrollPortRect();
}
virtual nsPoint GetScrollPosition() const override {
virtual nsPoint GetScrollPosition() const MOZ_OVERRIDE {
return mHelper.GetScrollPosition();
}
virtual nsPoint GetLogicalScrollPosition() const override {
virtual nsPoint GetLogicalScrollPosition() const MOZ_OVERRIDE {
return mHelper.GetLogicalScrollPosition();
}
virtual nsRect GetScrollRange() const override {
virtual nsRect GetScrollRange() const MOZ_OVERRIDE {
return mHelper.GetScrollRange();
}
virtual nsSize GetScrollPositionClampingScrollPortSize() const override {
virtual nsSize GetScrollPositionClampingScrollPortSize() const MOZ_OVERRIDE {
return mHelper.GetScrollPositionClampingScrollPortSize();
}
virtual gfxSize GetResolution() const override {
virtual gfxSize GetResolution() const MOZ_OVERRIDE {
return mHelper.GetResolution();
}
virtual void SetResolution(const gfxSize& aResolution) override {
Expand All @@ -671,10 +671,10 @@ class nsHTMLScrollFrame : public nsContainerFrame,
virtual void SetResolutionAndScaleTo(const gfxSize& aResolution) override {
return mHelper.SetResolutionAndScaleTo(aResolution);
}
virtual nsSize GetLineScrollAmount() const override {
virtual nsSize GetLineScrollAmount() const MOZ_OVERRIDE {
return mHelper.GetLineScrollAmount();
}
virtual nsSize GetPageScrollAmount() const override {
virtual nsSize GetPageScrollAmount() const MOZ_OVERRIDE {
return mHelper.GetPageScrollAmount();
}
/**
Expand Down Expand Up @@ -742,10 +742,10 @@ class nsHTMLScrollFrame : public nsContainerFrame,
virtual void ResetScrollPositionForLayerPixelAlignment() override {
mHelper.ResetScrollPositionForLayerPixelAlignment();
}
virtual bool IsResolutionSet() const override {
virtual bool IsResolutionSet() const MOZ_OVERRIDE {
return mHelper.mIsResolutionSet;
}
virtual bool DidHistoryRestore() const override {
virtual bool DidHistoryRestore() const MOZ_OVERRIDE {
return mHelper.mDidHistoryRestore;
}
virtual void ClearDidHistoryRestore() override {
Expand All @@ -754,7 +754,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
virtual bool IsRectNearlyVisible(const nsRect& aRect) override {
return mHelper.IsRectNearlyVisible(aRect);
}
virtual nsRect ExpandRectToNearlyVisible(const nsRect& aRect) const override {
virtual nsRect ExpandRectToNearlyVisible(const nsRect& aRect) const MOZ_OVERRIDE {
return mHelper.ExpandRectToNearlyVisible(aRect);
}
virtual nsIAtom* LastScrollOrigin() override {
Expand All @@ -772,20 +772,20 @@ class nsHTMLScrollFrame : public nsContainerFrame,
virtual void ResetScrollInfoIfGeneration(uint32_t aGeneration) override {
mHelper.ResetScrollInfoIfGeneration(aGeneration);
}
virtual bool WantAsyncScroll() const override {
virtual bool WantAsyncScroll() const MOZ_OVERRIDE {
return mHelper.WantAsyncScroll();
}
virtual void ComputeFrameMetrics(Layer* aLayer, nsIFrame* aContainerReferenceFrame,
const ContainerLayerParameters& aParameters,
nsRect* aClipRect,
nsTArray<FrameMetrics>* aOutput) const override {
nsTArray<FrameMetrics>* aOutput) const MOZ_OVERRIDE {
mHelper.ComputeFrameMetrics(aLayer, aContainerReferenceFrame,
aParameters, aClipRect, aOutput);
}
virtual bool IsIgnoringViewportClipping() const override {
virtual bool IsIgnoringViewportClipping() const MOZ_OVERRIDE {
return mHelper.IsIgnoringViewportClipping();
}
virtual void MarkScrollbarsDirtyForReflow() const override {
virtual void MarkScrollbarsDirtyForReflow() const MOZ_OVERRIDE {
mHelper.MarkScrollbarsDirtyForReflow();
}

Expand All @@ -806,7 +806,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
*
* @see nsGkAtoms::scrollFrame
*/
virtual nsIAtom* GetType() const override;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;

// nsIScrollbarMediator
virtual void ScrollByPage(nsScrollbarFrame* aScrollbar, int32_t aDirection) override {
Expand All @@ -830,8 +830,8 @@ class nsHTMLScrollFrame : public nsContainerFrame,
virtual nsIFrame* GetScrollbarBox(bool aVertical) override {
return mHelper.GetScrollbarBox(aVertical);
}
virtual void ScrollbarActivityStarted() const override;
virtual void ScrollbarActivityStopped() const override;
virtual void ScrollbarActivityStarted() const MOZ_OVERRIDE;
virtual void ScrollbarActivityStopped() const MOZ_OVERRIDE;

virtual void SetTransformingByAPZ(bool aTransforming) MOZ_OVERRIDE {
mHelper.SetTransformingByAPZ(aTransforming);
Expand All @@ -841,7 +841,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
}

#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override;
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif

#ifdef ACCESSIBILITY
Expand Down Expand Up @@ -940,7 +940,7 @@ class nsXULScrollFrame final : public nsBoxFrame,
}

virtual bool DoesClipChildren() override { return true; }
virtual nsSplittableType GetSplittableType() const override;
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;

virtual nsPoint GetPositionOfChildIgnoringScrolling(nsIFrame* aChild) override
{ nsPoint pt = aChild->GetPosition();
Expand All @@ -963,7 +963,7 @@ class nsXULScrollFrame final : public nsBoxFrame,
virtual nsresult GetPadding(nsMargin& aPadding) override;

virtual bool GetBorderRadii(const nsSize& aFrameSize, const nsSize& aBorderArea,
Sides aSkipSides, nscoord aRadii[8]) const override {
Sides aSkipSides, nscoord aRadii[8]) const MOZ_OVERRIDE {
return mHelper.GetBorderRadii(aFrameSize, aBorderArea, aSkipSides, aRadii);
}

Expand Down Expand Up @@ -991,16 +991,16 @@ class nsXULScrollFrame final : public nsBoxFrame,
static void AdjustReflowStateBack(nsBoxLayoutState& aState, bool aSetBack);

// nsIScrollableFrame
virtual nsIFrame* GetScrolledFrame() const override {
virtual nsIFrame* GetScrolledFrame() const MOZ_OVERRIDE {
return mHelper.GetScrolledFrame();
}
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const override {
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const MOZ_OVERRIDE {
return mHelper.GetScrollbarStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const override {
virtual uint32_t GetScrollbarVisibility() const MOZ_OVERRIDE {
return mHelper.GetScrollbarVisibility();
}
virtual nsMargin GetActualScrollbarSizes() const override {
virtual nsMargin GetActualScrollbarSizes() const MOZ_OVERRIDE {
return mHelper.GetActualScrollbarSizes();
}
virtual nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState) override {
Expand All @@ -1016,25 +1016,25 @@ class nsXULScrollFrame final : public nsBoxFrame,
nsBoxLayoutState bls(aPresContext, aRC, 0);
return mHelper.GetNondisappearingScrollbarWidth(&bls);
}
virtual nsRect GetScrolledRect() const override {
virtual nsRect GetScrolledRect() const MOZ_OVERRIDE {
return mHelper.GetScrolledRect();
}
virtual nsRect GetScrollPortRect() const override {
virtual nsRect GetScrollPortRect() const MOZ_OVERRIDE {
return mHelper.GetScrollPortRect();
}
virtual nsPoint GetScrollPosition() const override {
virtual nsPoint GetScrollPosition() const MOZ_OVERRIDE {
return mHelper.GetScrollPosition();
}
virtual nsPoint GetLogicalScrollPosition() const override {
virtual nsPoint GetLogicalScrollPosition() const MOZ_OVERRIDE {
return mHelper.GetLogicalScrollPosition();
}
virtual nsRect GetScrollRange() const override {
virtual nsRect GetScrollRange() const MOZ_OVERRIDE {
return mHelper.GetScrollRange();
}
virtual nsSize GetScrollPositionClampingScrollPortSize() const override {
virtual nsSize GetScrollPositionClampingScrollPortSize() const MOZ_OVERRIDE {
return mHelper.GetScrollPositionClampingScrollPortSize();
}
virtual gfxSize GetResolution() const override {
virtual gfxSize GetResolution() const MOZ_OVERRIDE {
return mHelper.GetResolution();
}
virtual void SetResolution(const gfxSize& aResolution) override {
Expand All @@ -1043,10 +1043,10 @@ class nsXULScrollFrame final : public nsBoxFrame,
virtual void SetResolutionAndScaleTo(const gfxSize& aResolution) override {
return mHelper.SetResolutionAndScaleTo(aResolution);
}
virtual nsSize GetLineScrollAmount() const override {
virtual nsSize GetLineScrollAmount() const MOZ_OVERRIDE {
return mHelper.GetLineScrollAmount();
}
virtual nsSize GetPageScrollAmount() const override {
virtual nsSize GetPageScrollAmount() const MOZ_OVERRIDE {
return mHelper.GetPageScrollAmount();
}
/**
Expand Down Expand Up @@ -1111,10 +1111,10 @@ class nsXULScrollFrame final : public nsBoxFrame,
virtual void ResetScrollPositionForLayerPixelAlignment() override {
mHelper.ResetScrollPositionForLayerPixelAlignment();
}
virtual bool IsResolutionSet() const override {
virtual bool IsResolutionSet() const MOZ_OVERRIDE {
return mHelper.mIsResolutionSet;
}
virtual bool DidHistoryRestore() const override {
virtual bool DidHistoryRestore() const MOZ_OVERRIDE {
return mHelper.mDidHistoryRestore;
}
virtual void ClearDidHistoryRestore() override {
Expand All @@ -1123,7 +1123,7 @@ class nsXULScrollFrame final : public nsBoxFrame,
virtual bool IsRectNearlyVisible(const nsRect& aRect) override {
return mHelper.IsRectNearlyVisible(aRect);
}
virtual nsRect ExpandRectToNearlyVisible(const nsRect& aRect) const override {
virtual nsRect ExpandRectToNearlyVisible(const nsRect& aRect) const MOZ_OVERRIDE {
return mHelper.ExpandRectToNearlyVisible(aRect);
}
virtual nsIAtom* LastScrollOrigin() override {
Expand All @@ -1141,20 +1141,20 @@ class nsXULScrollFrame final : public nsBoxFrame,
virtual void ResetScrollInfoIfGeneration(uint32_t aGeneration) override {
mHelper.ResetScrollInfoIfGeneration(aGeneration);
}
virtual bool WantAsyncScroll() const override {
virtual bool WantAsyncScroll() const MOZ_OVERRIDE {
return mHelper.WantAsyncScroll();
}
virtual void ComputeFrameMetrics(Layer* aLayer, nsIFrame* aContainerReferenceFrame,
const ContainerLayerParameters& aParameters,
nsRect* aClipRect,
nsTArray<FrameMetrics>* aOutput) const override {
nsTArray<FrameMetrics>* aOutput) const MOZ_OVERRIDE {
mHelper.ComputeFrameMetrics(aLayer, aContainerReferenceFrame,
aParameters, aClipRect, aOutput);
}
virtual bool IsIgnoringViewportClipping() const override {
virtual bool IsIgnoringViewportClipping() const MOZ_OVERRIDE {
return mHelper.IsIgnoringViewportClipping();
}
virtual void MarkScrollbarsDirtyForReflow() const override {
virtual void MarkScrollbarsDirtyForReflow() const MOZ_OVERRIDE {
mHelper.MarkScrollbarsDirtyForReflow();
}

Expand All @@ -1175,9 +1175,9 @@ class nsXULScrollFrame final : public nsBoxFrame,
*
* @see nsGkAtoms::scrollFrame
*/
virtual nsIAtom* GetType() const override;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;

virtual bool IsFrameOfType(uint32_t aFlags) const override
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
// Override bogus IsFrameOfType in nsBoxFrame.
if (aFlags & (nsIFrame::eReplacedContainsBlock | nsIFrame::eReplaced))
Expand Down Expand Up @@ -1207,8 +1207,8 @@ class nsXULScrollFrame final : public nsBoxFrame,
return mHelper.GetScrollbarBox(aVertical);
}

virtual void ScrollbarActivityStarted() const override;
virtual void ScrollbarActivityStopped() const override;
virtual void ScrollbarActivityStarted() const MOZ_OVERRIDE;
virtual void ScrollbarActivityStopped() const MOZ_OVERRIDE;

virtual void SetTransformingByAPZ(bool aTransforming) MOZ_OVERRIDE {
mHelper.SetTransformingByAPZ(aTransforming);
Expand All @@ -1218,7 +1218,7 @@ class nsXULScrollFrame final : public nsBoxFrame,
}

#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override;
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif

protected:
Expand Down

0 comments on commit ed1ecc1

Please sign in to comment.