diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp index 2db97dd6b2..eba7c5535c 100644 --- a/dom/canvas/ImageBitmap.cpp +++ b/dom/canvas/ImageBitmap.cpp @@ -1549,17 +1549,5 @@ ImageBitmap::WriteStructuredClone(JSStructuredCloneWriter* aWriter, return true; } -/*static*/ bool -ImageBitmap::ExtensionsEnabled(JSContext* aCx, JSObject*) -{ - if (NS_IsMainThread()) { - return Preferences::GetBool("canvas.imagebitmap_extensions.enabled"); - } else { - WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(aCx); - MOZ_ASSERT(workerPrivate); - return workerPrivate->ImageBitmapExtensionsEnabled(); - } -} - } // namespace dom } // namespace mozilla diff --git a/dom/canvas/ImageBitmap.h b/dom/canvas/ImageBitmap.h index 77fc9e1aa8..ac3377fb0c 100644 --- a/dom/canvas/ImageBitmap.h +++ b/dom/canvas/ImageBitmap.h @@ -142,9 +142,6 @@ public: nsTArray>& aClonedSurfaces, ImageBitmap* aImageBitmap); - // Mozilla Extensions - static bool ExtensionsEnabled(JSContext* aCx, JSObject* aObj); - friend CreateImageBitmapFromBlob; friend CreateImageBitmapFromBlobTask; friend CreateImageBitmapFromBlobWorkerTask; diff --git a/dom/workers/WorkerPrefs.h b/dom/workers/WorkerPrefs.h index 415435cf06..2fb0d36cfd 100644 --- a/dom/workers/WorkerPrefs.h +++ b/dom/workers/WorkerPrefs.h @@ -23,7 +23,6 @@ #if !(defined(DEBUG) || defined(MOZ_ENABLE_JS_DUMP)) WORKER_SIMPLE_PREF("browser.dom.window.dump.enabled", DumpEnabled, DUMP) #endif -WORKER_SIMPLE_PREF("canvas.imagebitmap_extensions.enabled", ImageBitmapExtensionsEnabled, IMAGEBITMAP_EXTENSIONS_ENABLED) WORKER_SIMPLE_PREF("dom.caches.enabled", DOMCachesEnabled, DOM_CACHES) WORKER_SIMPLE_PREF("dom.caches.testing.enabled", DOMCachesTestingEnabled, DOM_CACHES_TESTING) WORKER_SIMPLE_PREF("dom.performance.enable_user_timing_logging", PerformanceLoggingEnabled, PERFORMANCE_LOGGING_ENABLED) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index f1a7291861..0f6f3df80d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -852,9 +852,6 @@ pref("canvas.filters.enabled", true); pref("canvas.path.enabled", true); pref("canvas.capturestream.enabled", true); -// Disable the ImageBitmap-extensions for now. -pref("canvas.imagebitmap_extensions.enabled", false); - // We want the ability to forcibly disable platform a11y, because // some non-a11y-related components attempt to bring it up. See bug // 538530 for details about Windows; we have a pref here that allows it