diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h index 1c5c2ce9e79b..dee37680c515 100644 --- a/content/base/public/nsINode.h +++ b/content/base/public/nsINode.h @@ -65,8 +65,6 @@ inline bool IsSpaceCharacter(char aChar) { aChar == '\f'; } class Element; -struct BoxQuadOptions; -class DOMQuad; class EventHandlerNonNull; class OnErrorEventHandlerNonNull; template class Optional; @@ -280,10 +278,6 @@ private: class nsINode : public mozilla::dom::EventTarget { public: - typedef mozilla::dom::BoxQuadOptions BoxQuadOptions; - typedef mozilla::dom::DOMQuad DOMQuad; - typedef mozilla::ErrorResult ErrorResult; - NS_DECLARE_STATIC_IID_ACCESSOR(NS_INODE_IID) // Among the sub-classes that inherit (directly or indirectly) from nsINode, @@ -1615,10 +1609,6 @@ public: mozilla::dom::Element* GetFirstElementChild() const; mozilla::dom::Element* GetLastElementChild() const; - void GetBoxQuads(const BoxQuadOptions& aOptions, - nsTArray >& aResult, - mozilla::ErrorResult& aRv); - protected: // Override this function to create a custom slots class. diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp index 13b479b42699..fa014abe28e5 100644 --- a/content/base/src/nsINode.cpp +++ b/content/base/src/nsINode.cpp @@ -103,7 +103,6 @@ #include #include "nsGlobalWindow.h" #include "nsDOMMutationObserver.h" -#include "GeometryUtils.h" using namespace mozilla; using namespace mozilla::dom; @@ -1141,14 +1140,6 @@ nsINode::PreHandleEvent(EventChainPreVisitor& aVisitor) return NS_ERROR_NOT_IMPLEMENTED; } -void -nsINode::GetBoxQuads(const BoxQuadOptions& aOptions, - nsTArray >& aResult, - mozilla::ErrorResult& aRv) -{ - mozilla::GetBoxQuads(this, aOptions, aResult, aRv); -} - nsresult nsINode::DispatchEvent(nsIDOMEvent *aEvent, bool* aRetVal) { diff --git a/dom/webidl/GeometryUtils.webidl b/dom/webidl/GeometryUtils.webidl deleted file mode 100644 index d34a614af224..000000000000 --- a/dom/webidl/GeometryUtils.webidl +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * http://dev.w3.org/csswg/cssom-view/ - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -enum CSSBoxType { "margin", "border", "padding", "content" }; -dictionary BoxQuadOptions { - CSSBoxType box = "border"; - GeometryNode relativeTo; -}; - -dictionary ConvertCoordinateOptions { - CSSBoxType fromBox = "border"; - CSSBoxType toBox = "border"; -}; - -[NoInterfaceObject] -interface GeometryUtils { - [Throws, Pref="layout.css.getBoxQuads.enabled"] - sequence getBoxQuads(optional BoxQuadOptions options); -// DOMQuad convertQuadFromNode(DOMQuad quad, GeometryNode from, optional ConvertCoordinateOptions options); -// DOMQuad convertRectFromNode(DOMRectReadOnly rect, GeometryNode from, optional ConvertCoordinateOptions options); -// DOMPoint convertPointFromNode(DOMPointInit point, GeometryNode from, optional ConvertCoordinateOptions options); -}; - -Text implements GeometryUtils; -Element implements GeometryUtils; -// PseudoElement implements GeometryUtils; -Document implements GeometryUtils; - -typedef (Text or Element /* or PseudoElement */ or Document) GeometryNode; \ No newline at end of file diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 3f11227fdf42..6e68fbbaefeb 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -115,7 +115,6 @@ WEBIDL_FILES = [ 'Function.webidl', 'GainNode.webidl', 'Geolocation.webidl', - 'GeometryUtils.webidl', 'GetUserMediaRequest.webidl', 'History.webidl', 'HTMLAnchorElement.webidl', diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index ea4aa6cc8e11..218c49cf0caf 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -1808,13 +1808,6 @@ pref("layout.css.DOMPoint.enabled", true); // Is support for DOMQuad enabled? pref("layout.css.DOMQuad.enabled", true); -// Is support for GeometryUtils.getBoxQuads enabled? -#ifdef RELEASE_BUILD -pref("layout.css.getBoxQuads.enabled", false); -#else -pref("layout.css.getBoxQuads.enabled", true); -#endif - // Is support for CSS "text-align: true X" enabled? pref("layout.css.text-align-true-value.enabled", false);