Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 966591 - Part 2: Validate input to AddHitRegion. Provide partial implementation. r=roc

Browse Source
This commit is contained in:
Rik Cabanier 2014-02-21 08:35:36 -05:00
parent 9aab043303
commit f8dbda43c9
3 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
content/canvas/src/CanvasRenderingContext2D.cpp
View File

@ -2355,12 +2355,36 @@ CanvasRenderingContext2D::MeasureText(const nsAString& rawText,
return new TextMetrics(width);
}
void CanvasRenderingContext2D::AddHitRegion(const HitRegionOptions& )
{}
void
CanvasRenderingContext2D::AddHitRegion(const HitRegionOptions& options, ErrorResult& error)
{
// remove old hit region first
RemoveHitRegion(options.mId);
void CanvasRenderingContext2D::RemoveHitRegion(const nsAString&)
{}
// for now, we require a fallback element
if (options.mControl == NULL) {
error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return;
}
// check if the control is a descendant of our canvas
HTMLCanvasElement* canvas = GetCanvas();
if (!canvas || !nsContentUtils::ContentIsDescendantOf(options.mControl, canvas)) {
error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return;
}
// finally, add the region to the list if it has an ID
if (options.mId.Length() != 0) {
mHitRegionsOptions.PutEntry(options.mId)->mElement = options.mControl;
}
}
void
CanvasRenderingContext2D::RemoveHitRegion(const nsAString& id)
{
mHitRegionsOptions.RemoveEntry(id);
}
/**
* Used for nsBidiPresUtils::ProcessText

22
content/canvas/src/CanvasRenderingContext2D.h
View File

@ -186,7 +186,7 @@ public:
TextMetrics*
MeasureText(const nsAString& rawText, mozilla::ErrorResult& error);
void AddHitRegion(const HitRegionOptions& options);
void AddHitRegion(const HitRegionOptions& options, mozilla::ErrorResult& error);
void RemoveHitRegion(const nsAString& id);
void DrawImage(const HTMLImageOrCanvasOrVideoElement& image,
@ -684,6 +684,26 @@ protected:
uint32_t mInvalidateCount;
static const uint32_t kCanvasMaxInvalidateCount = 100;
/**
* State information for hit regions
*/
struct RegionInfo : public nsStringHashKey
{
RegionInfo(const nsAString& aKey) :
nsStringHashKey(&aKey)
{
}
RegionInfo(const nsAString *aKey) :
nsStringHashKey(aKey)
{
}
nsRefPtr<Element> mElement;
};
nsTHashtable<RegionInfo> mHitRegionsOptions;
/**
* Returns true if a shadow should be drawn along with a
* drawing operation.

2
dom/webidl/CanvasRenderingContext2D.webidl
View File

@ -116,7 +116,7 @@ interface CanvasRenderingContext2D {
void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, double sx, double sy, double sw, double sh, double dx, double dy, double dw, double dh);
// hit regions
[Pref="canvas.hitregions.enabled"] void addHitRegion(optional HitRegionOptions options);
[Pref="canvas.hitregions.enabled", Throws] void addHitRegion(optional HitRegionOptions options);
[Pref="canvas.hitregions.enabled"] void removeHitRegion(DOMString id);
// pixel manipulation