Adding use counters for non-standard 2D canvas APIs

Source/core/html/canvas/CanvasRenderingContext2D.idl

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 77 matching lines @@
     boolean isPointInStroke(float x, float y);
     [RuntimeEnabled=Path2D, StrictTypeChecking] boolean isPointInStroke(Path2D path, float x, float y);
 
     [RuntimeEnabled=ExperimentalCanvasFeatures] void scrollPathIntoView();
     [RuntimeEnabled=ExperimentalCanvasFeatures, StrictTypeChecking] void scrollPathIntoView(Path2D path);
 
     // text
     attribute DOMString font;
     attribute DOMString textAlign;
     attribute DOMString textBaseline;
+    void fillText(DOMString text, float x, float y, optional float maxWidth);
+    void strokeText(DOMString text, float x, float y, optional float maxWidth);
 
     TextMetrics measureText(DOMString text);
 
     // Context state
     // Should be merged with WebGL counterpart in CanvasRenderingContext, once no-longer experimental
     [RuntimeEnabled=ExperimentalCanvasFeatures] boolean isContextLost();
 
-    // other
-
-    void setAlpha(float alpha);
-    void setCompositeOperation(DOMString compositeOperation);
-
-    void setLineWidth(float width);
-    void setLineCap(DOMString cap);
-    void setLineJoin(DOMString join);
-    void setMiterLimit(float limit);
-
-    void clearShadow();
-
-    void fillText(DOMString text, float x, float y, optional float maxWidth);
-    void strokeText(DOMString text, float x, float y, optional float maxWidth);
-
-    void setStrokeColor([StrictTypeChecking] DOMString color, optional float alpha);
-    void setStrokeColor(float grayLevel, optional float alpha);
-    void setStrokeColor(float r, float g, float b, float a);
-    void setStrokeColor(float c, float m, float y, float k, float a);
-
-    void setFillColor([StrictTypeChecking] DOMString color, optional float alpha);
-    void setFillColor(float grayLevel, optional float alpha);
-    void setFillColor(float r, float g, float b, float a);
-    void setFillColor(float c, float m, float y, float k, float a);
-
     void strokeRect(float x, float y, float width, float height);
 
     [RaisesException, StrictTypeChecking] void drawImage(HTMLImageElement image, float x, float y);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLImageElement image, float x, float y, float width, float height);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLImageElement image, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLCanvasElement canvas, float x, float y);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLCanvasElement canvas, float x, float y, float width, float height);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLCanvasElement canvas, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLVideoElement video, float x, float y);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLVideoElement video, float x, float y, float width, float height);
     [RaisesException, StrictTypeChecking] void drawImage(HTMLVideoElement video, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh);
     [RuntimeEnabled=ExperimentalCanvasFeatures, RaisesException, StrictTypeChecking] void drawImage(ImageBitmap imageBitmap, float x, float y);
     [RuntimeEnabled=ExperimentalCanvasFeatures, RaisesException, StrictTypeChecking] void drawImage(ImageBitmap imageBitmap, float x, float y, float width, float height);
     [RuntimeEnabled=ExperimentalCanvasFeatures, RaisesException, StrictTypeChecking] void drawImage(ImageBitmap imageBitmap, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh);
 
