From 4ed50ec5021976350d0fe220410b48855af206f1 Mon Sep 17 00:00:00 2001 From: Adrian Wielgosik Date: Sun, 11 Feb 2018 11:45:10 +0100 Subject: [PATCH] Bug 1438024 - Remove nsIContainerBoxObject. r=bz MozReview-Commit-ID: ENLYcochOj3 --HG-- extra : rebase_source : 45b00b1ddc999fd808b24629025429c8037a1fbd --- layout/xul/moz.build | 1 - layout/xul/nsIContainerBoxObject.idl | 14 -------------- xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp | 3 --- 3 files changed, 18 deletions(-) delete mode 100644 layout/xul/nsIContainerBoxObject.idl diff --git a/layout/xul/moz.build b/layout/xul/moz.build index 78081306248d..b5d65e232eb7 100644 --- a/layout/xul/moz.build +++ b/layout/xul/moz.build @@ -17,7 +17,6 @@ if CONFIG['ENABLE_TESTS']: XPIDL_SOURCES += [ 'nsIBoxObject.idl', - 'nsIContainerBoxObject.idl', 'nsIListBoxObject.idl', 'nsIMenuBoxObject.idl', 'nsIScrollBoxObject.idl', diff --git a/layout/xul/nsIContainerBoxObject.idl b/layout/xul/nsIContainerBoxObject.idl deleted file mode 100644 index f2eab0fbdc11..000000000000 --- a/layout/xul/nsIContainerBoxObject.idl +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- Mode: C++; 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 "nsISupports.idl" - -// DEPRECATED: This file exists for shim purposes only, -// see ContainerBoxObject.webidl - -[uuid(35d4c04b-3bd3-4375-92e2-a818b4b4acb6)] -interface nsIContainerBoxObject : nsISupports -{ -}; diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp index e9815071df0f..9c7a960e7120 100644 --- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp @@ -7,7 +7,6 @@ #include "ShimInterfaceInfo.h" -#include "nsIContainerBoxObject.h" #include "nsIDOMCanvasRenderingContext2D.h" #include "nsIDOMCharacterData.h" #include "nsIDOMClientRect.h" @@ -72,7 +71,6 @@ #include "mozilla/dom/DOMRectListBinding.h" #include "mozilla/dom/ClipboardEventBinding.h" #include "mozilla/dom/CommentBinding.h" -#include "mozilla/dom/ContainerBoxObjectBinding.h" #include "mozilla/dom/CSSPrimitiveValueBinding.h" #include "mozilla/dom/CSSStyleDeclarationBinding.h" #include "mozilla/dom/CSSStyleSheetBinding.h" @@ -205,7 +203,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] = DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRectList, DOMRectList), DEFINE_SHIM(ClipboardEvent), DEFINE_SHIM(Comment), - DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIContainerBoxObject, ContainerBoxObject), DEFINE_SHIM(CustomEvent), #ifdef MOZ_WEBRTC DEFINE_SHIM(DataChannel),