From 0bfd5f515672ef652cd848813976ffe4657c79d5 Mon Sep 17 00:00:00 2001 From: "joshmoz%gmail.com" Date: Wed, 2 May 2007 07:46:50 +0000 Subject: [PATCH] Remove nsINativeScrollbar and nsNativeScrollbarFrame. patch by Colin Barrett. b=379319 r=enn sr=dbaron git-svn-id: svn://10.0.0.236/trunk@225436 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsGkAtomList.h | 1 - mozilla/layout/base/nsCSSFrameConstructor.cpp | 7 ------- mozilla/layout/xul/base/src/Makefile.in | 1 - mozilla/widget/public/Makefile.in | 1 - mozilla/widget/public/nsWidgetsCID.h | 4 ---- 5 files changed, 14 deletions(-) diff --git a/mozilla/content/base/src/nsGkAtomList.h b/mozilla/content/base/src/nsGkAtomList.h index eaeaca64158..82a3cd739d5 100755 --- a/mozilla/content/base/src/nsGkAtomList.h +++ b/mozilla/content/base/src/nsGkAtomList.h @@ -511,7 +511,6 @@ GK_ATOM(_namespace, "namespace") GK_ATOM(namespaceAlias, "namespace-alias") GK_ATOM(namespaceUri, "namespace-uri") GK_ATOM(NaN, "NaN") -GK_ATOM(nativescrollbar, "nativescrollbar") GK_ATOM(negate, "negate") GK_ATOM(never, "never") GK_ATOM(_new, "new") diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 1eb717e7598..7e9a0b2ce74 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -365,9 +365,6 @@ NS_NewScrollbarFrame (nsIPresShell* aPresShell, nsStyleContext* aContext); nsIFrame* NS_NewScrollbarButtonFrame (nsIPresShell* aPresShell, nsStyleContext* aContext); -nsIFrame* -NS_NewNativeScrollbarFrame (nsIPresShell* aPresShell, nsStyleContext* aContext); - #ifdef NOISY_FINDFRAME static PRInt32 FFWC_totalCount=0; @@ -3379,7 +3376,6 @@ IsSpecialContent(nsIContent* aContent, #endif aTag == nsGkAtoms::slider || aTag == nsGkAtoms::scrollbar || - aTag == nsGkAtoms::nativescrollbar || aTag == nsGkAtoms::scrollbarbutton || #ifdef MOZ_XUL aTag == nsGkAtoms::splitter || @@ -5869,9 +5865,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState, else if (aTag == nsGkAtoms::scrollbar) { newFrame = NS_NewScrollbarFrame(mPresShell, aStyleContext); } - else if (aTag == nsGkAtoms::nativescrollbar) { - newFrame = NS_NewNativeScrollbarFrame(mPresShell, aStyleContext); - } // End of SCROLLBAR CONSTRUCTION logic // SCROLLBUTTON CONSTRUCTION diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index b42d2a73f86..1882b27fddf 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -94,7 +94,6 @@ CPPSRCS = \ nsScrollbarButtonFrame.cpp \ nsButtonBoxFrame.cpp \ nsSliderFrame.cpp \ - nsNativeScrollbarFrame.cpp \ nsRepeatService.cpp \ nsXULTooltipListener.cpp \ $(NULL) diff --git a/mozilla/widget/public/Makefile.in b/mozilla/widget/public/Makefile.in index 96b35431607..d367c3bf439 100644 --- a/mozilla/widget/public/Makefile.in +++ b/mozilla/widget/public/Makefile.in @@ -103,7 +103,6 @@ XPIDLSRCS = \ nsIBaseWindow.idl \ nsIBidiKeyboard.idl \ nsIFullScreen.idl \ - nsINativeScrollbar.idl \ nsIScreen.idl \ nsIScreenManager.idl \ nsIPrintSession.idl \ diff --git a/mozilla/widget/public/nsWidgetsCID.h b/mozilla/widget/public/nsWidgetsCID.h index b4fa344d5b1..b4b462aaf4c 100644 --- a/mozilla/widget/public/nsWidgetsCID.h +++ b/mozilla/widget/public/nsWidgetsCID.h @@ -57,10 +57,6 @@ { 0xbd57cee8, 0x1dd1, 0x11b2, \ {0x9f, 0xe7, 0x95, 0xcf, 0x47, 0x09, 0xae, 0xa3} } -// {c2281100-3b4b-11d6-a384-f705fd0766fc} -#define NS_NATIVESCROLLBAR_CID \ -{ 0xc2281100, 0x3b4b, 0x11d6, { 0xa3, 0x84, 0xf7, 0x05, 0xfd, 0x07, 0x66, 0xfc } } - /* 2d96b3df-c051-11d1-a827-0040959a28c9 */ #define NS_APPSHELL_CID \ { 0x2d96b3df, 0xc051, 0x11d1, \