Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded stubs for code to support Navigator 4.x-only suppress attribute. b=182554 r=biesi (who noticed the problem) sr=peterv

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@134581 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu 2002-11-28 23:02:31 +00:00
parent a5f1824026
commit 2644fbd1b6
8 changed files with 54 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/layout/generic/nsImageFrame.cpp
View File

@ -105,12 +105,6 @@
#endif
// Value's for mSuppress
#define SUPPRESS_UNSET 0
#define DONT_SUPPRESS 1
#define SUPPRESS 2
#define DEFAULT_SUPPRESS 3
// values for image loading icons
#define NS_ICON_LOADING_IMAGE (0)
#define NS_ICON_BROKEN_IMAGE (1)
@ -1567,21 +1561,6 @@ nsImageFrame::IsServerImageMap()
mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::ismap, ismap);
}
PRIntn
nsImageFrame::GetSuppress()
{
nsAutoString s;
if (NS_CONTENT_ATTR_HAS_VALUE ==
mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::suppress, s)) {
if (s.EqualsIgnoreCase("true")) {
return SUPPRESS;
} else if (s.EqualsIgnoreCase("false")) {
return DONT_SUPPRESS;
}
}
return DEFAULT_SUPPRESS;
}
//XXX the event come's in in view relative coords, but really should
//be in frame relative coords by the time it hits our frame.
@ -1678,12 +1657,10 @@ nsImageFrame::GetContentForEvent(nsIPresContext* aPresContext,
nsPoint p;
TranslateEventCoords(aPresContext, aEvent->point, p);
nsAutoString absURL, target, altText;
PRBool suppress;
PRBool inside = PR_FALSE;
nsCOMPtr<nsIContent> area;
inside = map->IsInside(p.x, p.y, getter_AddRefs(area),
absURL, target, altText,
&suppress);
absURL, target, altText);
if (inside && area) {
*aContent = area;
NS_ADDREF(*aContent);
@ -1713,7 +1690,6 @@ nsImageFrame::HandleEvent(nsIPresContext* aPresContext,
nsPoint p;
TranslateEventCoords(aPresContext, aEvent->point, p);
nsAutoString absURL, target, altText;
PRBool suppress;
PRBool inside = PR_FALSE;
// Even though client-side image map triggering happens
// through content, we need to make sure we're not inside
@ -1722,12 +1698,10 @@ nsImageFrame::HandleEvent(nsIPresContext* aPresContext,
if (nsnull != map) {
nsCOMPtr<nsIContent> area;
inside = map->IsInside(p.x, p.y, getter_AddRefs(area),
absURL, target, altText,
&suppress);
absURL, target, altText);
}
if (!inside && isServerMap) {
suppress = GetSuppress();
nsCOMPtr<nsIURI> baseURL;
GetBaseURI(getter_AddRefs(baseURL));

2
mozilla/layout/generic/nsImageFrame.h
View File

@ -190,8 +190,6 @@ protected:
PRBool GetAnchorHREFAndTarget(nsString& aHref, nsString& aTarget);
PRIntn GetSuppress();
void MeasureString(const PRUnichar* aString,
PRInt32 aLength,
nscoord aMaxWidth,

46
mozilla/layout/generic/nsImageMap.cpp
View File

@ -73,7 +73,7 @@ static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
class Area {
public:
Area(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
Area(nsIContent* aArea, PRBool aHasURL);
virtual ~Area();
virtual void ParseCoords(const nsString& aSpec);
@ -89,7 +89,6 @@ public:
void GetHREF(nsString& aHref) const;
void GetTarget(nsString& aTarget) const;
void GetAltText(nsString& aAltText) const;
PRBool GetSuppress() const { return mSuppressFeedback; }
PRBool GetHasURL() const { return mHasURL; }
void GetArea(nsIContent** aArea) const;
@ -100,16 +99,14 @@ public:
nsCOMPtr<nsIContent> mArea;
nscoord* mCoords;
PRInt32 mNumCoords;
PRPackedBool mSuppressFeedback;
PRPackedBool mHasURL;
PRPackedBool mHasFocus;
};
MOZ_DECL_CTOR_COUNTER(Area)
Area::Area(nsIContent* aArea,
PRBool aSuppress, PRBool aHasURL)
: mArea(aArea), mSuppressFeedback(aSuppress), mHasURL(aHasURL)
Area::Area(nsIContent* aArea, PRBool aHasURL)
: mArea(aArea), mHasURL(aHasURL)
{
MOZ_COUNT_CTOR(Area);
mCoords = nsnull;
@ -354,7 +351,7 @@ void Area::HasFocus(PRBool aHasFocus)
class DefaultArea : public Area {
public:
DefaultArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
DefaultArea(nsIContent* aArea, PRBool aHasURL);
~DefaultArea();
virtual PRBool IsInside(nscoord x, nscoord y);
@ -364,8 +361,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
DefaultArea::DefaultArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
DefaultArea::DefaultArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -395,7 +392,7 @@ void DefaultArea::GetShapeName(nsString& aResult) const
class RectArea : public Area {
public:
RectArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
RectArea(nsIContent* aArea, PRBool aHasURL);
~RectArea();
virtual void ParseCoords(const nsString& aSpec);
@ -406,8 +403,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
RectArea::RectArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
RectArea::RectArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -566,7 +563,7 @@ void RectArea::GetShapeName(nsString& aResult) const
class PolyArea : public Area {
public:
PolyArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
PolyArea(nsIContent* aArea, PRBool aHasURL);
~PolyArea();
virtual PRBool IsInside(nscoord x, nscoord y);
@ -576,8 +573,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
PolyArea::PolyArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
PolyArea::PolyArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -701,7 +698,7 @@ void PolyArea::GetShapeName(nsString& aResult) const
class CircleArea : public Area {
public:
CircleArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
CircleArea(nsIContent* aArea, PRBool aHasURL);
~CircleArea();
virtual PRBool IsInside(nscoord x, nscoord y);
@ -711,8 +708,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
CircleArea::CircleArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
CircleArea::CircleArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -983,7 +980,6 @@ nsImageMap::AddArea(nsIContent* aArea)
aArea->GetAttr(kNameSpaceID_None, nsHTMLAtoms::shape, shape);
aArea->GetAttr(kNameSpaceID_None, nsHTMLAtoms::coords, coords);
PRBool hasURL = (PRBool)(NS_CONTENT_ATTR_HAS_VALUE != aArea->GetAttr(kNameSpaceID_None, nsHTMLAtoms::nohref, noHref));
PRBool suppress = PR_FALSE;/* XXX */
//Add focus listener to track area focus changes
nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(aArea));
@ -999,18 +995,18 @@ nsImageMap::AddArea(nsIContent* aArea)
if ((0 == shape.Length()) ||
shape.EqualsIgnoreCase("rect") ||
shape.EqualsIgnoreCase("rectangle")) {
area = new RectArea(aArea, suppress, hasURL);
area = new RectArea(aArea, hasURL);
}
else if (shape.EqualsIgnoreCase("poly") ||
shape.EqualsIgnoreCase("polygon")) {
area = new PolyArea(aArea, suppress, hasURL);
area = new PolyArea(aArea, hasURL);
}
else if (shape.EqualsIgnoreCase("circle") ||
shape.EqualsIgnoreCase("circ")) {
area = new CircleArea(aArea, suppress, hasURL);
area = new CircleArea(aArea, hasURL);
}
else if (shape.EqualsIgnoreCase("default")) {
area = new DefaultArea(aArea, suppress, hasURL);
area = new DefaultArea(aArea, hasURL);
}
else {
// Unknown area type; bail
@ -1028,8 +1024,7 @@ nsImageMap::IsInside(nscoord aX, nscoord aY,
nsIContent** aContent,
nsString& aAbsURL,
nsString& aTarget,
nsString& aAltText,
PRBool* aSuppress)
nsString& aAltText)
{
PRInt32 i, n = mAreas.Count();
for (i = 0; i < n; i++) {
@ -1074,7 +1069,6 @@ nsImageMap::IsInside(nscoord aX, nscoord aY,
}
area->GetAltText(aAltText);
*aSuppress = area->mSuppressFeedback;
area->GetArea(aContent);

11
mozilla/layout/generic/nsImageMap.h
View File

@ -64,17 +64,16 @@ public:
/**
* See if the given aX,aY <b>pixel</b> coordinates are in the image
* map. If they are then NS_OK is returned and aAbsURL, aTarget,
* aAltText, aSuppress are filled in with the values from the
* underlying area tag. If the coordinates are not in the map
* then NS_NOT_INSIDE is returned.
* map. If they are then NS_OK is returned and aAbsURL, aTarget, and
* aAltText are filled in with the values from the underlying area
* element. If the coordinates are not in the map then NS_NOT_INSIDE
* is returned.
*/
PRBool IsInside(nscoord aX, nscoord aY,
nsIContent** aContent,
nsString& aAbsURL,
nsString& aTarget,
nsString& aAltText,
PRBool* aSuppress);
nsString& aAltText);
/**
* See if the given aX,aY <b>pixel</b> coordinates are in the image

30
mozilla/layout/html/base/src/nsImageFrame.cpp
View File

@ -105,12 +105,6 @@
#endif
// Value's for mSuppress
#define SUPPRESS_UNSET 0
#define DONT_SUPPRESS 1
#define SUPPRESS 2
#define DEFAULT_SUPPRESS 3
// values for image loading icons
#define NS_ICON_LOADING_IMAGE (0)
#define NS_ICON_BROKEN_IMAGE (1)
@ -1567,21 +1561,6 @@ nsImageFrame::IsServerImageMap()
mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::ismap, ismap);
}
PRIntn
nsImageFrame::GetSuppress()
{
nsAutoString s;
if (NS_CONTENT_ATTR_HAS_VALUE ==
mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::suppress, s)) {
if (s.EqualsIgnoreCase("true")) {
return SUPPRESS;
} else if (s.EqualsIgnoreCase("false")) {
return DONT_SUPPRESS;
}
}
return DEFAULT_SUPPRESS;
}
//XXX the event come's in in view relative coords, but really should
//be in frame relative coords by the time it hits our frame.
@ -1678,12 +1657,10 @@ nsImageFrame::GetContentForEvent(nsIPresContext* aPresContext,
nsPoint p;
TranslateEventCoords(aPresContext, aEvent->point, p);
nsAutoString absURL, target, altText;
PRBool suppress;
PRBool inside = PR_FALSE;
nsCOMPtr<nsIContent> area;
inside = map->IsInside(p.x, p.y, getter_AddRefs(area),
absURL, target, altText,
&suppress);
absURL, target, altText);
if (inside && area) {
*aContent = area;
NS_ADDREF(*aContent);
@ -1713,7 +1690,6 @@ nsImageFrame::HandleEvent(nsIPresContext* aPresContext,
nsPoint p;
TranslateEventCoords(aPresContext, aEvent->point, p);
nsAutoString absURL, target, altText;
PRBool suppress;
PRBool inside = PR_FALSE;
// Even though client-side image map triggering happens
// through content, we need to make sure we're not inside
@ -1722,12 +1698,10 @@ nsImageFrame::HandleEvent(nsIPresContext* aPresContext,
if (nsnull != map) {
nsCOMPtr<nsIContent> area;
inside = map->IsInside(p.x, p.y, getter_AddRefs(area),
absURL, target, altText,
&suppress);
absURL, target, altText);
}
if (!inside && isServerMap) {
suppress = GetSuppress();
nsCOMPtr<nsIURI> baseURL;
GetBaseURI(getter_AddRefs(baseURL));

2
mozilla/layout/html/base/src/nsImageFrame.h
View File

@ -190,8 +190,6 @@ protected:
PRBool GetAnchorHREFAndTarget(nsString& aHref, nsString& aTarget);
PRIntn GetSuppress();
void MeasureString(const PRUnichar* aString,
PRInt32 aLength,
nscoord aMaxWidth,

46
mozilla/layout/html/base/src/nsImageMap.cpp
View File

@ -73,7 +73,7 @@ static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
class Area {
public:
Area(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
Area(nsIContent* aArea, PRBool aHasURL);
virtual ~Area();
virtual void ParseCoords(const nsString& aSpec);
@ -89,7 +89,6 @@ public:
void GetHREF(nsString& aHref) const;
void GetTarget(nsString& aTarget) const;
void GetAltText(nsString& aAltText) const;
PRBool GetSuppress() const { return mSuppressFeedback; }
PRBool GetHasURL() const { return mHasURL; }
void GetArea(nsIContent** aArea) const;
@ -100,16 +99,14 @@ public:
nsCOMPtr<nsIContent> mArea;
nscoord* mCoords;
PRInt32 mNumCoords;
PRPackedBool mSuppressFeedback;
PRPackedBool mHasURL;
PRPackedBool mHasFocus;
};
MOZ_DECL_CTOR_COUNTER(Area)
Area::Area(nsIContent* aArea,
PRBool aSuppress, PRBool aHasURL)
: mArea(aArea), mSuppressFeedback(aSuppress), mHasURL(aHasURL)
Area::Area(nsIContent* aArea, PRBool aHasURL)
: mArea(aArea), mHasURL(aHasURL)
{
MOZ_COUNT_CTOR(Area);
mCoords = nsnull;
@ -354,7 +351,7 @@ void Area::HasFocus(PRBool aHasFocus)
class DefaultArea : public Area {
public:
DefaultArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
DefaultArea(nsIContent* aArea, PRBool aHasURL);
~DefaultArea();
virtual PRBool IsInside(nscoord x, nscoord y);
@ -364,8 +361,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
DefaultArea::DefaultArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
DefaultArea::DefaultArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -395,7 +392,7 @@ void DefaultArea::GetShapeName(nsString& aResult) const
class RectArea : public Area {
public:
RectArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
RectArea(nsIContent* aArea, PRBool aHasURL);
~RectArea();
virtual void ParseCoords(const nsString& aSpec);
@ -406,8 +403,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
RectArea::RectArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
RectArea::RectArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -566,7 +563,7 @@ void RectArea::GetShapeName(nsString& aResult) const
class PolyArea : public Area {
public:
PolyArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
PolyArea(nsIContent* aArea, PRBool aHasURL);
~PolyArea();
virtual PRBool IsInside(nscoord x, nscoord y);
@ -576,8 +573,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
PolyArea::PolyArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
PolyArea::PolyArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -701,7 +698,7 @@ void PolyArea::GetShapeName(nsString& aResult) const
class CircleArea : public Area {
public:
CircleArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL);
CircleArea(nsIContent* aArea, PRBool aHasURL);
~CircleArea();
virtual PRBool IsInside(nscoord x, nscoord y);
@ -711,8 +708,8 @@ public:
virtual void GetShapeName(nsString& aResult) const;
};
CircleArea::CircleArea(nsIContent* aArea, PRBool aSuppress, PRBool aHasURL)
: Area(aArea, aSuppress, aHasURL)
CircleArea::CircleArea(nsIContent* aArea, PRBool aHasURL)
: Area(aArea, aHasURL)
{
}
@ -983,7 +980,6 @@ nsImageMap::AddArea(nsIContent* aArea)
aArea->GetAttr(kNameSpaceID_None, nsHTMLAtoms::shape, shape);
aArea->GetAttr(kNameSpaceID_None, nsHTMLAtoms::coords, coords);
PRBool hasURL = (PRBool)(NS_CONTENT_ATTR_HAS_VALUE != aArea->GetAttr(kNameSpaceID_None, nsHTMLAtoms::nohref, noHref));
PRBool suppress = PR_FALSE;/* XXX */
//Add focus listener to track area focus changes
nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(aArea));
@ -999,18 +995,18 @@ nsImageMap::AddArea(nsIContent* aArea)
if ((0 == shape.Length()) ||
shape.EqualsIgnoreCase("rect") ||
shape.EqualsIgnoreCase("rectangle")) {
area = new RectArea(aArea, suppress, hasURL);
area = new RectArea(aArea, hasURL);
}
else if (shape.EqualsIgnoreCase("poly") ||
shape.EqualsIgnoreCase("polygon")) {
area = new PolyArea(aArea, suppress, hasURL);
area = new PolyArea(aArea, hasURL);
}
else if (shape.EqualsIgnoreCase("circle") ||
shape.EqualsIgnoreCase("circ")) {
area = new CircleArea(aArea, suppress, hasURL);
area = new CircleArea(aArea, hasURL);
}
else if (shape.EqualsIgnoreCase("default")) {
area = new DefaultArea(aArea, suppress, hasURL);
area = new DefaultArea(aArea, hasURL);
}
else {
// Unknown area type; bail
@ -1028,8 +1024,7 @@ nsImageMap::IsInside(nscoord aX, nscoord aY,
nsIContent** aContent,
nsString& aAbsURL,
nsString& aTarget,
nsString& aAltText,
PRBool* aSuppress)
nsString& aAltText)
{
PRInt32 i, n = mAreas.Count();
for (i = 0; i < n; i++) {
@ -1074,7 +1069,6 @@ nsImageMap::IsInside(nscoord aX, nscoord aY,
}
area->GetAltText(aAltText);
*aSuppress = area->mSuppressFeedback;
area->GetArea(aContent);

11
mozilla/layout/html/base/src/nsImageMap.h
View File

@ -64,17 +64,16 @@ public:
/**
* See if the given aX,aY <b>pixel</b> coordinates are in the image
* map. If they are then NS_OK is returned and aAbsURL, aTarget,
* aAltText, aSuppress are filled in with the values from the
* underlying area tag. If the coordinates are not in the map
* then NS_NOT_INSIDE is returned.
* map. If they are then NS_OK is returned and aAbsURL, aTarget, and
* aAltText are filled in with the values from the underlying area
* element. If the coordinates are not in the map then NS_NOT_INSIDE
* is returned.
*/
PRBool IsInside(nscoord aX, nscoord aY,
nsIContent** aContent,
nsString& aAbsURL,
nsString& aTarget,
nsString& aAltText,
PRBool* aSuppress);
nsString& aAltText);
/**
* See if the given aX,aY <b>pixel</b> coordinates are in the image