From 84189c4dd8d3ae9c5dc102dabf2ef5106172d3b3 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 27 Nov 2018 15:57:54 -0500 Subject: [PATCH] Bug 1120371 - remove obsolete drawCustomFocusRing from Canvas2D. r=jrmuizel, r=bholley --- .../test/reftest/drawCustomFocusRing.html | 32 ------------------- dom/canvas/test/reftest/reftest.list | 1 - dom/canvas/test/test_canvas_focusring.html | 27 ---------------- dom/webidl/CanvasRenderingContext2D.webidl | 3 -- modules/libpref/init/all.js | 1 - 5 files changed, 64 deletions(-) delete mode 100644 dom/canvas/test/reftest/drawCustomFocusRing.html diff --git a/dom/canvas/test/reftest/drawCustomFocusRing.html b/dom/canvas/test/reftest/drawCustomFocusRing.html deleted file mode 100644 index acb18b083997..000000000000 --- a/dom/canvas/test/reftest/drawCustomFocusRing.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - diff --git a/dom/canvas/test/reftest/reftest.list b/dom/canvas/test/reftest/reftest.list index 272b0dae2ec5..f88cef600378 100644 --- a/dom/canvas/test/reftest/reftest.list +++ b/dom/canvas/test/reftest/reftest.list @@ -157,7 +157,6 @@ fuzzy-if(skiaContent,0-1,0-150) == clip-multiple-move-2.html clip-multiple-move- # focus rings pref(canvas.focusring.enabled,true) skip-if(cocoaWidget) skip-if(winWidget) fuzzy-if(skiaContent&&!cocoaWidget&&!winWidget,0-1,0-2) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded-ref.html -pref(canvas.customfocusring.enabled,true) skip-if(Android||cocoaWidget||winWidget) fuzzy-if(gtkWidget,0-64,0-410) needs-focus == drawCustomFocusRing.html drawCustomFocusRing-ref.html # Check that captureStream() displays in a local video element == capturestream.html wrapper.html?green.png diff --git a/dom/canvas/test/test_canvas_focusring.html b/dom/canvas/test/test_canvas_focusring.html index 9e2e832b3e9e..ef7cddd2e895 100644 --- a/dom/canvas/test/test_canvas_focusring.html +++ b/dom/canvas/test/test_canvas_focusring.html @@ -9,26 +9,6 @@ SimpleTest.waitForExplicitFinish(); const Cc = SpecialPowers.Cc; const Cr = SpecialPowers.Cr; SpecialPowers.setBoolPref("canvas.focusring.enabled", true); -SpecialPowers.setBoolPref("canvas.customfocusring.enabled", true); - - -

Canvas test: drawCustomFocusRing

-+ - - - -

Canvas test: drawFocusIfNeeded

@@ -78,12 +58,6 @@ function test_drawFocusIfNeeded_canvas() { function runTests() { try { - test_drawCustomFocusRing_canvas(); - } catch(e) { - throw e; - ok(false, "unexpected exception thrown in: test_drawCustomFocusRing_canvas"); - } - try { test_drawFocusIfNeeded_canvas(); } catch(e) { throw e; @@ -91,7 +65,6 @@ function runTests() { } SpecialPowers.setBoolPref("canvas.focusring.enabled", false); - SpecialPowers.setBoolPref("canvas.customfocusring.enabled", false); SimpleTest.finish(); } diff --git a/dom/webidl/CanvasRenderingContext2D.webidl b/dom/webidl/CanvasRenderingContext2D.webidl index 13f61d4fe240..e25671eb0e25 100644 --- a/dom/webidl/CanvasRenderingContext2D.webidl +++ b/dom/webidl/CanvasRenderingContext2D.webidl @@ -243,9 +243,6 @@ interface CanvasDrawPath { [NoInterfaceObject] interface CanvasUserInterface { [Pref="canvas.focusring.enabled", Throws] void drawFocusIfNeeded(Element element); -// NOT IMPLEMENTED void drawSystemFocusRing(Path path, HTMLElement element); - [Pref="canvas.customfocusring.enabled"] boolean drawCustomFocusRing(Element element); -// NOT IMPLEMENTED boolean drawCustomFocusRing(Path path, HTMLElement element); // NOT IMPLEMENTED void scrollPathIntoView(); // NOT IMPLEMENTED void scrollPathIntoView(Path path); }; diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 60dff41274c5..9c50101eeae4 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -990,7 +990,6 @@ pref("ui.scrollToClick", 0); // provide ability to turn on support for canvas focus rings pref("canvas.focusring.enabled", true); -pref("canvas.customfocusring.enabled", false); pref("canvas.hitregions.enabled", false); pref("canvas.filters.enabled", true); // Add support for canvas path objects