wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 11:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

No Issue - Modernize nsImageFrame/nsImageMap

Browse source 
Primarily flow control improvements, and removing unused `nsresults`.
This commit is contained in:
Moonchild 2025-04-25 09:11:18 +02:00 • committed by roytam1
commit 8db40dbbb5
3 changed files with 37 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

30
layout/generic/nsImageFrame.cpp
View file

@ -175,17 +175,18 @@ nsImageFrame::AccessibleType()
void void
nsImageFrame::DisconnectMap() nsImageFrame::DisconnectMap()
{ {
if (mImageMap) { if (!mImageMap) {
mImageMap->Destroy(); return;
mImageMap = nullptr; }
mImageMap->Destroy();
mImageMap = nullptr;
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
nsAccessibilityService* accService = GetAccService(); if (nsAccessibilityService* accService = GetAccService()) {
if (accService) {
accService->RecreateAccessible(PresContext()->PresShell(), mContent); accService->RecreateAccessible(PresContext()->PresShell(), mContent);
} }
#endif #endif
}
} }
void void
@ -1718,8 +1719,7 @@ nsImageFrame::PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
nsLayoutUtils::GetSamplingFilterForFrame(this), dest, aDirtyRect, nsLayoutUtils::GetSamplingFilterForFrame(this), dest, aDirtyRect,
nullptr, flags, &anchorPoint); nullptr, flags, &anchorPoint);
nsImageMap* map = GetImageMap(); if (nsImageMap* map = GetImageMap()) {
if (map) {
gfxPoint devPixelOffset = gfxPoint devPixelOffset =
nsLayoutUtils::PointToGfxPoint(dest.TopLeft(), nsLayoutUtils::PointToGfxPoint(dest.TopLeft(),
PresContext()->AppUnitsPerDevPixel()); PresContext()->AppUnitsPerDevPixel());
@ -1886,8 +1886,7 @@ nsImageMap*
nsImageFrame::GetImageMap() nsImageFrame::GetImageMap()
{ {
if (!mImageMap) { if (!mImageMap) {
nsIContent* map = GetMapElement(); if (nsIContent* map = GetMapElement()) {
if (map) {
mImageMap = new nsImageMap(); mImageMap = new nsImageMap();
mImageMap->Init(this, map); mImageMap->Init(this, map);
} }
@ -1975,9 +1974,7 @@ nsImageFrame::GetContentForEvent(WidgetEvent* aEvent,
return NS_OK; return NS_OK;
} }
nsImageMap* map = GetImageMap(); if (nsImageMap* map = GetImageMap()) {
if (nullptr != map) {
nsIntPoint p; nsIntPoint p;
TranslateEventCoords( TranslateEventCoords(
nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, this), p); nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, this), p);
@ -2006,7 +2003,7 @@ nsImageFrame::HandleEvent(nsPresContext* aPresContext,
aEvent->mMessage == eMouseMove) { aEvent->mMessage == eMouseMove) {
nsImageMap* map = GetImageMap(); nsImageMap* map = GetImageMap();
bool isServerMap = IsServerImageMap(); bool isServerMap = IsServerImageMap();
if ((nullptr != map) || isServerMap) { if (map || isServerMap) {
nsIntPoint p; nsIntPoint p;
TranslateEventCoords( TranslateEventCoords(
nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, this), p); nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, this), p);
@ -2015,7 +2012,7 @@ nsImageFrame::HandleEvent(nsPresContext* aPresContext,
// through content, we need to make sure we're not inside // through content, we need to make sure we're not inside
// (in case we deal with a case of both client-side and // (in case we deal with a case of both client-side and
// sever-side on the same image - it happens!) // sever-side on the same image - it happens!)
if (nullptr != map) { if (map) {
inside = !!map->GetArea(p.x, p.y); inside = !!map->GetArea(p.x, p.y);
} }
@ -2063,8 +2060,7 @@ nsresult
nsImageFrame::GetCursor(const nsPoint& aPoint, nsImageFrame::GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor) nsIFrame::Cursor& aCursor)
{ {
nsImageMap* map = GetImageMap(); if (nsImageMap* map = GetImageMap()) {
if (nullptr != map) {
nsIntPoint p; nsIntPoint p;
TranslateEventCoords(aPoint, p); TranslateEventCoords(aPoint, p);
nsCOMPtr<nsIContent> area = map->GetArea(p.x, p.y); nsCOMPtr<nsIContent> area = map->GetArea(p.x, p.y);

59
layout/generic/nsImageMap.cpp
View file

@ -715,9 +715,7 @@ nsImageMap::GetBoundsForAreaContent(nsIContent *aContent,
void void
nsImageMap::FreeAreas() nsImageMap::FreeAreas()
{ {
uint32_t i, n = mAreas.Length(); for (auto* area : mAreas) {
for (i = 0; i < n; i++) {
Area* area = mAreas.ElementAt(i);
if (area->mArea->IsInUncomposedDoc()) { if (area->mArea->IsInUncomposedDoc()) {
NS_ASSERTION(area->mArea->GetPrimaryFrame() == mImageFrame, NS_ASSERTION(area->mArea->GetPrimaryFrame() == mImageFrame,
"Unexpected primary frame"); "Unexpected primary frame");
@ -731,30 +729,28 @@ nsImageMap::FreeAreas()
false); false);
delete area; delete area;
} }
mAreas.Clear(); mAreas.Clear();
} }
nsresult void
nsImageMap::Init(nsImageFrame* aImageFrame, nsIContent* aMap) nsImageMap::Init(nsImageFrame* aImageFrame, nsIContent* aMap)
{ {
NS_PRECONDITION(aMap, "null ptr"); MOZ_ASSERT(aMap);
if (!aMap) { MOZ_ASSERT(aImageFrame);
return NS_ERROR_NULL_POINTER;
}
mImageFrame = aImageFrame;
mImageFrame = aImageFrame;
mMap = aMap; mMap = aMap;
mMap->AddMutationObserver(this); mMap->AddMutationObserver(this);
// "Compile" the areas in the map into faster access versions // "Compile" the areas in the map into faster access versions
return UpdateAreas(); UpdateAreas();
} }
nsresult void
nsImageMap::SearchForAreas(nsIContent* aParent) nsImageMap::SearchForAreas(nsIContent* aParent)
{ {
nsresult rv = NS_OK;
uint32_t n = aParent->GetChildCount(); uint32_t n = aParent->GetChildCount();
// Look for <area> elements. // Look for <area> elements.
@ -762,8 +758,7 @@ nsImageMap::SearchForAreas(nsIContent* aParent)
child; child;
child = child->GetNextSibling()) { child = child->GetNextSibling()) {
if (auto* area = static_cast<HTMLAreaElement*>(HTMLAreaElement::FromContent(child))) { if (auto* area = static_cast<HTMLAreaElement*>(HTMLAreaElement::FromContent(child))) {
rv = AddArea(area); AddArea(area);
NS_ENSURE_SUCCESS(rv, rv);
// Continue to next child. This stops mConsiderWholeSubtree from // Continue to next child. This stops mConsiderWholeSubtree from
// getting set. It also makes us ignore children of <area>s which // getting set. It also makes us ignore children of <area>s which
@ -774,35 +769,28 @@ nsImageMap::SearchForAreas(nsIContent* aParent)
if (child->IsElement()) { if (child->IsElement()) {
mConsiderWholeSubtree = true; mConsiderWholeSubtree = true;
rv = SearchForAreas(child); SearchForAreas(child);
NS_ENSURE_SUCCESS(rv, rv);
} }
} }
return NS_OK;
} }
nsresult void
nsImageMap::UpdateAreas() nsImageMap::UpdateAreas()
{ {
// Get rid of old area data // Get rid of old area data
FreeAreas(); FreeAreas();
mConsiderWholeSubtree = false; mConsiderWholeSubtree = false;
nsresult rv = SearchForAreas(mMap); SearchForAreas(mMap);
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
if (NS_SUCCEEDED(rv)) { if (nsAccessibilityService* accService = GetAccService()) {
nsAccessibilityService* accService = GetAccService(); accService->UpdateImageMap(mImageFrame);
if (accService) {
accService->UpdateImageMap(mImageFrame);
}
} }
#endif #endif
return rv;
} }
nsresult void
nsImageMap::AddArea(HTMLAreaElement* aArea) nsImageMap::AddArea(HTMLAreaElement* aArea)
{ {
static nsIContent::AttrValuesArray strings[] = static nsIContent::AttrValuesArray strings[] =
@ -834,17 +822,13 @@ nsImageMap::AddArea(HTMLAreaElement* aArea)
break; break;
default: default:
area = nullptr; area = nullptr;
NS_NOTREACHED("FindAttrValueIn returned an unexpected value."); MOZ_ASSERT_UNREACHABLE("FindAttrValueIn returned an unexpected value.");
break; break;
} }
if (!area)
return NS_ERROR_OUT_OF_MEMORY;
//Add focus listener to track area focus changes //Add focus listener to track area focus changes
aArea->AddSystemEventListener(NS_LITERAL_STRING("focus"), this, false, aArea->AddSystemEventListener(NS_LITERAL_STRING("focus"), this, false, false);
false); aArea->AddSystemEventListener(NS_LITERAL_STRING("blur"), this, false, false);
aArea->AddSystemEventListener(NS_LITERAL_STRING("blur"), this, false,
false);
// This is a nasty hack. It needs to go away: see bug 135040. Once this is // This is a nasty hack. It needs to go away: see bug 135040. Once this is
// removed, the code added to RestyleManager::RestyleElement, // removed, the code added to RestyleManager::RestyleElement,
@ -857,16 +841,13 @@ nsImageMap::AddArea(HTMLAreaElement* aArea)
aArea->GetAttr(kNameSpaceID_None, nsGkAtoms::coords, coords); aArea->GetAttr(kNameSpaceID_None, nsGkAtoms::coords, coords);
area->ParseCoords(coords); area->ParseCoords(coords);
mAreas.AppendElement(area); mAreas.AppendElement(area);
return NS_OK;
} }
nsIContent* nsIContent*
nsImageMap::GetArea(nscoord aX, nscoord aY) const nsImageMap::GetArea(nscoord aX, nscoord aY) const
{ {
NS_ASSERTION(mMap, "Not initialized"); NS_ASSERTION(mMap, "Not initialized");
uint32_t i, n = mAreas.Length(); for (auto* area : mAreas) {
for (i = 0; i < n; i++) {
Area* area = mAreas.ElementAt(i);
if (area->IsInside(aX, aY)) { if (area->IsInside(aX, aY)) {
return area->mArea; return area->mArea;
} }
@ -1000,7 +981,7 @@ nsImageMap::HandleEvent(nsIDOMEvent* aEvent)
} }
void void
nsImageMap::Destroy(void) nsImageMap::Destroy()
{ {
FreeAreas(); FreeAreas();
mImageFrame = nullptr; mImageFrame = nullptr;

8
layout/generic/nsImageMap.h
View file

@ -37,7 +37,7 @@ class nsImageMap final : public nsStubMutationObserver,
public: public:
nsImageMap(); nsImageMap();
nsresult Init(nsImageFrame* aImageFrame, nsIContent* aMap); void Init(nsImageFrame* aImageFrame, nsIContent* aMap);
/** /**
* Return the first area element (in content order) for the given aX,aY pixel * Return the first area element (in content order) for the given aX,aY pixel
@ -86,10 +86,10 @@ protected:
void FreeAreas(); void FreeAreas();
nsresult UpdateAreas(); void UpdateAreas();
nsresult SearchForAreas(nsIContent* aParent); void SearchForAreas(nsIContent* aParent);
nsresult AddArea(mozilla::dom::HTMLAreaElement* aArea); void AddArea(mozilla::dom::HTMLAreaElement* aArea);
void MaybeUpdateAreas(nsIContent *aContent); void MaybeUpdateAreas(nsIContent *aContent);