Diff
Modified: trunk/LayoutTests/ChangeLog (173651 => 173652)
--- trunk/LayoutTests/ChangeLog 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/LayoutTests/ChangeLog 2014-09-16 08:13:06 UTC (rev 173652)
@@ -1,3 +1,15 @@
+2014-09-16 Jinho Bang <[email protected]>
+
+ Add version of drawFocusIfNeeded that take a Path2D parameter.
+ https://bugs.webkit.org/show_bug.cgi?id=136846
+
+ Reviewed by Dirk Schulze.
+
+ * fast/canvas/draw-focus-if-needed-expected.txt: Added.
+ * fast/canvas/draw-focus-if-needed-with-path-expected.txt: Added.
+ * fast/canvas/draw-focus-if-needed-with-path.html: Added.
+ * fast/canvas/draw-focus-if-needed.html: Added.
+
2014-09-15 Roger Fong <[email protected]>
Unreviewed Windows gardening. fast/forms/label test expectations now match Mac platform's expectations.
Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt (0 => 173652)
--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt 2014-09-16 08:13:06 UTC (rev 173652)
@@ -0,0 +1,2 @@
+This test ensures that a focus ring is drawn.
+TEST PASSED
Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt (0 => 173652)
--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt 2014-09-16 08:13:06 UTC (rev 173652)
@@ -0,0 +1,2 @@
+This test ensures that a focus ring is drawn.
+TEST PASSED
Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html (0 => 173652)
--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html 2014-09-16 08:13:06 UTC (rev 173652)
@@ -0,0 +1,35 @@
+This test ensures that a focus ring is drawn.
+<canvas id="canvas" class="output" width="30" height="30">
+ <button id="button1"></button>
+</canvas>
+<div id="console"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var button1 = document.getElementById("button1");
+var canvas = document.getElementById("canvas").getContext("2d");
+var path = new Path2D();
+path.rect(10, 10, 10, 10);
+canvas.drawFocusIfNeeded(path, button1);
+var imagedata = canvas.getImageData(0, 0, 30, 30);
+var total = 0;
+for(var x = 0; x < 30 * 30 * 4; x++)
+ total += imagedata.data[x];
+
+if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+else
+{
+ button1.focus();
+ canvas.drawFocusIfNeeded(path, button1);
+ imagedata = canvas.getImageData(0, 0, 30, 30);
+ for(var x = 0; x < 30 * 30* 4; x++)
+ total += imagedata.data[x];
+
+ if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+ else
+ document.getElementById("console").innerHTML = "TEST FAILED";
+}
+</script>
Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html (0 => 173652)
--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html 2014-09-16 08:13:06 UTC (rev 173652)
@@ -0,0 +1,35 @@
+This test ensures that a focus ring is drawn.
+<canvas id="canvas" class="output" width="30" height="30">
+ <button id="button1"></button>
+</canvas>
+<div id="console"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var button1 = document.getElementById("button1");
+var canvas = document.getElementById("canvas").getContext("2d");
+canvas.beginPath();
+canvas.rect(10, 10, 10, 10);
+canvas.drawFocusIfNeeded(button1);
+var imagedata = canvas.getImageData(0, 0, 30, 30);
+var total = 0;
+for(var x = 0; x < 30 * 30 * 4; x++)
+ total += imagedata.data[x];
+
+if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+else
+{
+ button1.focus();
+ canvas.drawFocusIfNeeded(button1);
+ imagedata = canvas.getImageData(0, 0, 30, 30);
+ for(var x = 0; x < 30 * 30* 4; x++)
+ total += imagedata.data[x];
+
+ if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+ else
+ document.getElementById("console").innerHTML = "TEST FAILED";
+}
+</script>
Modified: trunk/Source/WebCore/ChangeLog (173651 => 173652)
--- trunk/Source/WebCore/ChangeLog 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/ChangeLog 2014-09-16 08:13:06 UTC (rev 173652)
@@ -1,3 +1,18 @@
+2014-09-16 Jinho Bang <[email protected]>
+
+ Add version of drawFocusIfNeeded that take a Path2D parameter.
+ https://bugs.webkit.org/show_bug.cgi?id=136846
+
+ Reviewed by Dirk Schulze.
+
+ Tests: fast/canvas/draw-focus-if-needed-with-path.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawFocusIfNeeded):
+ (WebCore::CanvasRenderingContext2D::drawFocusIfNeededInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+
2014-09-15 Iago Toral <[email protected]> and Zan Dobersek <[email protected]>
[GTK] Add WaylandDisplay
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (173651 => 173652)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-09-16 08:13:06 UTC (rev 173652)
@@ -1975,13 +1975,23 @@
void CanvasRenderingContext2D::drawFocusIfNeeded(Element* element)
{
+ drawFocusIfNeededInternal(m_path, element);
+}
+
+void CanvasRenderingContext2D::drawFocusIfNeeded(DOMPath* path, Element* element)
+{
+ drawFocusIfNeededInternal(path->path(), element);
+}
+
+void CanvasRenderingContext2D::drawFocusIfNeededInternal(const Path& path, Element* element)
+{
GraphicsContext* context = drawingContext();
- if (!element || !element->focused() || !state().m_hasInvertibleTransform || m_path.isEmpty()
+ if (!element || !element->focused() || !state().m_hasInvertibleTransform || path.isEmpty()
|| !element->isDescendantOf(canvas()) || !context)
return;
- context->drawFocusRing(m_path, 1, 1, RenderTheme::focusRingColor());
+ context->drawFocusRing(path, 1, 1, RenderTheme::focusRingColor());
}
void CanvasRenderingContext2D::putImageData(ImageData* data, ImageBuffer::CoordinateSystem coordinateSystem, float dx, float dy, float dirtyX, float dirtyY,
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (173651 => 173652)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-09-16 08:13:06 UTC (rev 173652)
@@ -198,6 +198,7 @@
void webkitPutImageDataHD(ImageData*, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight, ExceptionCode&);
void drawFocusIfNeeded(Element*);
+ void drawFocusIfNeeded(DOMPath*, Element*);
float webkitBackingStorePixelRatio() const { return 1; }
@@ -323,6 +324,8 @@
bool isPointInPathInternal(const Path&, float x, float y, const String& winding);
bool isPointInStrokeInternal(const Path&, float x, float y);
+ void drawFocusIfNeededInternal(const Path&, Element*);
+
void clearCanvas();
Path transformAreaToDevice(const Path&) const;
Path transformAreaToDevice(const FloatRect&) const;
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (173651 => 173652)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-09-16 08:13:06 UTC (rev 173652)
@@ -181,6 +181,7 @@
// Focus rings
void drawFocusIfNeeded(Element element);
+ void drawFocusIfNeeded(DOMPath path, Element element);
readonly attribute float webkitBackingStorePixelRatio;
