[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
ouch
ouch at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:42:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4e9ca00d86b181b8f6d70d928652c95936f8a328
Author: ouch <ouch at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 28 18:33:39 2004 +0000
added addArc and clip path routines.
Reviewed by sullivan.
* khtml/ecma/kjs_html.cpp:
(KJS::Context2DFunction::tryCall):
* khtml/ecma/kjs_html.h:
(KJS::Context2D::):
* khtml/ecma/kjs_html.lut.h:
(KJS::):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6727 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a9190ba..bece94e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-05-28 John Louch <set EMAIL_ADDRESS environment variable>
+ added addArc and clip path routines.
+
+ Reviewed by sullivan.
+
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::Context2DFunction::tryCall):
+ * khtml/ecma/kjs_html.h:
+ (KJS::Context2D::):
+ * khtml/ecma/kjs_html.lut.h:
+ (KJS::):
+
2004-05-28 John Louch <ouch at apple.com>
Added addArcToPoint and addRect path routines.
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 1ea605c..2683703 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3585,7 +3585,21 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
float y2 = (float)args[3].toNumber(exec);
float r = (float)args[4].toNumber(exec);
CGContextAddArcToPoint (drawingContext, x1, y1, x2, y2, r);
- // ouch: messing with the pass should not cause an update
+ break;
+ }
+ case Context2D::AddArc: {
+ if (args.size() != 6) {
+ Object err = Error::create(exec,SyntaxError);
+ exec->setException(err);
+ return err;
+ }
+ float x = (float)args[0].toNumber(exec);
+ float y = (float)args[1].toNumber(exec);
+ float r = (float)args[2].toNumber(exec);
+ float sa = (float)args[3].toNumber(exec);
+ float ea = (float)args[4].toNumber(exec);
+ bool clockwise = args[5].toBoolean(exec);
+ CGContextAddArc (drawingContext, x, y, r, sa, ea, clockwise);
break;
}
case Context2D::AddRect: {
@@ -3601,6 +3615,16 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
CGContextAddRect (drawingContext, CGRectMake(x,y,w,h));
break;
}
+ case Context2D::Clip: {
+ if (args.size() != 0) {
+ Object err = Error::create(exec,SyntaxError);
+ exec->setException(err);
+ return err;
+ }
+ CGContextClip (drawingContext);
+ break;
+ }
+
case Context2D::ClearRect: {
if (args.size() != 4) {
Object err = Error::create(exec,SyntaxError);
@@ -3750,7 +3774,7 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
const ClassInfo KJS::Context2D::info = { "Context2D", 0, &Context2DTable, 0 };
/* Source for Context2DTable. Use "make hashtables" to regenerate.
- at begin Context2DTable 30
+ at begin Context2DTable 32
save Context2D::Save DontDelete|Function 0
restore Context2D::Restore DontDelete|Function 0
scale Context2D::Scale DontDelete|Function 2
@@ -3771,7 +3795,9 @@ const ClassInfo KJS::Context2D::info = { "Context2D", 0, &Context2DTable, 0 };
addQuadraticCurveToPoint Context2D::AddQuadraticCurveToPoint DontDelete|Function 4
addBezierCurveToPoint Context2D::AddBezierCurveToPoint DontDelete|Function 6
addArcToPoint Context2D::AddArcToPoint DontDelete|Function 5
+ addArc Context2D::AddArc DontDelete|Function 6
addRect Context2D::AddRect DontDelete|Function 4
+ clip Context2D::Clip DontDelete|Function 0
clearRect Context2D::ClearRect DontDelete|Function 4
fillRect Context2D::FillRect DontDelete|Function 4
strokeRect Context2D::StrokeRect DontDelete|Function 4
diff --git a/WebCore/khtml/ecma/kjs_html.h b/WebCore/khtml/ecma/kjs_html.h
index fefc2b9..f75ba9e 100644
--- a/WebCore/khtml/ecma/kjs_html.h
+++ b/WebCore/khtml/ecma/kjs_html.h
@@ -257,7 +257,7 @@ namespace KJS {
BeginPath, ClosePath,
SetStrokeColor, SetFillColor, SetLineWidth, SetLineCap, SetLineJoin, SetMiterLimit,
FillPath, StrokePath,
- MoveToPoint, AddLineToPoint, AddQuadraticCurveToPoint, AddBezierCurveToPoint, AddArcToPoint, AddRect,
+ MoveToPoint, AddLineToPoint, AddQuadraticCurveToPoint, AddBezierCurveToPoint, AddArcToPoint, AddArc, AddRect, Clip,
ClearRect, FillRect, StrokeRect,
DrawImage, DrawImageFromRect,
SetShadow, SetShadowWithColor, ClearShadow,
diff --git a/WebCore/khtml/ecma/kjs_html.lut.h b/WebCore/khtml/ecma/kjs_html.lut.h
index 5fb4e8e..4182f33 100644
--- a/WebCore/khtml/ecma/kjs_html.lut.h
+++ b/WebCore/khtml/ecma/kjs_html.lut.h
@@ -1038,48 +1038,52 @@ namespace KJS {
const struct HashEntry Context2DTableEntries[] = {
{ 0, 0, 0, 0, 0 },
- { "closePath", Context2D::ClosePath, DontDelete|Function, 0, 0 },
- { "addArcToPoint", Context2D::AddArcToPoint, DontDelete|Function, 5, 0 },
{ 0, 0, 0, 0, 0 },
- { "setFillColor", Context2D::SetFillColor, DontDelete|Function, 1, 0 },
- { "setStrokeColor", Context2D::SetStrokeColor, DontDelete|Function, 1, &Context2DTableEntries[37] },
- { "setLineWidth", Context2D::SetLineWidth, DontDelete|Function, 1, &Context2DTableEntries[33] },
{ 0, 0, 0, 0, 0 },
- { "setAlpha", Context2D::SetAlpha, DontDelete|Function, 1, 0 },
- { "setShadowWithColor", Context2D::SetShadowWithColor, DontDelete|Function, 4, 0 },
- { "scale", Context2D::Scale, DontDelete|Function, 2, &Context2DTableEntries[31] },
- { "save", Context2D::Save, DontDelete|Function, 0, &Context2DTableEntries[35] },
+ { "closePath", Context2D::ClosePath, DontDelete|Function, 0, &Context2DTableEntries[33] },
+ { "restore", Context2D::Restore, DontDelete|Function, 0, &Context2DTableEntries[36] },
+ { "strokePath", Context2D::StrokePath, DontDelete|Function, 0, 0 },
{ "strokeRect", Context2D::StrokeRect, DontDelete|Function, 4, 0 },
- { "drawImage", Context2D::DrawImage, DontDelete|Function, 6, 0 },
- { "translate", Context2D::Translate, DontDelete|Function, 1, &Context2DTableEntries[30] },
{ 0, 0, 0, 0, 0 },
- { "moveToPoint", Context2D::MoveToPoint, DontDelete|Function, 2, &Context2DTableEntries[40] },
- { "clearRect", Context2D::ClearRect, DontDelete|Function, 4, 0 },
+ { "scale", Context2D::Scale, DontDelete|Function, 2, &Context2DTableEntries[35] },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
+ { "setMiterLimit", Context2D::SetMiterLimit, DontDelete|Function, 1, &Context2DTableEntries[39] },
+ { "setShadowWithColor", Context2D::SetShadowWithColor, DontDelete|Function, 4, &Context2DTableEntries[43] },
+ { "translate", Context2D::Translate, DontDelete|Function, 1, 0 },
+ { "save", Context2D::Save, DontDelete|Function, 0, &Context2DTableEntries[32] },
{ 0, 0, 0, 0, 0 },
- { "restore", Context2D::Restore, DontDelete|Function, 0, 0 },
- { "clearShadow", Context2D::ClearShadow, DontDelete|Function, 0, 0 },
+ { "drawImage", Context2D::DrawImage, DontDelete|Function, 6, 0 },
+ { "beginPath", Context2D::BeginPath, DontDelete|Function, 0, &Context2DTableEntries[34] },
+ { "drawImageFromRect", Context2D::DrawImageFromRect, DontDelete|Function, 10, 0 },
+ { "setLineWidth", Context2D::SetLineWidth, DontDelete|Function, 1, &Context2DTableEntries[37] },
+ { "clearRect", Context2D::ClearRect, DontDelete|Function, 4, &Context2DTableEntries[41] },
+ { 0, 0, 0, 0, 0 },
+ { "addRect", Context2D::AddRect, DontDelete|Function, 4, 0 },
{ 0, 0, 0, 0, 0 },
- { "rotate", Context2D::Rotate, DontDelete|Function, 2, 0 },
- { "addLineToPoint", Context2D::AddLineToPoint, DontDelete|Function, 2, 0 },
{ "addQuadraticCurveToPoint", Context2D::AddQuadraticCurveToPoint, DontDelete|Function, 4, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "beginPath", Context2D::BeginPath, DontDelete|Function, 0, &Context2DTableEntries[32] },
- { "setLineCap", Context2D::SetLineCap, DontDelete|Function, 1, &Context2DTableEntries[34] },
- { "setLineJoin", Context2D::SetLineJoin, DontDelete|Function, 1, 0 },
- { "setMiterLimit", Context2D::SetMiterLimit, DontDelete|Function, 1, 0 },
- { "fillPath", Context2D::FillPath, DontDelete|Function, 0, &Context2DTableEntries[36] },
- { "strokePath", Context2D::StrokePath, DontDelete|Function, 0, &Context2DTableEntries[38] },
{ "addBezierCurveToPoint", Context2D::AddBezierCurveToPoint, DontDelete|Function, 6, 0 },
- { "addRect", Context2D::AddRect, DontDelete|Function, 4, &Context2DTableEntries[39] },
+ { 0, 0, 0, 0, 0 },
+ { "addLineToPoint", Context2D::AddLineToPoint, DontDelete|Function, 2, 0 },
+ { "addArc", Context2D::AddArc, DontDelete|Function, 6, 0 },
+ { "rotate", Context2D::Rotate, DontDelete|Function, 2, 0 },
+ { "setStrokeColor", Context2D::SetStrokeColor, DontDelete|Function, 1, 0 },
+ { "setFillColor", Context2D::SetFillColor, DontDelete|Function, 1, &Context2DTableEntries[42] },
+ { "setLineCap", Context2D::SetLineCap, DontDelete|Function, 1, &Context2DTableEntries[40] },
+ { "setLineJoin", Context2D::SetLineJoin, DontDelete|Function, 1, &Context2DTableEntries[38] },
+ { "fillPath", Context2D::FillPath, DontDelete|Function, 0, 0 },
+ { "moveToPoint", Context2D::MoveToPoint, DontDelete|Function, 2, 0 },
+ { "addArcToPoint", Context2D::AddArcToPoint, DontDelete|Function, 5, 0 },
+ { "clip", Context2D::Clip, DontDelete|Function, 0, 0 },
{ "fillRect", Context2D::FillRect, DontDelete|Function, 4, 0 },
- { "drawImageFromRect", Context2D::DrawImageFromRect, DontDelete|Function, 10, 0 },
- { "setShadow", Context2D::SetShadow, DontDelete|Function, 3, 0 }
+ { "setShadow", Context2D::SetShadow, DontDelete|Function, 3, &Context2DTableEntries[44] },
+ { "clearShadow", Context2D::ClearShadow, DontDelete|Function, 0, 0 },
+ { "setAlpha", Context2D::SetAlpha, DontDelete|Function, 1, 0 }
};
-const struct HashTable Context2DTable = { 2, 41, Context2DTableEntries, 30 };
+const struct HashTable Context2DTable = { 2, 45, Context2DTableEntries, 32 };
} // namespace
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list