[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 95f266629610a4dbb9be15fc3287b17c0cf180f2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 27 00:23:56 2004 +0000

    	Fixed build snafu.
    
            * 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@6694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 33ab11e..a36b00a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2004-05-26  Richard Williamson   <rjw at apple.com>
 
+	Fixed build snafu.
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::Context2DFunction::tryCall):
+        * khtml/ecma/kjs_html.h:
+        (KJS::Context2D::):
+        * khtml/ecma/kjs_html.lut.h:
+        (KJS::):
+
+2004-05-26  Richard Williamson   <rjw at apple.com>
+
 	Part 2 of the new <CANVAS> tag implementation.  This adds the 
 	basic machinery and draw operations for the <CANVAS> tag.  Pretty cool.  
 
@@ -19,6 +30,16 @@
 
         <canvas id="canvas1" width="400" height="400">
 
+Currently supported operations on the 2D context are:
+
+Save, Restore,
+Scale, Rotate, Translate,
+BeginPath, ClosePath,
+SetStrokeColor, SetFillColor, SetLineWidth, SetLineCap, SetLineJoin, SetMiterLimit,
+FillPath, StrokePath,
+MoveToPoint, AddLineToPoint, AddQuadraticCurveToPoint, AddBezierCurveToPoint,
+ClearRect
+
 	More to come.
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 104dfe4..06b6af3 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3592,6 +3592,7 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
                 exec->setException(err);
                 return err;
             }
+            // FIXME:  Implement
             renderer->setNeedsImageUpdate();
             break;
         }
@@ -3601,6 +3602,7 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
                 exec->setException(err);
                 return err;
             }
+            // FIXME:  Implement
             renderer->setNeedsImageUpdate();
             break;
         }
@@ -3633,7 +3635,7 @@ const ClassInfo KJS::Context2D::info = { "Context2D", 0, &Context2DTable, 0 };
   addQuadraticCurveToPoint Context2D::AddQuadraticCurveToPoint    DontDelete|Function 4
   addBezierCurveToPoint    Context2D::AddBezierCurveToPoint       DontDelete|Function 6
   clearRect                Context2D::ClearRect                   DontDelete|Function 4
-  drawImage                Context2D::DrawImge                    DontDelete|Function 6
+  drawImage                Context2D::DrawImage                    DontDelete|Function 6
   drawImageFromRect        Context2D::DrawImageFromRect           DontDelete|Function 10
 @end
 */
diff --git a/WebCore/khtml/ecma/kjs_html.h b/WebCore/khtml/ecma/kjs_html.h
index eb772de..8da4f4b 100644
--- a/WebCore/khtml/ecma/kjs_html.h
+++ b/WebCore/khtml/ecma/kjs_html.h
@@ -256,7 +256,7 @@ namespace KJS {
         FillPath, StrokePath, 
         MoveToPoint, AddLineToPoint, AddQuadraticCurveToPoint, AddBezierCurveToPoint,
         ClearRect,
-        drawImage, drawImageFromRect };
+        DrawImage, DrawImageFromRect };
 
     DOM::HTMLElementImpl *_element;
   };
diff --git a/WebCore/khtml/ecma/kjs_html.lut.h b/WebCore/khtml/ecma/kjs_html.lut.h
index cf4319c..b50f915 100644
--- a/WebCore/khtml/ecma/kjs_html.lut.h
+++ b/WebCore/khtml/ecma/kjs_html.lut.h
@@ -1050,7 +1050,7 @@ const struct HashEntry Context2DTableEntries[] = {
    { 0, 0, 0, 0, 0 },
    { "save", Context2D::Save, DontDelete|Function, 0, &Context2DTableEntries[21] },
    { "restore", Context2D::Restore, DontDelete|Function, 0, 0 },
-   { 0, 0, 0, 0, 0 },
+   { "drawImage", Context2D::DrawImage, DontDelete|Function, 6, 0 },
    { "translate", Context2D::Translate, DontDelete|Function, 1, &Context2DTableEntries[20] },
    { "rotate", Context2D::Rotate, DontDelete|Function, 2, &Context2DTableEntries[22] },
    { "setLineWidth", Context2D::SetLineWidth, DontDelete|Function, 1, &Context2DTableEntries[25] },
@@ -1059,16 +1059,17 @@ const struct HashEntry Context2DTableEntries[] = {
    { 0, 0, 0, 0, 0 },
    { "beginPath", Context2D::BeginPath, DontDelete|Function, 0, &Context2DTableEntries[23] },
    { "closePath", Context2D::ClosePath, DontDelete|Function, 0, 0 },
-   { "setStrokeColor", Context2D::SetStrokeColor, DontDelete|Function, 1, 0 },
+   { "setStrokeColor", Context2D::SetStrokeColor, DontDelete|Function, 1, &Context2DTableEntries[30] },
    { "setFillColor", Context2D::SetFillColor, DontDelete|Function, 1, 0 },
    { "setLineCap", Context2D::SetLineCap, DontDelete|Function, 1, &Context2DTableEntries[26] },
    { "setMiterLimit", Context2D::SetMiterLimit, DontDelete|Function, 1, &Context2DTableEntries[27] },
    { "fillPath", Context2D::FillPath, DontDelete|Function, 0, &Context2DTableEntries[28] },
    { "moveToPoint", Context2D::MoveToPoint, DontDelete|Function, 2, 0 },
    { "addBezierCurveToPoint", Context2D::AddBezierCurveToPoint, DontDelete|Function, 6, 0 },
-   { "clearRect", Context2D::ClearRect, DontDelete|Function, 4, 0 }
+   { "clearRect", Context2D::ClearRect, DontDelete|Function, 4, 0 },
+   { "drawImageFromRect", Context2D::DrawImageFromRect, DontDelete|Function, 10, 0 }
 };
 
-const struct HashTable Context2DTable = { 2, 30, Context2DTableEntries, 20 };
+const struct HashTable Context2DTable = { 2, 31, Context2DTableEntries, 20 };
 
 } // namespace

-- 
WebKit Debian packaging