-    [StrictTypeChecking] void drawImageFromRect(HTMLImageElement? image,
-                                                optional float sx, optional float sy, optional float sw, optional float sh,
-                                                optional float dx, optional float dy, optional float dw, optional float dh,
-                                                optional DOMString compositeOperation);
-
-    void setShadow(float width, float height, float blur, [StrictTypeChecking] optional DOMString color, optional float alpha);
-    void setShadow(float width, float height, float blur, float grayLevel, optional float alpha);
-    void setShadow(float width, float height, float blur, float r, float g, float b, float a);
-    void setShadow(float width, float height, float blur, float c, float m, float y, float k, float a);
-
     [RaisesException, StrictTypeChecking] void putImageData(ImageData imagedata, float dx, float dy);
     [RaisesException, StrictTypeChecking] void putImageData(ImageData imagedata, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight);
 
     [RaisesException, StrictTypeChecking] CanvasPattern createPattern(HTMLCanvasElement canvas, [TreatNullAs=NullString] DOMString repetitionType);
     [RaisesException, StrictTypeChecking] CanvasPattern createPattern(HTMLImageElement image, [TreatNullAs=NullString] DOMString repetitionType);
     [RaisesException, StrictTypeChecking] CanvasPattern createPattern(HTMLVideoElement image, [TreatNullAs=NullString] DOMString repetitionType);
     [StrictTypeChecking] ImageData createImageData(ImageData imagedata);
     [RaisesException] ImageData createImageData(float sw, float sh);
 
     [Custom] attribute object strokeStyle;
     [Custom] attribute object fillStyle;
 
     // pixel manipulation
     [RaisesException] ImageData getImageData(float sx, float sy, float sw, float sh);
 
     // Focus rings
     [RuntimeEnabled=ExperimentalCanvasFeatures, StrictTypeChecking] void drawFocusIfNeeded(Element element);
     [RuntimeEnabled=ExperimentalCanvasFeatures, StrictTypeChecking] void drawFocusIfNeeded(Path2D path, Element element);
     [RuntimeEnabled=ExperimentalCanvasFeatures, StrictTypeChecking] boolean drawCustomFocusRing(Element element);
 
     [ImplementedAs=imageSmoothingEnabled, MeasureAs=PrefixedImageSmoothingEnabled] attribute boolean webkitImageSmoothingEnabled;
     [MeasureAs=UnprefixedImageSmoothingEnabled] attribute boolean imageSmoothingEnabled;
 
     Canvas2DContextAttributes getContextAttributes();
+
+    // Non-standard APIs. Candidates for deprecation
+    [MeasureAs=CanvasRenderingContext2DSetAlpha] void setAlpha(float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetCompositeOperation] void setCompositeOperation(DOMString compositeOperation);
+    [MeasureAs=CanvasRenderingContext2DSetLineWidth] void setLineWidth(float width);
+    [MeasureAs=CanvasRenderingContext2DSetLineCap] void setLineCap(DOMString cap);
+    [MeasureAs=CanvasRenderingContext2DSetLineJoin] void setLineJoin(DOMString join);
+    [MeasureAs=CanvasRenderingContext2DSetMiterLimit] void setMiterLimit(float limit);
+    [MeasureAs=CanvasRenderingContext2DClearShadow] void clearShadow();
+    [MeasureAs=CanvasRenderingContext2DSetStrokeColor] void setStrokeColor([StrictTypeChecking] DOMString color, optional float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetStrokeColor] void setStrokeColor(float grayLevel, optional float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetStrokeColor] void setStrokeColor(float r, float g, float b, float a);
+    [MeasureAs=CanvasRenderingContext2DSetStrokeColor] void setStrokeColor(float c, float m, float y, float k, float a);
+    [MeasureAs=CanvasRenderingContext2DSetFillColor] void setFillColor([StrictTypeChecking] DOMString color, optional float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetFillColor] void setFillColor(float grayLevel, optional float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetFillColor] void setFillColor(float r, float g, float b, float a);
+    [MeasureAs=CanvasRenderingContext2DSetFillColor] void setFillColor(float c, float m, float y, float k, float a);
+    [StrictTypeChecking, MeasureAs=CanvasRenderingContext2DDrawImageFromRect] void drawImageFromRect(
+        HTMLImageElement? image, optional float sx, optional float sy, optional float sw, optional float sh,
+        optional float dx, optional float dy, optional float dw, optional float dh, optional DOMString compositeOperation);
+    [MeasureAs=CanvasRenderingContext2DSetShadow] void setShadow(float width, float height, float blur, [StrictTypeChecking] optional DOMString color, optional float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetShadow] void setShadow(float width, float height, float blur, float grayLevel, optional float alpha);
+    [MeasureAs=CanvasRenderingContext2DSetShadow] void setShadow(float width, float height, float blur, float r, float g, float b, float a);
+    [MeasureAs=CanvasRenderingContext2DSetShadow] void setShadow(float width, float height, float blur, float c, float m, float y, float k, float a);
 };
 
 CanvasRenderingContext2D implements CanvasPathMethods;