author | Robert O'Callahan <robert@ocallahan.org> |
Tue, 21 Oct 2014 10:32:09 +1300 | |
changeset 214028 | d223d7cd7e629aa3ee89aec8849a30133baa2230 |
parent 214027 | 08cef10b6076c64ecbdc7b725ca4b1090185a6b7 |
child 214029 | dc63a7b6f073a6e958d856d886a4d77a70d6c8de |
push id | 27771 |
push user | ryanvm@gmail.com |
push date | Wed, 05 Nov 2014 19:04:24 +0000 |
treeherder | mozilla-central@305b4fecce99 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mattwoodrow |
bugs | 1083635 |
milestone | 36.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
layout/base/nsDisplayList.cpp | file | annotate | diff | comparison | revisions | |
layout/base/nsDisplayList.h | file | annotate | diff | comparison | revisions |
--- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -4413,22 +4413,16 @@ void nsDisplayZoom::HitTest(nsDisplayLis rect.MoveTo(aRect.TopLeft().ConvertAppUnits(mParentAPD, mAPD)); rect.width = rect.height = 1; } else { rect = aRect.ConvertAppUnitsRoundOut(mParentAPD, mAPD); } mList.HitTest(aBuilder, rect, aState, aOutFrames); } -void nsDisplayZoom::Paint(nsDisplayListBuilder* aBuilder, - nsRenderingContext* aCtx) -{ - mList.PaintForFrame(aBuilder, aCtx, mFrame, nsDisplayList::PAINT_DEFAULT); -} - bool nsDisplayZoom::ComputeVisibility(nsDisplayListBuilder *aBuilder, nsRegion *aVisibleRegion) { // Convert the passed in visible region to our appunits. nsRegion visibleRegion; // mVisibleRect has been clipped to GetClippedBounds visibleRegion.And(*aVisibleRegion, mVisibleRect); visibleRegion = visibleRegion.ConvertAppUnitsRoundOut(mParentAPD, mAPD);
--- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -3175,17 +3175,16 @@ public: nsDisplayList* aList, int32_t aAPD, int32_t aParentAPD, uint32_t aFlags = 0); #ifdef NS_BUILD_REFCNT_LOGGING virtual ~nsDisplayZoom(); #endif virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; - virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE; virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE; virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, nsRegion* aVisibleRegion) MOZ_OVERRIDE; virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder, LayerManager* aManager, const ContainerLayerParameters& aParameters) MOZ_OVERRIDE {