From a91ae0828a54dc05433207c14446cf28c8e3829d Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Fri, 19 Aug 2011 12:43:12 +1200 Subject: [PATCH] Bug 677173 - Remove 3D transform IDL properties until it is enabled by default. r=dbaron --- dom/interfaces/css/nsIDOMCSS2Properties.idl | 11 +---------- layout/style/nsCSSProps.cpp | 10 ++++++++++ layout/style/nsDOMCSSDeclaration.h | 7 +++++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl index d34a97920d4..ba030abb702 100644 --- a/dom/interfaces/css/nsIDOMCSS2Properties.idl +++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl @@ -51,7 +51,7 @@ * http://www.w3.org/TR/DOM-Level-2-Style */ -[builtinclass, scriptable, uuid(10f43750-b379-11e0-aff2-0800200c9a66)] +[builtinclass, scriptable, uuid(79b66107-f9d2-42ac-bc68-b558d79037ec)] interface nsIDOMCSS2Properties : nsISupports { attribute DOMString background; @@ -681,15 +681,6 @@ interface nsIDOMCSS2Properties : nsISupports attribute DOMString MozTransformOrigin; // raises(DOMException) on setting - attribute DOMString MozPerspective; - // raises(DOMException) on setting - - attribute DOMString MozPerspectiveOrigin; - // raises(DOMException) on setting - - attribute DOMString MozBackfaceVisibility; - // raises(DOMException) on setting - attribute DOMString MozWindowShadow; // raises(DOMException) on setting diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 2116bf2479a..8ace78bd5cc 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -351,6 +351,11 @@ nsCSSProps::LookupProperty(const nsACString& aProperty) } } } + + if (res == eCSSProperty_perspective || res == eCSSProperty_perspective_origin || res == eCSSProperty_backface_visibility) { + return eCSSProperty_UNKNOWN; + } + return res; } @@ -372,6 +377,11 @@ nsCSSProps::LookupProperty(const nsAString& aProperty) } } } + + if (res == eCSSProperty_perspective || res == eCSSProperty_perspective_origin || res == eCSSProperty_backface_visibility) { + return eCSSProperty_UNKNOWN; + } + return res; } diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h index 01af139cd35..3f71b2e128a 100644 --- a/layout/style/nsDOMCSSDeclaration.h +++ b/layout/style/nsDOMCSSDeclaration.h @@ -67,6 +67,13 @@ public: NS_DECL_NSICSSDECLARATION + NS_IMETHOD GetMozPerspective(nsAString_internal&); + NS_IMETHOD SetMozPerspective(const nsAString_internal&); + NS_IMETHOD GetMozPerspectiveOrigin(nsAString_internal&); + NS_IMETHOD SetMozPerspectiveOrigin(const nsAString_internal&); + NS_IMETHOD GetMozBackfaceVisibility(nsAString_internal&); + NS_IMETHOD SetMozBackfaceVisibility(const nsAString_internal&); + // Require subclasses to implement |GetParentRule|. //NS_DECL_NSIDOMCSSSTYLEDECLARATION NS_IMETHOD GetCssText(nsAString & aCssText);