Bug 1427512 - Part 26: Remove nsIDOMCSSValueList. r=xidorn,bz
MozReview-Commit-ID: Fsclh2aHLy8
--- a/devtools/server/actors/object.js
+++ b/devtools/server/actors/object.js
@@ -1764,18 +1764,18 @@ DebuggerServer.ObjectActorPreviewers.Obj
function ArrayLike({obj, hooks}, grip, rawObj) {
if (isWorker || !rawObj ||
obj.class != "DOMStringList" &&
obj.class != "DOMTokenList" &&
obj.class != "CSSRuleList" &&
obj.class != "MediaList" &&
obj.class != "StyleSheetList" &&
+ obj.class != "CSSValueList" &&
!(rawObj instanceof Ci.nsIDOMMozNamedAttrMap ||
- rawObj instanceof Ci.nsIDOMCSSValueList ||
rawObj instanceof Ci.nsIDOMFileList ||
rawObj instanceof Ci.nsIDOMNodeList)) {
return false;
}
if (typeof rawObj.length != "number") {
return false;
}
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -6,13 +6,12 @@
with Files("**"):
BUG_COMPONENT = ("Core", "DOM: CSS Object Model")
XPIDL_SOURCES += [
'nsIDOMCSSPrimitiveValue.idl',
'nsIDOMCSSStyleDeclaration.idl',
'nsIDOMCSSValue.idl',
- 'nsIDOMCSSValueList.idl',
]
XPIDL_MODULE = 'dom_css'
deleted file mode 100644
--- a/dom/interfaces/css/nsIDOMCSSValueList.idl
+++ /dev/null
@@ -1,12 +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/. */
-
-#include "domstubs.idl"
-#include "nsIDOMCSSValue.idl"
-
-[uuid(92364ed1-e364-4175-bc52-c2fe9671cbc7)]
-interface nsIDOMCSSValueList : nsIDOMCSSValue
-{
-};
--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -38,17 +38,16 @@ support-files =
!/dom/tests/mochitest/geolocation/network_geolocation.sjs
[test_DOMWindowCreated.xul]
[test_DOM_element_instanceof.xul]
[test_activation.xul]
tags = fullscreen
[test_bug799299.xul]
[test_bug800817.xul]
-[test_bug830396.xul]
[test_bug830858.xul]
[test_bug1224790-1.xul]
tags = openwindow
# synthesizeNativeOSXClick does not work on 10.6
skip-if = os != 'mac' || os_version == '10.6'
[test_bug1224790-2.xul]
tags = openwindow
# synthesizeNativeOSXClick does not work on 10.6
deleted file mode 100644
--- a/dom/tests/mochitest/chrome/test_bug830396.xul
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
- type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=830396
--->
-<window title="Mozilla Bug 830396"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script type="application/javascript"
- src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-function runTests()
-{
- var doc = frames[0].document;
- var cs = doc.defaultView.getComputedStyle(doc.body);
- var nsIDOMCSSValueList = Components.interfaces.nsIDOMCSSValueList;
- ok(cs.getPropertyCSSValue("cursor") instanceof nsIDOMCSSValueList,
- "CSSValueList should be a nsIDOMCSSValueList");
- SimpleTest.finish();
-}
-]]>
-</script>
-<body onload="runTests();" xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=830396">Mozilla Bug 830396</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-<iframe type="content"></iframe>
-</body>
-
-
-</window>
--- a/layout/style/nsDOMCSSValueList.cpp
+++ b/layout/style/nsDOMCSSValueList.cpp
@@ -23,17 +23,16 @@ nsDOMCSSValueList::~nsDOMCSSValueList()
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCSSValueList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCSSValueList)
// QueryInterface implementation for nsDOMCSSValueList
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCSSValueList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRY(nsIDOMCSSValue)
- NS_INTERFACE_MAP_ENTRY(nsIDOMCSSValueList)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, CSSValue)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCSSValueList, mCSSValues)
JSObject*
nsDOMCSSValueList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
{
--- a/layout/style/nsDOMCSSValueList.h
+++ b/layout/style/nsDOMCSSValueList.h
@@ -4,22 +4,21 @@
* 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/. */
/* DOM object representing lists of values in DOM computed style */
#ifndef nsDOMCSSValueList_h___
#define nsDOMCSSValueList_h___
-#include "nsIDOMCSSValueList.h"
#include "CSSValue.h"
#include "nsTArray.h"
-class nsDOMCSSValueList final : public mozilla::dom::CSSValue,
- public nsIDOMCSSValueList
+class nsDOMCSSValueList final : public mozilla::dom::CSSValue
+ , public nsIDOMCSSValue
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsDOMCSSValueList, mozilla::dom::CSSValue)
// nsIDOMCSSValue
NS_DECL_NSIDOMCSSVALUE
--- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
@@ -17,17 +17,16 @@
#include "nsIDOMClientRect.h"
#include "nsIDOMClientRectList.h"
#include "nsIDOMClipboardEvent.h"
#include "nsIDOMCommandEvent.h"
#include "nsIDOMComment.h"
#include "nsIDOMCSSPrimitiveValue.h"
#include "nsIDOMCSSStyleDeclaration.h"
#include "nsIDOMCSSValue.h"
-#include "nsIDOMCSSValueList.h"
#include "nsIDOMCustomEvent.h"
#ifdef MOZ_WEBRTC
#include "nsIDOMDataChannel.h"
#endif
#include "nsIDOMDataTransfer.h"
#include "nsIDOMDOMCursor.h"
#include "nsIDOMDOMException.h"
#include "nsIDOMDOMRequest.h"
@@ -256,17 +255,16 @@ const ComponentsInterfaceShimEntry kComp
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRectList, DOMRectList),
DEFINE_SHIM(ClipboardEvent),
DEFINE_SHIM(CommandEvent),
DEFINE_SHIM(Comment),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIContainerBoxObject, ContainerBoxObject),
DEFINE_SHIM(CSSPrimitiveValue),
DEFINE_SHIM(CSSStyleDeclaration),
DEFINE_SHIM(CSSValue),
- DEFINE_SHIM(CSSValueList),
DEFINE_SHIM(CustomEvent),
#ifdef MOZ_WEBRTC
DEFINE_SHIM(DataChannel),
#endif
DEFINE_SHIM(DataTransfer),
DEFINE_SHIM(DOMCursor),
DEFINE_SHIM(DOMException),
DEFINE_SHIM(DOMRequest),
