This is a copy of regalloc_code2_BRANCH from Netscape's private repository,

as it existed in January of 1998.


git-svn-id: svn://10.0.0.236/branches/regalloc_code2_BRANCH@22571 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/accessible/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src build
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/build/Makefile.in

@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= accessibility
-LIBRARY_NAME	= accessibility
-SHORT_LIBNAME	= access
-IS_COMPONENT	= 1
-REQUIRES	= xpcom string dom
-
-CPPSRCS		= nsAccessibilityFactory.cpp
-
-LOCAL_INCLUDES	= -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libaccessibility_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libchrome_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		-lgkgfx \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/build/makefile.win

@@ -1,47 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=accessibility
-
-MAKE_OBJ_TYPE=DLL
-DLLNAME=accessibility
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsAccessibilityFactory.obj    \
-	$(NULL)
-
-LINCS = $(LINCS) -I..\src         # for implementation headers
-
-LLIBS=\
- $(DIST)\lib\xpcom.lib         \
- $(DIST)\lib\accessibility_s.lib      \
- $(DIST)\lib\timer_s.lib       \
- $(DIST)\lib\gkgfxwin.lib \
- $(LIBNSPR)  
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-

mozilla/accessible/build/nsAccessibilityFactory.cpp

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsCOMPtr.h"
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIAccessibilityService.h"
-#include "nscore.h"
-
-static NS_IMETHODIMP
-NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    nsresult rv;
-    NS_ASSERTION(aOuter == nsnull, "no aggregation");
-    nsIAccessibilityService* accessibility;
-    rv = NS_NewAccessibilityService(&accessibility);
-    if (NS_FAILED(rv)) {
-        NS_ERROR("Unable to construct chrome registry");
-        return rv;
-    }
-    rv = accessibility->QueryInterface(aIID, aResult);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to find correct interface");
-    NS_RELEASE(accessibility);
-    return rv;
-}
-
-// The list of components we register
-static nsModuleComponentInfo components[] = 
-{
-    { "AccessibilityService", 
-      NS_ACCESSIBILITY_SERVICE_CID,
-      "@mozilla.org/accessibilityService;1", 
-      NS_ConstructAccessibilityService
-    },
-};
-
-NS_IMPL_NSGETMODULE("nsAccessibilityModule", components);
-

mozilla/accessible/makefile.win

@@ -1,26 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..
-
-DIRS= public src build
-
-include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/MANIFEST

@@ -1,3 +0,0 @@
-nsIAccessibilityService.idl
-nsIAccessible.idl
-nsIMutableAccessible.idl

mozilla/accessible/public/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= accessibility
-XPIDL_MODULE= accessibility
-
-XPIDLSRCS	= \
-			nsIAccessibilityService.idl \
-			nsIAccessible.idl \
-			nsIMutableAccessible.idl \
-			nsIAccessibleEventReceiver.idl \
-			nsIAccessibleEventListener.idl \
-			$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/public/makefile.win

@@ -1,34 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=accessibility
-XPIDL_MODULE=accessibility
-
-XPIDLSRCS =               \
-  .\nsIAccessibilityService.idl \
-  .\nsIAccessible.idl \
-  .\nsIMutableAccessible.idl \
-  .\nsIAccessibleEventReceiver.idl \
-  .\nsIAccessibleEventListener.idl \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "domstubs.idl"
-#include "nsIMutableAccessible.idl"
-#include "nsIAtom.idl"
-
-[scriptable, uuid(68D9720A-0984-42b6-A3F5-8237ED925727)]
-interface nsIAccessibilityService : nsISupports
-{
-  nsIAccessible createRootAccessible(in nsISupports aPresShell, in nsISupports aFrame);
-  nsIMutableAccessible createMutableAccessible(in nsISupports aNode);
-  nsIAccessible createHTMLBlockAccessible(in nsIAccessible aAccessible, in nsIDOMNode aNode, in nsISupports aPresShell);
-  nsIAccessible createHTMLSelectAccessible(in nsIAtom aAccessible, in nsIDOMNode aNode, in nsISupports aPresShell);
-  nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLRadioButtonAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLTextAccessible(in nsISupports aFrame);
-};
-
-
-%{ C++
-
-// for component registration
-// {DE401C37-9A7F-4278-A6F8-3DE2833989EF}
-#define NS_ACCESSIBILITY_SERVICE_CID \
-{ 0xde401c37, 0x9a7f, 0x4278, { 0xa6, 0xf8, 0x3d, 0xe2, 0x83, 0x39, 0x89, 0xef } }
-
-extern nsresult
-NS_NewAccessibilityService(nsIAccessibilityService** aResult);
-%}

mozilla/accessible/public/nsIAccessible.idl

@@ -1,205 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric D Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(B26FBE47-9A5F-42a1-822B-082461AE4D6D)]
-interface nsIAccessible : nsISupports
-{
-  /* Can't use these javascript can't tell us if properties are undefined 
-     
-  readonly attribute nsIAccessible accParent;
-  readonly attribute nsIAccessible accNextSibling;
-  readonly attribute nsIAccessible accPreviousSibling;
-  readonly attribute nsIAccessible accFirstChild;
-  readonly attribute nsIAccessible accLastChild;
-  readonly attribute long accChildCount;
-
-  attribute wstring accName;
-  attribute wstring accValue;
-  readonly attribute wstring accDescription;
-  readonly attribute wstring accRole;
-  readonly attribute unsigned long accState;
-  readonly attribute wstring accHelp;
-  readonly attribute wstring accDefaultAction;
-  readonly attribute boolean accFocused;
-  */
-
-  nsIAccessible getAccParent();
-  nsIAccessible getAccNextSibling();
-  nsIAccessible getAccPreviousSibling();
-  nsIAccessible getAccFirstChild();
-  nsIAccessible getAccLastChild();
-
-  long getAccChildCount();
-  wstring getAccName();
-  wstring getAccValue();
-  void setAccName(in wstring name);
-  void setAccValue(in wstring value);
-
-  wstring getAccDescription();
-  wstring getAccRole();
-  unsigned long getAccState();
-  unsigned long getAccExtState();
-  wstring getAccDefaultAction();
-  wstring getAccHelp();
-  boolean getAccFocused();
-
-  nsIAccessible accGetAt(in long x, in long y);
-
-  nsIAccessible accNavigateRight();
-  nsIAccessible accNavigateLeft();
-  nsIAccessible accNavigateUp();
-  nsIAccessible accNavigateDown();
-
-  void accGetBounds(out long x, 
-                    out long y, 
-					out long width, 
-					out long height);
-
-  void accAddSelection();
-  void accRemoveSelection();
-  void accExtendSelection();
-  void accTakeSelection();
-  void accTakeFocus();
-  void accDoDefaultAction();
-
- // MSAA State flags - used for bitfield. More than 1 allowed.
-  const unsigned long  STATE_UNAVAILABLE        = 0x00000001;  // Disabled, maps to opposite of Java ENABLED, Gnome/ATK SENSITIVE?
-  const unsigned long  STATE_SELECTED           = 0x00000002;
-  const unsigned long  STATE_FOCUSED            = 0x00000004;
-  const unsigned long  STATE_PRESSED            = 0x00000008;
-  const unsigned long  STATE_CHECKED            = 0x00000010;
-  const unsigned long  STATE_MIXED              = 0x00000020; // 3-state checkbox or toolbar button
-  const unsigned long  STATE_READONLY           = 0x00000040; // Maps to opposite of Java/Gnome/ATK EDITABLE state
-  const unsigned long  STATE_HOTTRACKED         = 0x00000080;
-  const unsigned long  STATE_DEFAULT            = 0x00000100;
-  const unsigned long  STATE_EXPANDED           = 0x00000200;
-  const unsigned long  STATE_COLLAPSED          = 0x00000400;
-  const unsigned long  STATE_BUSY               = 0x00000800;
-  const unsigned long  STATE_FLOATING           = 0x00001000;  // Children "owned" not "contained" by parent
-  const unsigned long  STATE_MARQUEED           = 0x00002000;
-  const unsigned long  STATE_ANIMATED           = 0x00004000;
-  const unsigned long  STATE_INVISIBLE          = 0x00008000;
-  const unsigned long  STATE_OFFSCREEN          = 0x00010000;
-  const unsigned long  STATE_SIZEABLE           = 0x00020000;
-  const unsigned long  STATE_MOVEABLE           = 0x00040000;
-  const unsigned long  STATE_SELFVOICING        = 0x00080000;
-  const unsigned long  STATE_FOCUSABLE          = 0x00100000;
-  const unsigned long  STATE_SELECTABLE         = 0x00200000;
-  const unsigned long  STATE_LINKED             = 0x00400000;
-  const unsigned long  STATE_TRAVERSED          = 0x00800000;
-  const unsigned long  STATE_MULTISELECTABLE    = 0x01000000;  // Supports multiple selection
-  const unsigned long  STATE_EXTSELECTABLE      = 0x02000000;  // Supports extended selection
-  const unsigned long  STATE_ALERT_LOW          = 0x04000000;  // This information is of low priority
-  const unsigned long  STATE_ALERT_MEDIUM       = 0x08000000;  // This information is of medium priority
-  const unsigned long  STATE_ALERT_HIGH         = 0x10000000;  // This information is of high priority
-  const unsigned long  STATE_PROTECTED          = 0x20000000;  // Maps to Gnome's *Role* ATK_ROLE_PASSWD_TEXT, nothing for Java?
-  const unsigned long  STATE_HASPOPUP           = 0x40000000;  // New in MSAA 2.0
-
-// Extended state flags (for now non-MSAA, for Java and Gnome/ATK support)
-// This is only the states that there isn't already a mapping for in MSAA
-// See www.accessmozilla.org/article.php?sid=11 for information on the mappings between accessibility API states
-  const unsigned long  STATE_INVALID            = 0x00200000;  // No explanation given    
-  const unsigned long  STATE_ACTIVE             = 0x00400000;  // This window is currently the active window    
-  const unsigned long  STATE_EXPANDABLE         = 0x00800000;  // An item that can be expanded, such as a tree item with children    
-  const unsigned long  STATE_MODAL              = 0x01000000;  // Must do something with control before leaving it    
-  const unsigned long  STATE_MULTI_LINE         = 0x02000000;  // Edit control that can take multiple lines    
-  const unsigned long  STATE_SENSITIVE          = 0x04000000;  // No explanation given    
-  const unsigned long  STATE_RESIZABLE          = 0x08000000;  // Object can be resized    
-  const unsigned long  STATE_SHOWING            = 0x10000000;  // This object and all of it's ancestors are visible    
-  const unsigned long  STATE_SINGLE_LINE        = 0x20000000;  // This text object can only contain 1 line of text    
-  const unsigned long  STATE_TRANSIENT          = 0x40000000;  // Tells accessibility aid "Don't add event listener - this object doesn't generate any". For example, could be used with higher level containers.    
-  const unsigned long  STATE_VERTICAL           = 0x80000000;  // Especially used for sliders and scrollbars  
-
-
-/*
-// MSAA Roles - only one per nsIAccessible or IAccessible
-  const unsigned long  ROLE_TITLEBAR            = 0x00000001;
-  const unsigned long  ROLE_MENUBAR             = 0x00000002;
-  const unsigned long  ROLE_SCROLLBAR           = 0x00000003;
-  const unsigned long  ROLE_GRIP                = 0x00000004;
-  const unsigned long  ROLE_SOUND               = 0x00000005;
-  const unsigned long  ROLE_CURSOR              = 0x00000006;
-  const unsigned long  ROLE_CARET               = 0x00000007;
-  const unsigned long  ROLE_ALERT               = 0x00000008;
-  const unsigned long  ROLE_WINDOW              = 0x00000009;
-  const unsigned long  ROLE_CLIENT              = 0x0000000A;
-  const unsigned long  ROLE_MENUPOPUP           = 0x0000000B;
-  const unsigned long  ROLE_MENUITEM            = 0x0000000C;
-  const unsigned long  ROLE_TOOLTIP             = 0x0000000D;
-  const unsigned long  ROLE_APPLICATION         = 0x0000000E;
-  const unsigned long  ROLE_DOCUMENT            = 0x0000000F;
-  const unsigned long  ROLE_PANE                = 0x00000010;
-  const unsigned long  ROLE_CHART               = 0x00000011;
-  const unsigned long  ROLE_DIALOG              = 0x00000012;
-  const unsigned long  ROLE_BORDER              = 0x00000013;
-  const unsigned long  ROLE_GROUPING            = 0x00000014;
-  const unsigned long  ROLE_SEPARATOR           = 0x00000015;
-  const unsigned long  ROLE_TOOLBAR             = 0x00000016;
-  const unsigned long  ROLE_STATUSBAR           = 0x00000017;
-  const unsigned long  ROLE_TABLE               = 0x00000018;
-  const unsigned long  ROLE_COLUMNHEADER        = 0x00000019;
-  const unsigned long  ROLE_ROWHEADER           = 0x0000001A;
-  const unsigned long  ROLE_COLUMN              = 0x0000001B;
-  const unsigned long  ROLE_ROW                 = 0x0000001C;
-  const unsigned long  ROLE_CELL                = 0x0000001D;
-  const unsigned long  ROLE_LINK                = 0x0000001E;
-  const unsigned long  ROLE_HELPBALLOON         = 0x0000001F;
-  const unsigned long  ROLE_CHARACTER           = 0x00000020;
-  const unsigned long  ROLE_LIST                = 0x00000021;
-  const unsigned long  ROLE_LISTITEM            = 0x00000022;
-  const unsigned long  ROLE_OUTLINE             = 0x00000023;
-  const unsigned long  ROLE_OUTLINEITEM         = 0x00000024;
-  const unsigned long  ROLE_PAGETAB             = 0x00000025;
-  const unsigned long  ROLE_PROPERTYPAGE        = 0x00000026;
-  const unsigned long  ROLE_INDICATOR           = 0x00000027;
-  const unsigned long  ROLE_GRAPHIC             = 0x00000028;
-  const unsigned long  ROLE_STATICTEXT          = 0x00000029;
-  const unsigned long  ROLE_TEXT                = 0x0000002A;  // Editable, selectable, etc.
-  const unsigned long  ROLE_PUSHBUTTON          = 0x0000002B;
-  const unsigned long  ROLE_CHECKBUTTON         = 0x0000002C;
-  const unsigned long  ROLE_RADIOBUTTON         = 0x0000002D;
-  const unsigned long  ROLE_COMBOBOX            = 0x0000002E;
-  const unsigned long  ROLE_DROPLIST            = 0x0000002F;
-  const unsigned long  ROLE_PROGRESSBAR         = 0x00000030;
-  const unsigned long  ROLE_DIAL                = 0x00000031;
-  const unsigned long  ROLE_HOTKEYFIELD         = 0x00000032;
-  const unsigned long  ROLE_SLIDER              = 0x00000033;
-  const unsigned long  ROLE_SPINBUTTON          = 0x00000034;
-  const unsigned long  ROLE_DIAGRAM             = 0x00000035;
-  const unsigned long  ROLE_ANIMATION           = 0x00000036;
-  const unsigned long  ROLE_EQUATION            = 0x00000037;
-  const unsigned long  ROLE_BUTTONDROPDOWN      = 0x00000038;
-  const unsigned long  ROLE_BUTTONMENU          = 0x00000039;
-  const unsigned long  ROLE_BUTTONDROPDOWNGRID  = 0x0000003A;
-  const unsigned long  ROLE_WHITESPACE          = 0x0000003B;
-  const unsigned long  ROLE_PAGETABLIST         = 0x0000003C;
-  const unsigned long  ROLE_CLOCK               = 0x0000003D;
-  const unsigned long  ROLE_SPLITBUTTON         = 0x0000003E;   // New in MSAA 2.0 
-  const unsigned long  ROLE_IPADDRESS           = 0x0000003F;   // New in MSAA 2.0 
-
-  */
-
-};

mozilla/accessible/public/nsIAccessibleEventListener.idl

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric D Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIAccessible.idl"
-
-[scriptable, uuid(BEE49E7D-9D06-49bf-8984-1694C697D74F)]
-interface nsIAccessibleEventListener : nsISupports
-{
-  const unsigned long EVENT_FOCUS = 0x8005;
-
-  void handleEvent(in unsigned long aEvent, in nsIAccessible aTarget);
-};

mozilla/accessible/public/nsIAccessibleEventReceiver.idl

@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric D Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsIAccessibleEventListener.idl"
-
-[scriptable, uuid(AB331E47-4FAA-4a12-9480-9B480DD78B39)]
-interface nsIAccessibleEventReceiver : nsISupports
-{
-  void addAccessibleEventListener(in nsIAccessibleEventListener aListener);
-  void removeAccessibleEventListener(in nsIAccessibleEventListener aListener);
-};

mozilla/accessible/public/nsIMutableAccessible.idl

@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- * 
- * Contributor(s): pav
- */
-
-#include "nsIAccessible.idl"
-#include "nsIAtom.idl"
-
-[scriptable, uuid(AD3274E5-9DD1-4614-81C8-BFF992869CBE)]
-interface nsIMutableAccessible : nsIAccessible
-{
-  void SetNameAsNodeValue();
-  void SetName(in wstring aName);
-  void SetNameAsAttribute(in nsIAtom aAtom);
-  void SetRole(in wstring aRole);
-  void SetIsLeaf(in boolean aLeaf);
-};

mozilla/accessible/src/Makefile.in

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= accessibility
-LIBRARY_NAME	= accessibility_s
-REQUIRES	= xpcom string layout widget dom view locale gfx2
-
-CPPSRCS		= \
-		nsAccessible.cpp \
-		nsAccessibilityService.cpp \
-		nsMutableAccessible.cpp \
-		nsRootAccessible.cpp \
-		nsHTMLFormControlAccessible.cpp \
-		nsHTMLTextAccessible.cpp \
-		nsSelectAccessible.cpp \
-		nsGenericAccessible.cpp \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/src/base/nsAccessibilityService.cpp

@@ -1,252 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsIAccessibilityService.h"
-#include "nsAccessibilityService.h"
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsHTMLFormControlAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsSelectAccessible.h"
-#include "nsHTMLTextAccessible.h"
-
-//--------------------
-
-
-nsAccessibilityService::nsAccessibilityService()
-{
-	NS_INIT_REFCNT();
-}
-
-nsAccessibilityService::~nsAccessibilityService()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIAccessibilityService methods:
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsRootAccessible(wr,f);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateMutableAccessible(nsISupports* aNode, nsIMutableAccessible **_retval)
-{
-  *_retval = new nsMutableAccessible(aNode);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLBlockAccessible(nsIAccessible* aAccessible, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsHTMLBlockAccessible(aAccessible, n,wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLSelectAccessible(nsIAtom* aPopupAtom, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s)); 
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsSelectAccessible(aPopupAtom, nsnull, n, wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLCheckboxAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-
-  *_retval = new nsHTMLRadioButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLTextAccessible(shell, node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aNode)
-{
-  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
-  nsCOMPtr<nsIContent> content;
-  (*aRealFrame)->GetContent(getter_AddRefs(content));
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
-  *aNode = node;
-  NS_ADDREF(*aNode);
-
-  nsCOMPtr<nsIDocument> document;
-  content->GetDocument(*getter_AddRefs(document));
-
-#ifdef DEBUG
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-#endif
-
-  *aShell = document->GetShellAt(0);
-  NS_IF_ADDREF(*aShell);
-
-  return NS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-
-nsresult
-NS_NewAccessibilityService(nsIAccessibilityService** aResult)
-{
-    NS_PRECONDITION(aResult != nsnull, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    nsAccessibilityService* a = new nsAccessibilityService();
-    if (a == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(a);
-    *aResult = a;
-    return NS_OK;
-}
-

mozilla/accessible/src/base/nsAccessibilityService.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#ifndef __nsAccessibilityService_h__
-#define __nsAccessibilityService_h__
-
-#include "nsIAccessibilityService.h"
-class nsIFrame;
-class nsIPresShell;
-class nsIDOMNode;
-
-class nsAccessibilityService : public nsIAccessibilityService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBILITYSERVICE
-
-  // nsAccessibilityService methods:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
-public:
-
-private:
-  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aContent);
-
-};
-
-#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/base/nsAccessible.cpp

@@ -1,995 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIScrollableView.h"
-#include "nsRootAccessible.h"
-
-//#define DEBUG_LEAKS
-
-#ifdef DEBUG_LEAKS
-static gnsAccessibles = 0;
-#endif
-
-
-class nsFrameTreeWalker {
-public:
-  nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner);
-  nsIFrame* GetNextSibling(nsIFrame* aFrame);
-  nsIFrame* GetPreviousSibling(nsIFrame* aFrame);
-  nsIFrame* GetParent(nsIFrame* aFrame);
-  nsIFrame* GetFirstChild(nsIFrame* aFrame);
-  nsIFrame* GetLastChild(nsIFrame* aFrame);
-  nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
-  PRInt32 GetCount(nsIFrame* aFrame);
-
-  static PRBool ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext);
-  static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
-
-  nsCOMPtr<nsIPresContext> mPresContext;
-  nsCOMPtr<nsIAccessible> mAccessible;
-  nsCOMPtr<nsIContent> mContent;
-  nsAccessible* mOwner;
-};
-
-nsFrameTreeWalker::nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner)
-{
-  mPresContext = aPresContext;
-  mOwner = aOwner;
-}
-
-nsIFrame* nsFrameTreeWalker::GetParent(nsIFrame* aFrame)
-{
-  //printf("Get parent\n");
-
-  nsIFrame* parent = nsnull;
-  aFrame->GetParent(&parent);
-
-  // if no parent then we hit the root
-  // just return that top frame
-  if (!parent) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return aFrame;
-  }
-
-  GetAccessible(parent, mAccessible, mContent);
-  if (mAccessible)
-    return parent;
-  
-  return GetParent(parent);
-}
-
-nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
-{
-  //printf("Get next\n");
-
-  // get next sibling
-  nsIFrame* next = nsnull;
-  aFrame->GetNextSibling(&next);
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
-
-  
-  // skip any frames with the same content node
-  while(ShouldSkip(mPresContext, list, aFrame, next)) 
-    next->GetNextSibling(&next);
-  
-
-  // if failed
-  if (!next)
-  {
-    // if parent has content
-    nsIFrame* parent = nsnull;
-    aFrame->GetParent(&parent);
-    
-    // if no parent fail
-    if (!parent) {
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    }
-
-    // fail if we reach a parent that is accessible
-    GetAccessible(parent, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // fail
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    } else {
-      // next on parent
-      nsIFrame* n = GetNextSibling(parent);
-      if (ShouldSkip(mPresContext, list, aFrame, n))
-        return GetNextSibling(n);
-      else 
-        return n;
-    }
-  }
-
-  // if next has content
-  GetAccessible(next, mAccessible, mContent);
-  if (mAccessible)
-  {
-    // done
-    return next;
-  }
-
-  // if next doesn't have node
-
-  // call first on next
-  nsIFrame* first = GetFirstChild(next);
-
-  // if found
-  if (first) {
-    if (ShouldSkip(mPresContext, list, aFrame, first))
-      return GetNextSibling(first);
-    else 
-      return first;
-  }
-
-  // call next on next
-  nsIFrame* n =  GetNextSibling(next);
-  if (ShouldSkip(mPresContext, list, aFrame, next))
-    return GetNextSibling(n);
-  else 
-    return n;
-}
-
-nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
-{
-
-  //printf("Get first\n");
-
-  // get first child
-  nsIFrame* child = nsnull;
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
-  aFrame->FirstChild(mPresContext, list, &child);
-
-  while(child)
-  {
-    // if first has a content node
-    GetAccessible(child, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // done
-      return child;
-    } else {
-      // call first on child
-      nsIFrame* first = GetFirstChild(child);
-
-      // if succeeded
-      if (first)
-      {
-        // return child
-        return first;
-      }
-    }
-
-    // get next sibling
-    nsIFrame* next;
-    child->GetNextSibling(&next);
-
-    // skip children with duplicate content nodes
-    nsIAtom* list = nsnull;
-    mOwner->GetListAtomForFrame(child, list);
-
-    while(ShouldSkip(mPresContext, list, child, next)) 
-      next->GetNextSibling(&next);
-
-    child = next;
-  }
-
-  // fail
-  mAccessible = nsnull;
-  mContent = nsnull;
-  return nsnull;
-}
-
-nsIFrame* nsFrameTreeWalker::GetChildBefore(nsIFrame* aParent, nsIFrame* aChild)
-{
-  nsIFrame* child = GetFirstChild(aParent);
-
-  // if the child is not us
-  if (child == aChild) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return nsnull;
-  }
-
-  nsIFrame* prev = child;
-  nsCOMPtr<nsIContent> prevContent = mContent;
-  nsCOMPtr<nsIAccessible> prevAccessible = mAccessible;
-
-  while(child) 
-  {
-    child = GetNextSibling(child);
-
-    if (child == aChild)
-      break;
-
-    prev = child;
-    prevContent = mContent;
-    prevAccessible = mAccessible;
-  }
-
-  mAccessible = prevAccessible;
-  mContent = prevContent;
-  return prev;
-}
-
-nsIFrame* nsFrameTreeWalker::GetPreviousSibling(nsIFrame* aFrame)
-{
-  //printf("Get previous\n");
-
-  nsIFrame* parent = GetParent(aFrame);
-  
-  return GetChildBefore(parent, aFrame);
-}
-
-nsIFrame* nsFrameTreeWalker::GetLastChild(nsIFrame* aFrame)
-{
-  //printf("Get last\n");
-
-  return GetChildBefore(aFrame, nsnull);
-}
-
-PRInt32 nsFrameTreeWalker::GetCount(nsIFrame* aFrame)
-{
-
-  //printf("Get count\n");
-  nsIFrame* child = GetFirstChild(aFrame);
-
-  PRInt32 count = 0;
-  while(child) 
-  {
-    count++;
-    child = GetNextSibling(child);
-  }
-
-  return count;
-}
-
-void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent)
-{
-  aContent = nsnull;
-  aAccessible = nsnull;
-
-  aFrame->GetContent(getter_AddRefs(aContent));
-
-  if (!aContent)
-    return;
-
-  nsCOMPtr<nsIDocument> document;
-  aContent->GetDocument(*getter_AddRefs(document));
-  if (!document)
-    return;
-
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-  nsIPresShell* shell = document->GetShellAt(0);
-  nsIFrame* frame = nsnull;
-  shell->GetPrimaryFrameFor(aContent, &frame);
-
-  if (!frame)
-    return;
-
-  aAccessible = do_QueryInterface(aFrame);
-
-  if (!aAccessible)
-    aAccessible = do_QueryInterface(aContent);
-
- // if (aAccessible)
- //   printf("Found accessible!\n");
-}
-
-PRBool nsFrameTreeWalker::ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext)
-{
-  if (!aStart || !aNext)
-    return PR_FALSE;
-
-  // is content the same? If so skip it
-  nsCOMPtr<nsIContent> content1;
-  nsCOMPtr<nsIContent> content2;
-
-  aStart->GetContent(getter_AddRefs(content1));
-  aNext->GetContent(getter_AddRefs(content2));
-
-  if (content1 == content2 && content1 != nsnull) {
-    // does it have childen? It it does then don't skip it
-    nsIFrame* child = nsnull;
-    aNext->FirstChild(aContext, aList, &child);
-    if (child)
-      return PR_FALSE;
-
-    return PR_TRUE;
-  }
-  
-  return PR_FALSE;
-}
-
-/*
- * Class nsAccessible
- */
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsAccessible::nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-   NS_INIT_REFCNT();
-
-   // get frame and node
-   mContent = aContent;
-   mAccessible = aAccessible;
-   mPresShell = aShell;
-
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", ++gnsAccessibles);
-#endif
-
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsAccessible::~nsAccessible()
-{
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", --gnsAccessibles);
-#endif
-}
-
-//NS_IMPL_ISUPPORTS2(nsAccessible, nsIAccessible, nsIAccessibleWidgetAccess);
-NS_IMPL_ISUPPORTS1(nsAccessible, nsIAccessible);
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccParent(aAccParent);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-
-    // failed? Lets do some default behavior
-    walker.GetParent(GetFrame());
-
-    // if no content or accessible then we hit the root
-    if (!walker.mContent || !walker.mAccessible)
-    {
-      *aAccParent = new nsRootAccessible(mPresShell);
-      NS_ADDREF(*aAccParent);
-      return NS_OK;
-    }
-
-    *aAccParent = CreateNewParentAccessible(walker.mAccessible, walker.mContent, mPresShell);
-    NS_ADDREF(*aAccParent);
-    return NS_OK;
-  }
-
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-  /* readonly attribute nsIAccessible accNextSibling; */
-NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
-{ 
-  // delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccNextSibling(aAccNextSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this);
-
-    nsIFrame* next = walker.GetNextSibling(GetFrame());
-  
-    if (next && walker.mAccessible && walker.mContent) 
-    {
-      *aAccNextSibling = CreateNewNextAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccNextSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccNextSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accPreviousSibling; */
-NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) 
-{ 
-// delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccPreviousSibling(aAccPreviousSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
- 
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* prev = walker.GetPreviousSibling(GetFrame());
-
-    if (prev && walker.mAccessible && walker.mContent) 
-    {
-      *aAccPreviousSibling = CreateNewPreviousAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccPreviousSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccPreviousSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) 
-{ 
-    
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccFirstChild(aAccFirstChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* child = walker.GetFirstChild(GetFrame());
-
-    if (child && walker.mAccessible && walker.mContent) 
-    {
-      *aAccFirstChild = CreateNewFirstAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccFirstChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccFirstChild = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
-{  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccLastChild(aAccLastChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* last = walker.GetLastChild(GetFrame());
-
-    if (last && walker.mAccessible && walker.mContent) 
-    {
-      *aAccLastChild = CreateNewLastAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccLastChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccLastChild = nsnull;
-
-  return NS_OK;
-}
-
-/* readonly attribute long accChildCount; */
-NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
-{
-  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccChildCount(aAccChildCount);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-  
-
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    *aAccChildCount = walker.GetCount(GetFrame());
-  } else 
-    *aAccChildCount = 0;
-
-  return NS_OK;  
-}
-
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccName(aAccName);
-    if (NS_SUCCEEDED(rv) && *aAccName != nsnull)
-      return rv;
-  }
-
-  *aAccName = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccDefaultAction(PRUnichar * *aDefaultAction) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDefaultAction(aDefaultAction);
-    if (NS_SUCCEEDED(rv) && *aDefaultAction != nsnull)
-      return rv;
-  }
-
-  *aDefaultAction = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccName(const PRUnichar * aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->SetAccName(aAccName);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* attribute wstring accValue; */
-NS_IMETHODIMP nsAccessible::GetAccValue(PRUnichar * *aAccValue) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccValue(aAccValue);
-
-    if (NS_SUCCEEDED(rv) && *aAccValue != nsnull)
-      return rv;
-  }
-
-  *aAccValue = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccValue(const PRUnichar * aAccValue) { return NS_ERROR_NOT_IMPLEMENTED;  }
-
-  /* readonly attribute wstring accDescription; */
-NS_IMETHODIMP nsAccessible::GetAccDescription(PRUnichar * *aAccDescription) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDescription(aAccDescription);
-    if (NS_SUCCEEDED(rv) && *aAccDescription != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccRole(aAccRole);
-    if (NS_SUCCEEDED(rv) && *aAccRole != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accState; */
-NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccState(aAccState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *aAccExtState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccExtState(aAccExtState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accHelp; */
-NS_IMETHODIMP nsAccessible::GetAccHelp(PRUnichar * *aAccHelp) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccHelp(aAccHelp);
-    if (NS_SUCCEEDED(rv) && *aAccHelp != nsnull)
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute boolean accFocused; */
-NS_IMETHODIMP nsAccessible::GetAccFocused(PRBool *aAccFocused) { return NS_OK;  }
-
-  /* nsIAccessible accGetChildAt (in long x, in long y); */
-NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        *_retval = child;
-        NS_ADDREF(*_retval);
-        return NS_OK;
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-  /* void accNavigateRight (); */
-NS_IMETHODIMP nsAccessible::AccNavigateRight(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateLeft (); */
-NS_IMETHODIMP nsAccessible::AccNavigateLeft(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateUp (); */
-
-NS_IMETHODIMP nsAccessible::AccNavigateUp(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateDown (); */
-NS_IMETHODIMP nsAccessible::AccNavigateDown(nsIAccessible **_retval) { return NS_OK;  }
-
-
-  /* void addSelection (); */
-NS_IMETHODIMP nsAccessible::AccAddSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccAddSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void removeSelection (); */
-NS_IMETHODIMP nsAccessible::AccRemoveSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccRemoveSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void extendSelection (); */
-NS_IMETHODIMP nsAccessible::AccExtendSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccExtendSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeSelection (); */
-NS_IMETHODIMP nsAccessible::AccTakeSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeFocus (); */
-NS_IMETHODIMP nsAccessible::AccTakeFocus(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeFocus();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void doDefaultAction (); */
-NS_IMETHODIMP nsAccessible::AccDoDefaultAction(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccDoDefaultAction();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  nsIFrame* frame = GetBoundsFrame();
-
-  if (!frame || !context)
-  {
-    *x = *y = *width = *height = 0;
-    return NS_OK;
-  }
-
-   // sum up all rects of frames with the same content node
-  nsRect r;
-  nsIFrame* start = frame;
-  nsIFrame* next = nsnull;
-  start->GetNextSibling(&next);
-
-  start->GetRect(r);
-  
-  while (nsFrameTreeWalker::ShouldSkip(context,nsnull, start, next))
-  {
-    nsRect r2;
-    next->GetRect(r2);
-    r.UnionRect(r,r2);
-    next->GetNextSibling(&next);
-  }
-
-  nsPoint offset(r.x,r.y);
-
-  frame->GetParent(&frame);
-
-  nsPoint pos(0,0);
-  while(frame) {
-    nsIScrollableView* scrollingView;
-    nsIView*           view;
-    // XXX hack
-    frame->GetView(context, &view);
-    if (view) {
-     nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
-     if (NS_SUCCEEDED(result)) {
-         nscoord xoff = 0;
-         nscoord yoff = 0;
-         scrollingView->GetScrollPosition(xoff, yoff);
-         offset.x -= xoff;
-         offset.y -= yoff;
-     }
-    }
-
-    frame->GetOrigin(pos);
-    offset += pos;
-    frame->GetParent(&frame);
-  }
-
-  float t2p;
-  context->GetTwipsToPixels(&t2p);
-
-  *x = (PRInt32)(offset.x*t2p);
-  *y = (PRInt32)(offset.y*t2p);
-  *width = (PRInt32)(r.width*t2p);
-  *height = (PRInt32)(r.height*t2p);
-
-  return NS_OK;
-}
-
-// helpers
-
-nsIFrame* nsAccessible::GetBoundsFrame()
-{
-   return GetFrame();
-}
-
-nsIFrame* nsAccessible::GetFrame()
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   return frame;
-}
-
-void nsAccessible::GetPresContext(nsCOMPtr<nsIPresContext>& aContext)
-{
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-
-  if (shell) {
-    shell->GetPresContext(getter_AddRefs(aContext));
-  } else
-    aContext = nsnull;
-}
-
-nsIAccessible* nsAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsAccessible(aAccessible, aContent, aShell);
-}
-
-
-// ------- nsHTMLBlockAccessible ------
-
-nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):nsAccessible(aAccessible, aContent, aShell)
-{
-
-}
-
-nsIAccessible* nsHTMLBlockAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsHTMLBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> smallestChild;
-    PRInt32 smallestArea = -1;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      // ok if there are multiple frames the contain the point 
-      // and they overlap then pick the smallest. We need to do this
-      // for text frames.
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        if (smallestArea == -1 || cw*ch < smallestArea) {
-          smallestArea = cw*ch;
-          smallestChild = child;
-        }
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-    if (smallestChild != nsnull)
-    {
-      *_retval = smallestChild;
-      NS_ADDREF(*_retval);
-      return NS_OK;
-    }
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-
-
-
-

mozilla/accessible/src/base/nsAccessible.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsAccessible_H_
-#define _nsAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsWeakReference.h"
-
-class nsIFrame;
-
-class nsAccessible : public nsIAccessible
-//                     public nsIAccessibleWidgetAccess
-{
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBLE
-
-  //NS_IMETHOD AccGetWidget(nsIWidget**);
-
-	public:
-		nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-		virtual ~nsAccessible();
-
-    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIFrame* GetBoundsFrame();
-  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIContent> mContent;
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIAccessible> mAccessible;
-};
-
-/* Special Accessible that knows how to handle hit detection for flowing text */
-class nsHTMLBlockAccessible : public nsAccessible
-{
-public:
-   nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-protected:
-   virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aFrame, nsIWeakReference* aShell);
-};
-
-#endif  

mozilla/accessible/src/base/nsGenericAccessible.cpp

@@ -1,335 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsIEventStateManager.h"
-#include "nsIFrame.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
-
-nsGenericAccessible::nsGenericAccessible()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-nsGenericAccessible::~nsGenericAccessible()
-{
-  /* destructor code */
-}
-
-/* nsIAccessible getAccParent (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const PRUnichar *name)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccValue (in wstring value); */
-NS_IMETHODIMP nsGenericAccessible::SetAccValue(const PRUnichar *value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean getAccFocused (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFocused(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateRight (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateLeft (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateUp (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateDown (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accAddSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accExtendSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::AccDoDefaultAction()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccExtState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//-------------
-// nsDOMAccessible
-//-------------
-
-nsDOMAccessible::nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode)
-{
-  mPresShell = getter_AddRefs(NS_GetWeakReference(aShell));
-  mNode = aNode;
-}
-
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccRemoveSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    rv = selection->Collapse(parent, 0);
-    if (NS_FAILED(rv))
-      return rv;
-
-    return NS_OK;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    PRInt32 offsetInParent = 0;
-    nsCOMPtr<nsIDOMNode> child;
-    rv = parent->GetFirstChild(getter_AddRefs(child));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> next; 
-
-    while(child)
-    {
-      if (child == mNode) {
-        // Collapse selection to just before desired element,
-        rv = selection->Collapse(parent, offsetInParent);
-        if (NS_FAILED(rv))
-          return rv;
-
-        // then extend it to just after
-        rv = selection->Extend(parent, offsetInParent+1);
-        return rv;
-      }
-
-       child->GetNextSibling(getter_AddRefs(next));
-       child = next;
-       offsetInParent++;
-    }
-
-    // didn't find a child
-    return NS_ERROR_FAILURE;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeFocus()
-{ 
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-  nsCOMPtr<nsIPresContext> context;
-  shell->GetPresContext(getter_AddRefs(context));
-  nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
-  content->SetFocus(context);
-  
-  return NS_OK;
-}
-
-//-------------
-// nsLeafFrameAccessible
-//-------------
-
-nsLeafDOMAccessible::nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsDOMAccessible(aShell, aNode)
-{
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-

mozilla/accessible/src/base/nsGenericAccessible.h

@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsGenericAccessible_H_
-#define _nsGenericAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-
-class nsIWeakReference;
-
-/**
- * Basic implementation
- * supports nothing
- */
-class nsGenericAccessible : public nsIAccessible
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-
-	public:
-    nsGenericAccessible();
-    virtual ~nsGenericAccessible();
-};
-
-/**
- * And accessible that observes a dom node
- * supports:
- * - selection
- * - focus
- */
-class nsDOMAccessible : public nsGenericAccessible
-{
-  public:
-    nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD AccTakeSelection(void); 
-    NS_IMETHOD AccTakeFocus(void); 
-    NS_IMETHOD AccRemoveSelection(void);
-
-  protected:
-    nsIWeakReference* mPresShell;
-    nsCOMPtr<nsIDOMNode> mNode;
-};
-
-/* Leaf version of DOM Accessible
- * has no children
- */
-class nsLeafDOMAccessible : public nsDOMAccessible
-{
-  public:
-    nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/base/nsRootAccessible.cpp

@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsRootAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessibleEventReceiver)
-NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
-
-NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
-NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame):nsAccessible(nsnull,nsnull,aShell)
-{
- // mFrame = aFrame;
- mListener = nsnull;
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsRootAccessible::~nsRootAccessible()
-{
-  RemoveAccessibleEventListener(mListener);
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsRootAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  *aAccName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document"));
-  return NS_OK;  
-}
-
-// helpers
-nsIFrame* nsRootAccessible::GetFrame()
-{
-  //if (!mFrame) {
-    nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-    nsIFrame* root = nsnull;
-    if (shell) 
-      shell->GetRootFrame(&root);
-  
-    return root;
-  //}
- 
- // return mFrame;
-}
-
-nsIAccessible* nsRootAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  *aAccRole = ToNewUnicode(NS_LITERAL_STRING("client"));
-  return NS_OK;  
-}
-
-/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (!mListener)
-  {
-     // add an event listener to the document
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> receiver;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(receiver))) && receiver)
-     {
-        nsresult rv = receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  // create a weak reference to the listener
-  mListener =  aListener;
-
-  return NS_OK;
-}
-
-/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (mListener)
-  {
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     if (!shell)
-       return NS_OK;
-
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> erP;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
-     {
-        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  mListener = nsnull;
-
-  return NS_OK;
-}
-
-
-nsresult nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
-{
-  if (mListener) {
-     nsCOMPtr<nsIDOMEventTarget> t;
-     aEvent->GetOriginalTarget(getter_AddRefs(t));
-  
-     // create and accessible for the target
-     nsCOMPtr<nsIContent> content = do_QueryInterface(t); 
-
-     if (!content)
-       return NS_OK;
-
-     if (mCurrentFocus == content)
-       return NS_OK;
-
-     mCurrentFocus = content;
-
-     nsIFrame* frame = nsnull;
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     shell->GetPrimaryFrameFor(content, &frame);
-
-     if (!frame)
-       return NS_OK;
-
-     nsCOMPtr<nsIAccessible> a = do_QueryInterface(frame);
-
-     if (!a)
-       a = do_QueryInterface(content);
-
-     nsCOMPtr<nsIAccessible> na = CreateNewAccessible(a, content, mPresShell);
-
-     mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, na);
-  }
-
-  return NS_OK;
-}
-
-nsresult nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK; 
-}
-
-nsresult nsRootAccessible::Blur(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK;
-}
-
-
-

mozilla/accessible/src/base/nsRootAccessible.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsRootAccessible_H_
-#define _nsRootAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIAccessibleEventReceiver.h"
-#include "nsIAccessibleEventListener.h"
-#include "nsIDOMFocusListener.h"
-
-class nsRootAccessible : public nsAccessible,
-                         public nsIAccessibleEventReceiver,
-                         public nsIDOMFocusListener
-
-{
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame = nsnull);
-    virtual ~nsRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(PRUnichar * *aAccName);
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-    NS_IMETHOD GetAccRole(PRUnichar * *aAccRole);
-
-    // ----- nsIAccessibleEventReceiver ------
-
-    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
-
-    // ----- nsIDOMEventListener --------
-    virtual nsresult HandleEvent(nsIDOMEvent* anEvent);
-    virtual nsresult Focus(nsIDOMEvent* aEvent);
-    virtual nsresult Blur(nsIDOMEvent* aEvent);
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  // not a com pointer. We don't own the listener
-  // it is the callers responsibility to remove the listener
-  // otherwise we will get into circular referencing problems
-  nsIAccessibleEventListener* mListener;
-  nsCOMPtr<nsIContent> mCurrentFocus;
-};
-
-
-#endif  

mozilla/accessible/src/base/nsSelectAccessible.cpp

@@ -1,717 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsSelectAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsIDOMMenuListener.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-class nsSelectChildAccessible : public nsAccessible,
-                                public nsIDOMMenuListener
-{
-public:
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectChildAccessible();
-
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  nsresult HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectChildAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectWindowAccessible : public nsAccessible,
-                                 public nsIDOMMenuListener
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectWindowAccessible();
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccExtState(PRUint32 *_retval);
-  
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  nsresult HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  // helpers
-  virtual nsIFrame* GetBoundsFrame();
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAccessible> mPrev;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectWindowAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectListAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-class nsListChildAccessible : public nsAccessible
-{
-public:
-  
-  nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsListChildAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-};
-
-//---------
- 
-nsSelectAccessible::nsSelectAccessible(nsIAtom* aPopupAtom, 
-                                       nsIAccessible* aAccessible, 
-                                       nsIContent* aContent, 
-                                       nsIWeakReference* aShell)
-                                               :nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccValue(PRUnichar **_retval)
-{
-  // our value is our first child's value. Which is the combo boxes text.
-  nsCOMPtr<nsIAccessible> text;
-  nsresult rv = GetAccFirstChild(getter_AddRefs(text));
-
-  if (NS_FAILED(rv)) {
-     *_retval = nsnull;
-     return rv;
-  }
-
-  if (!text) {
-     *_retval = nsnull;
-     return NS_ERROR_FAILURE;
-  }
-
-  // look at our role
-  return text->GetAccValue(_retval);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccName(PRUnichar **_retval)
-{
-   *_retval = nsnull;
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("combo box"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> last;
-  nsresult rv = nsAccessible::GetAccLastChild(getter_AddRefs(last));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!last) {
-    // we have a parent but not previous
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = last;
-  }
-
-  NS_ADDREF(*_retval);
-
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> first;
-  nsresult rv = nsAccessible::GetAccFirstChild(getter_AddRefs(first));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!first) {
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = first;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewLastAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  nsresult rv = nsAccessible::GetAccChildCount(_retval);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // always have one more that is our window child
-  (*_retval)++;
-  return NS_OK;
-}
-
-//--------------------
-
-nsSelectChildAccessible::nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccValue(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // if its the text in the combo box then
-  // its value should be its name.
-  if (role.EqualsIgnoreCase("text")) {
-    rv = nsAccessible::GetAccName(_retval);
-  } else {
-    rv = nsAccessible::GetAccValue(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // any text in the combo box is static
-  if (role.EqualsIgnoreCase("text")) {
-    // if it the comboboxes text. Make it static
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("static text"));
-  } else {
-    rv = nsAccessible::GetAccRole(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  nsAccessible::GetAccRole(&string);
-  nsAutoString role(string);
-
-  // if button then we need to make the name be open or close
-  if (role.EqualsIgnoreCase("push button"))
-  {
-     // if its a button and not already registered, 
-     // register ourselves as a popup listener   
-     if (!mRegistered) {
-       nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-       if (!eventReceiver) {
-         *_retval = nsnull;
-         return NS_ERROR_NOT_IMPLEMENTED;
-       }
-
-       eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-       mRegistered = PR_TRUE;
-     }
-
-     // get the current state open or closed
-     // set _retval to it.
-     // notice its supposed to be reversed. Close if opened
-     // and Open if closed.
-
-     if (mOpen)
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Close"));
-     else
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Open"));
-
-  } else {
-    /*rv = nsAccessible::GetAccName(_retval);*/
-    rv = NS_ERROR_NOT_IMPLEMENTED;
-    *_retval = nsnull;
-  }
-
-  delete string;
-
-  return rv;
-}
-
-
-nsSelectChildAccessible::~nsSelectChildAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewPreviousAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mSelectContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{ 
-  nsCOMPtr<nsIAccessible> next;
-  nsresult rv = nsAccessible::GetAccNextSibling(getter_AddRefs(next));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!next) {
-    // ok no more siblings. Lets create our window
-    nsCOMPtr<nsIAccessible> parent;
-    GetAccParent(getter_AddRefs(parent));
-
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, parent, nsnull, nsnull, mSelectContent, mPresShell);
-  } else {
-    *_retval = next;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-} 
-
-
-//---------------------
-
-
-nsSelectWindowAccessible::nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPrev = aPrev;
-  mPopupAtom = aPopupAtom;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-nsSelectWindowAccessible::~nsSelectWindowAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccState(PRUint32 *_retval)
-{
-  // not not already one register ourselves as a popup listener
-   
-  if (!mRegistered) {
-
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (!eventReceiver) {
-       *_retval = 0;
-       return NS_ERROR_NOT_IMPLEMENTED;
-     }
-
-     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-     if (NS_FAILED(rv)) {
-       *_retval = 0;
-       return rv;
-     }
-
-     mRegistered = PR_TRUE;
-  }
-
-  // if open we are visible if closed we are invisible
-   // set _retval to it.
-   if (mOpen)
-     *_retval |= STATE_DEFAULT;
-   else
-     *_retval |= STATE_INVISIBLE;
-
-   return NS_OK;
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccExtState(PRUint32 *_retval)
-{
-	*_retval=0;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccName(PRUnichar **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("window"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = mPrev;
-  NS_IF_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/*
-NS_IMETHODIMP nsSelectWindowAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  *x = *y = *width = *height = 0;
-  return NS_OK;
-}
-*/
-
-nsIFrame* nsSelectWindowAccessible::GetBoundsFrame()
-{
-  // get our frame
-  nsIFrame* frame = GetFrame();
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  // get its first popup child that should be the window
-  frame->FirstChild(context, mPopupAtom, &frame);
-
-  return frame;
-}
-
-//----------
-
-
-nsSelectListAccessible::nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-    mPopupAtom = aPopupAtom;
-    mParent = aParent;
-}
-
-void nsSelectListAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return mParent->AccGetBounds(x,y,width,height);
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_ADDREF(*_retval);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccName(PRUnichar **_retval)
-{
-  *_retval = nsnull;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
- 
-//--------
-
-nsListChildAccessible::nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-}
-
-nsIAccessible* nsListChildAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mSelectContent, mParent, aAccessible, aContent, aShell);
-}
-
-void nsListChildAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mSelectContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list item"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
-

mozilla/accessible/src/base/nsSelectAccessible.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsSelectAccessible_h__
-#define __nsSelectAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-
-class nsSelectAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectAccessible(nsIAtom* aPopupAtom, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-  virtual ~nsSelectAccessible() {}
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-};
-
-
-#endif

mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLFormControlAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsINameSpaceManager.h"
-#include "nsHTMLAtoms.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsReadableUtils.h"
-
-nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsLeafDOMAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(PRUnichar **_retval)
-{
-  // go up tree get name of label if there is one.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
-{
-    // can be
-    // focusable, focused, checked
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    *_retval = (checked ? STATE_CHECKED : 0);
-    return NS_OK;
-}
-
-// --- checkbox -----
-
-nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("check box"));
-    return NS_OK;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    // check or uncheck
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    if (checked)
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("Check"));
-    else
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("UnCheck"));
-
-    return NS_OK;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  PRBool checked = PR_FALSE;
-  element->GetChecked(&checked);
-  element->SetChecked(checked ? PR_FALSE : PR_TRUE);
-
-  return NS_OK;
-}
-
-
-//------ Radio button -------
-
-nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Select"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("radio button"));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}
-
-// ----- Button -----
-
-nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Press"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("push button"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(PRUnichar **_retval)
-{
-    *_retval = nsnull;
-    nsCOMPtr<nsIDOMHTMLInputElement> button = do_QueryInterface(mNode);
-
-    if (!button)
-      return NS_ERROR_FAILURE;
-
-    nsAutoString name;
-    button->GetValue(name);
-    name.CompressWhitespace();
-
-    *_retval = name.ToNewUnicode();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLFormControlAccessible.h

@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLFormControlAccessible_H_
-#define _nsHTMLFormControlAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsICheckboxControlFrame;
-
-/* Accessible for supporting for controls
- * supports:
- * - walking up to get name from label
- * - support basic state
- */
-class nsHTMLFormControlAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-};
-
-class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLTextAccessible.cpp

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTextAccessible.h"
-#include "nsICheckboxControlFrame.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-
-nsHTMLTextAccessible::nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode):
-nsLeafDOMAccessible(aShell, aDomNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsAutoString value;
-  mNode->GetNodeValue(value);
-  value.CompressWhitespace();
-  *_retval = value.ToNewUnicode();
-  return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUnichar **_retval)
-{
-    nsAutoString role(NS_LITERAL_STRING("text"));
-    *_retval = role.ToNewUnicode();
-
-    return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLTextAccessible.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLTextAccessible_H_
-#define _nsHTMLTextAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsIWeakReference;
-class nsITextControlFrame;
-
-class nsHTMLTextAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-
-private:
-  nsCOMPtr<nsIDOMNode> mDomNode;
-};
-
-#endif  

mozilla/accessible/src/makefile.win

@@ -1,53 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=accessibility
-LIBRARY_NAME=accessibility_s
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsAccessible.obj    \
-        .\$(OBJDIR)\nsRootAccessible.obj    \
-        .\$(OBJDIR)\nsMutableAccessible.obj    \
-        .\$(OBJDIR)\nsAccessibilityService.obj    \
-        .\$(OBJDIR)\nsSelectAccessible.obj    \
-        .\$(OBJDIR)\nsGenericAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLFormControlAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLTextAccessible.obj    \
-	$(NULL)
-
-LINCS=                                  \
-	-I..\..\layout\html\forms\public \
-	-I..\..\layout\html\forms\src \
-	-I..\..\layout\html\base\src \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-
-
-

mozilla/accessible/src/nsAccessibilityService.cpp

@@ -1,252 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsIAccessibilityService.h"
-#include "nsAccessibilityService.h"
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsHTMLFormControlAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsSelectAccessible.h"
-#include "nsHTMLTextAccessible.h"
-
-//--------------------
-
-
-nsAccessibilityService::nsAccessibilityService()
-{
-	NS_INIT_REFCNT();
-}
-
-nsAccessibilityService::~nsAccessibilityService()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIAccessibilityService methods:
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsRootAccessible(wr,f);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateMutableAccessible(nsISupports* aNode, nsIMutableAccessible **_retval)
-{
-  *_retval = new nsMutableAccessible(aNode);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLBlockAccessible(nsIAccessible* aAccessible, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsHTMLBlockAccessible(aAccessible, n,wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLSelectAccessible(nsIAtom* aPopupAtom, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s)); 
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsSelectAccessible(aPopupAtom, nsnull, n, wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLCheckboxAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-
-  *_retval = new nsHTMLRadioButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLTextAccessible(shell, node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aNode)
-{
-  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
-  nsCOMPtr<nsIContent> content;
-  (*aRealFrame)->GetContent(getter_AddRefs(content));
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
-  *aNode = node;
-  NS_ADDREF(*aNode);
-
-  nsCOMPtr<nsIDocument> document;
-  content->GetDocument(*getter_AddRefs(document));
-
-#ifdef DEBUG
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-#endif
-
-  *aShell = document->GetShellAt(0);
-  NS_IF_ADDREF(*aShell);
-
-  return NS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-
-nsresult
-NS_NewAccessibilityService(nsIAccessibilityService** aResult)
-{
-    NS_PRECONDITION(aResult != nsnull, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    nsAccessibilityService* a = new nsAccessibilityService();
-    if (a == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(a);
-    *aResult = a;
-    return NS_OK;
-}
-

mozilla/accessible/src/nsAccessibilityService.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#ifndef __nsAccessibilityService_h__
-#define __nsAccessibilityService_h__
-
-#include "nsIAccessibilityService.h"
-class nsIFrame;
-class nsIPresShell;
-class nsIDOMNode;
-
-class nsAccessibilityService : public nsIAccessibilityService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBILITYSERVICE
-
-  // nsAccessibilityService methods:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
-public:
-
-private:
-  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aContent);
-
-};
-
-#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/nsAccessible.cpp

@@ -1,995 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIScrollableView.h"
-#include "nsRootAccessible.h"
-
-//#define DEBUG_LEAKS
-
-#ifdef DEBUG_LEAKS
-static gnsAccessibles = 0;
-#endif
-
-
-class nsFrameTreeWalker {
-public:
-  nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner);
-  nsIFrame* GetNextSibling(nsIFrame* aFrame);
-  nsIFrame* GetPreviousSibling(nsIFrame* aFrame);
-  nsIFrame* GetParent(nsIFrame* aFrame);
-  nsIFrame* GetFirstChild(nsIFrame* aFrame);
-  nsIFrame* GetLastChild(nsIFrame* aFrame);
-  nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
-  PRInt32 GetCount(nsIFrame* aFrame);
-
-  static PRBool ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext);
-  static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
-
-  nsCOMPtr<nsIPresContext> mPresContext;
-  nsCOMPtr<nsIAccessible> mAccessible;
-  nsCOMPtr<nsIContent> mContent;
-  nsAccessible* mOwner;
-};
-
-nsFrameTreeWalker::nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner)
-{
-  mPresContext = aPresContext;
-  mOwner = aOwner;
-}
-
-nsIFrame* nsFrameTreeWalker::GetParent(nsIFrame* aFrame)
-{
-  //printf("Get parent\n");
-
-  nsIFrame* parent = nsnull;
-  aFrame->GetParent(&parent);
-
-  // if no parent then we hit the root
-  // just return that top frame
-  if (!parent) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return aFrame;
-  }
-
-  GetAccessible(parent, mAccessible, mContent);
-  if (mAccessible)
-    return parent;
-  
-  return GetParent(parent);
-}
-
-nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
-{
-  //printf("Get next\n");
-
-  // get next sibling
-  nsIFrame* next = nsnull;
-  aFrame->GetNextSibling(&next);
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
-
-  
-  // skip any frames with the same content node
-  while(ShouldSkip(mPresContext, list, aFrame, next)) 
-    next->GetNextSibling(&next);
-  
-
-  // if failed
-  if (!next)
-  {
-    // if parent has content
-    nsIFrame* parent = nsnull;
-    aFrame->GetParent(&parent);
-    
-    // if no parent fail
-    if (!parent) {
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    }
-
-    // fail if we reach a parent that is accessible
-    GetAccessible(parent, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // fail
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    } else {
-      // next on parent
-      nsIFrame* n = GetNextSibling(parent);
-      if (ShouldSkip(mPresContext, list, aFrame, n))
-        return GetNextSibling(n);
-      else 
-        return n;
-    }
-  }
-
-  // if next has content
-  GetAccessible(next, mAccessible, mContent);
-  if (mAccessible)
-  {
-    // done
-    return next;
-  }
-
-  // if next doesn't have node
-
-  // call first on next
-  nsIFrame* first = GetFirstChild(next);
-
-  // if found
-  if (first) {
-    if (ShouldSkip(mPresContext, list, aFrame, first))
-      return GetNextSibling(first);
-    else 
-      return first;
-  }
-
-  // call next on next
-  nsIFrame* n =  GetNextSibling(next);
-  if (ShouldSkip(mPresContext, list, aFrame, next))
-    return GetNextSibling(n);
-  else 
-    return n;
-}
-
-nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
-{
-
-  //printf("Get first\n");
-
-  // get first child
-  nsIFrame* child = nsnull;
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
-  aFrame->FirstChild(mPresContext, list, &child);
-
-  while(child)
-  {
-    // if first has a content node
-    GetAccessible(child, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // done
-      return child;
-    } else {
-      // call first on child
-      nsIFrame* first = GetFirstChild(child);
-
-      // if succeeded
-      if (first)
-      {
-        // return child
-        return first;
-      }
-    }
-
-    // get next sibling
-    nsIFrame* next;
-    child->GetNextSibling(&next);
-
-    // skip children with duplicate content nodes
-    nsIAtom* list = nsnull;
-    mOwner->GetListAtomForFrame(child, list);
-
-    while(ShouldSkip(mPresContext, list, child, next)) 
-      next->GetNextSibling(&next);
-
-    child = next;
-  }
-
-  // fail
-  mAccessible = nsnull;
-  mContent = nsnull;
-  return nsnull;
-}
-
-nsIFrame* nsFrameTreeWalker::GetChildBefore(nsIFrame* aParent, nsIFrame* aChild)
-{
-  nsIFrame* child = GetFirstChild(aParent);
-
-  // if the child is not us
-  if (child == aChild) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return nsnull;
-  }
-
-  nsIFrame* prev = child;
-  nsCOMPtr<nsIContent> prevContent = mContent;
-  nsCOMPtr<nsIAccessible> prevAccessible = mAccessible;
-
-  while(child) 
-  {
-    child = GetNextSibling(child);
-
-    if (child == aChild)
-      break;
-
-    prev = child;
-    prevContent = mContent;
-    prevAccessible = mAccessible;
-  }
-
-  mAccessible = prevAccessible;
-  mContent = prevContent;
-  return prev;
-}
-
-nsIFrame* nsFrameTreeWalker::GetPreviousSibling(nsIFrame* aFrame)
-{
-  //printf("Get previous\n");
-
-  nsIFrame* parent = GetParent(aFrame);
-  
-  return GetChildBefore(parent, aFrame);
-}
-
-nsIFrame* nsFrameTreeWalker::GetLastChild(nsIFrame* aFrame)
-{
-  //printf("Get last\n");
-
-  return GetChildBefore(aFrame, nsnull);
-}
-
-PRInt32 nsFrameTreeWalker::GetCount(nsIFrame* aFrame)
-{
-
-  //printf("Get count\n");
-  nsIFrame* child = GetFirstChild(aFrame);
-
-  PRInt32 count = 0;
-  while(child) 
-  {
-    count++;
-    child = GetNextSibling(child);
-  }
-
-  return count;
-}
-
-void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent)
-{
-  aContent = nsnull;
-  aAccessible = nsnull;
-
-  aFrame->GetContent(getter_AddRefs(aContent));
-
-  if (!aContent)
-    return;
-
-  nsCOMPtr<nsIDocument> document;
-  aContent->GetDocument(*getter_AddRefs(document));
-  if (!document)
-    return;
-
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-  nsIPresShell* shell = document->GetShellAt(0);
-  nsIFrame* frame = nsnull;
-  shell->GetPrimaryFrameFor(aContent, &frame);
-
-  if (!frame)
-    return;
-
-  aAccessible = do_QueryInterface(aFrame);
-
-  if (!aAccessible)
-    aAccessible = do_QueryInterface(aContent);
-
- // if (aAccessible)
- //   printf("Found accessible!\n");
-}
-
-PRBool nsFrameTreeWalker::ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext)
-{
-  if (!aStart || !aNext)
-    return PR_FALSE;
-
-  // is content the same? If so skip it
-  nsCOMPtr<nsIContent> content1;
-  nsCOMPtr<nsIContent> content2;
-
-  aStart->GetContent(getter_AddRefs(content1));
-  aNext->GetContent(getter_AddRefs(content2));
-
-  if (content1 == content2 && content1 != nsnull) {
-    // does it have childen? It it does then don't skip it
-    nsIFrame* child = nsnull;
-    aNext->FirstChild(aContext, aList, &child);
-    if (child)
-      return PR_FALSE;
-
-    return PR_TRUE;
-  }
-  
-  return PR_FALSE;
-}
-
-/*
- * Class nsAccessible
- */
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsAccessible::nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-   NS_INIT_REFCNT();
-
-   // get frame and node
-   mContent = aContent;
-   mAccessible = aAccessible;
-   mPresShell = aShell;
-
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", ++gnsAccessibles);
-#endif
-
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsAccessible::~nsAccessible()
-{
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", --gnsAccessibles);
-#endif
-}
-
-//NS_IMPL_ISUPPORTS2(nsAccessible, nsIAccessible, nsIAccessibleWidgetAccess);
-NS_IMPL_ISUPPORTS1(nsAccessible, nsIAccessible);
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccParent(aAccParent);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-
-    // failed? Lets do some default behavior
-    walker.GetParent(GetFrame());
-
-    // if no content or accessible then we hit the root
-    if (!walker.mContent || !walker.mAccessible)
-    {
-      *aAccParent = new nsRootAccessible(mPresShell);
-      NS_ADDREF(*aAccParent);
-      return NS_OK;
-    }
-
-    *aAccParent = CreateNewParentAccessible(walker.mAccessible, walker.mContent, mPresShell);
-    NS_ADDREF(*aAccParent);
-    return NS_OK;
-  }
-
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-  /* readonly attribute nsIAccessible accNextSibling; */
-NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
-{ 
-  // delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccNextSibling(aAccNextSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this);
-
-    nsIFrame* next = walker.GetNextSibling(GetFrame());
-  
-    if (next && walker.mAccessible && walker.mContent) 
-    {
-      *aAccNextSibling = CreateNewNextAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccNextSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccNextSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accPreviousSibling; */
-NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) 
-{ 
-// delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccPreviousSibling(aAccPreviousSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
- 
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* prev = walker.GetPreviousSibling(GetFrame());
-
-    if (prev && walker.mAccessible && walker.mContent) 
-    {
-      *aAccPreviousSibling = CreateNewPreviousAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccPreviousSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccPreviousSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) 
-{ 
-    
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccFirstChild(aAccFirstChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* child = walker.GetFirstChild(GetFrame());
-
-    if (child && walker.mAccessible && walker.mContent) 
-    {
-      *aAccFirstChild = CreateNewFirstAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccFirstChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccFirstChild = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
-{  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccLastChild(aAccLastChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* last = walker.GetLastChild(GetFrame());
-
-    if (last && walker.mAccessible && walker.mContent) 
-    {
-      *aAccLastChild = CreateNewLastAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccLastChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccLastChild = nsnull;
-
-  return NS_OK;
-}
-
-/* readonly attribute long accChildCount; */
-NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
-{
-  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccChildCount(aAccChildCount);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-  
-
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    *aAccChildCount = walker.GetCount(GetFrame());
-  } else 
-    *aAccChildCount = 0;
-
-  return NS_OK;  
-}
-
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccName(aAccName);
-    if (NS_SUCCEEDED(rv) && *aAccName != nsnull)
-      return rv;
-  }
-
-  *aAccName = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccDefaultAction(PRUnichar * *aDefaultAction) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDefaultAction(aDefaultAction);
-    if (NS_SUCCEEDED(rv) && *aDefaultAction != nsnull)
-      return rv;
-  }
-
-  *aDefaultAction = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccName(const PRUnichar * aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->SetAccName(aAccName);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* attribute wstring accValue; */
-NS_IMETHODIMP nsAccessible::GetAccValue(PRUnichar * *aAccValue) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccValue(aAccValue);
-
-    if (NS_SUCCEEDED(rv) && *aAccValue != nsnull)
-      return rv;
-  }
-
-  *aAccValue = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccValue(const PRUnichar * aAccValue) { return NS_ERROR_NOT_IMPLEMENTED;  }
-
-  /* readonly attribute wstring accDescription; */
-NS_IMETHODIMP nsAccessible::GetAccDescription(PRUnichar * *aAccDescription) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDescription(aAccDescription);
-    if (NS_SUCCEEDED(rv) && *aAccDescription != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccRole(aAccRole);
-    if (NS_SUCCEEDED(rv) && *aAccRole != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accState; */
-NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccState(aAccState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *aAccExtState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccExtState(aAccExtState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accHelp; */
-NS_IMETHODIMP nsAccessible::GetAccHelp(PRUnichar * *aAccHelp) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccHelp(aAccHelp);
-    if (NS_SUCCEEDED(rv) && *aAccHelp != nsnull)
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute boolean accFocused; */
-NS_IMETHODIMP nsAccessible::GetAccFocused(PRBool *aAccFocused) { return NS_OK;  }
-
-  /* nsIAccessible accGetChildAt (in long x, in long y); */
-NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        *_retval = child;
-        NS_ADDREF(*_retval);
-        return NS_OK;
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-  /* void accNavigateRight (); */
-NS_IMETHODIMP nsAccessible::AccNavigateRight(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateLeft (); */
-NS_IMETHODIMP nsAccessible::AccNavigateLeft(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateUp (); */
-
-NS_IMETHODIMP nsAccessible::AccNavigateUp(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateDown (); */
-NS_IMETHODIMP nsAccessible::AccNavigateDown(nsIAccessible **_retval) { return NS_OK;  }
-
-
-  /* void addSelection (); */
-NS_IMETHODIMP nsAccessible::AccAddSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccAddSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void removeSelection (); */
-NS_IMETHODIMP nsAccessible::AccRemoveSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccRemoveSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void extendSelection (); */
-NS_IMETHODIMP nsAccessible::AccExtendSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccExtendSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeSelection (); */
-NS_IMETHODIMP nsAccessible::AccTakeSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeFocus (); */
-NS_IMETHODIMP nsAccessible::AccTakeFocus(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeFocus();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void doDefaultAction (); */
-NS_IMETHODIMP nsAccessible::AccDoDefaultAction(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccDoDefaultAction();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  nsIFrame* frame = GetBoundsFrame();
-
-  if (!frame || !context)
-  {
-    *x = *y = *width = *height = 0;
-    return NS_OK;
-  }
-
-   // sum up all rects of frames with the same content node
-  nsRect r;
-  nsIFrame* start = frame;
-  nsIFrame* next = nsnull;
-  start->GetNextSibling(&next);
-
-  start->GetRect(r);
-  
-  while (nsFrameTreeWalker::ShouldSkip(context,nsnull, start, next))
-  {
-    nsRect r2;
-    next->GetRect(r2);
-    r.UnionRect(r,r2);
-    next->GetNextSibling(&next);
-  }
-
-  nsPoint offset(r.x,r.y);
-
-  frame->GetParent(&frame);
-
-  nsPoint pos(0,0);
-  while(frame) {
-    nsIScrollableView* scrollingView;
-    nsIView*           view;
-    // XXX hack
-    frame->GetView(context, &view);
-    if (view) {
-     nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
-     if (NS_SUCCEEDED(result)) {
-         nscoord xoff = 0;
-         nscoord yoff = 0;
-         scrollingView->GetScrollPosition(xoff, yoff);
-         offset.x -= xoff;
-         offset.y -= yoff;
-     }
-    }
-
-    frame->GetOrigin(pos);
-    offset += pos;
-    frame->GetParent(&frame);
-  }
-
-  float t2p;
-  context->GetTwipsToPixels(&t2p);
-
-  *x = (PRInt32)(offset.x*t2p);
-  *y = (PRInt32)(offset.y*t2p);
-  *width = (PRInt32)(r.width*t2p);
-  *height = (PRInt32)(r.height*t2p);
-
-  return NS_OK;
-}
-
-// helpers
-
-nsIFrame* nsAccessible::GetBoundsFrame()
-{
-   return GetFrame();
-}
-
-nsIFrame* nsAccessible::GetFrame()
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   return frame;
-}
-
-void nsAccessible::GetPresContext(nsCOMPtr<nsIPresContext>& aContext)
-{
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-
-  if (shell) {
-    shell->GetPresContext(getter_AddRefs(aContext));
-  } else
-    aContext = nsnull;
-}
-
-nsIAccessible* nsAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsAccessible(aAccessible, aContent, aShell);
-}
-
-
-// ------- nsHTMLBlockAccessible ------
-
-nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):nsAccessible(aAccessible, aContent, aShell)
-{
-
-}
-
-nsIAccessible* nsHTMLBlockAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsHTMLBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> smallestChild;
-    PRInt32 smallestArea = -1;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      // ok if there are multiple frames the contain the point 
-      // and they overlap then pick the smallest. We need to do this
-      // for text frames.
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        if (smallestArea == -1 || cw*ch < smallestArea) {
-          smallestArea = cw*ch;
-          smallestChild = child;
-        }
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-    if (smallestChild != nsnull)
-    {
-      *_retval = smallestChild;
-      NS_ADDREF(*_retval);
-      return NS_OK;
-    }
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-
-
-
-

mozilla/accessible/src/nsAccessible.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsAccessible_H_
-#define _nsAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsWeakReference.h"
-
-class nsIFrame;
-
-class nsAccessible : public nsIAccessible
-//                     public nsIAccessibleWidgetAccess
-{
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBLE
-
-  //NS_IMETHOD AccGetWidget(nsIWidget**);
-
-	public:
-		nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-		virtual ~nsAccessible();
-
-    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIFrame* GetBoundsFrame();
-  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIContent> mContent;
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIAccessible> mAccessible;
-};
-
-/* Special Accessible that knows how to handle hit detection for flowing text */
-class nsHTMLBlockAccessible : public nsAccessible
-{
-public:
-   nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-protected:
-   virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aFrame, nsIWeakReference* aShell);
-};
-
-#endif  

mozilla/accessible/src/nsGenericAccessible.cpp

@@ -1,335 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsIEventStateManager.h"
-#include "nsIFrame.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
-
-nsGenericAccessible::nsGenericAccessible()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-nsGenericAccessible::~nsGenericAccessible()
-{
-  /* destructor code */
-}
-
-/* nsIAccessible getAccParent (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const PRUnichar *name)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccValue (in wstring value); */
-NS_IMETHODIMP nsGenericAccessible::SetAccValue(const PRUnichar *value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean getAccFocused (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFocused(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateRight (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateLeft (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateUp (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateDown (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accAddSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accExtendSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::AccDoDefaultAction()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccExtState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//-------------
-// nsDOMAccessible
-//-------------
-
-nsDOMAccessible::nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode)
-{
-  mPresShell = getter_AddRefs(NS_GetWeakReference(aShell));
-  mNode = aNode;
-}
-
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccRemoveSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    rv = selection->Collapse(parent, 0);
-    if (NS_FAILED(rv))
-      return rv;
-
-    return NS_OK;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    PRInt32 offsetInParent = 0;
-    nsCOMPtr<nsIDOMNode> child;
-    rv = parent->GetFirstChild(getter_AddRefs(child));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> next; 
-
-    while(child)
-    {
-      if (child == mNode) {
-        // Collapse selection to just before desired element,
-        rv = selection->Collapse(parent, offsetInParent);
-        if (NS_FAILED(rv))
-          return rv;
-
-        // then extend it to just after
-        rv = selection->Extend(parent, offsetInParent+1);
-        return rv;
-      }
-
-       child->GetNextSibling(getter_AddRefs(next));
-       child = next;
-       offsetInParent++;
-    }
-
-    // didn't find a child
-    return NS_ERROR_FAILURE;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeFocus()
-{ 
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-  nsCOMPtr<nsIPresContext> context;
-  shell->GetPresContext(getter_AddRefs(context));
-  nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
-  content->SetFocus(context);
-  
-  return NS_OK;
-}
-
-//-------------
-// nsLeafFrameAccessible
-//-------------
-
-nsLeafDOMAccessible::nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsDOMAccessible(aShell, aNode)
-{
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-

mozilla/accessible/src/nsGenericAccessible.h

@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsGenericAccessible_H_
-#define _nsGenericAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-
-class nsIWeakReference;
-
-/**
- * Basic implementation
- * supports nothing
- */
-class nsGenericAccessible : public nsIAccessible
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-
-	public:
-    nsGenericAccessible();
-    virtual ~nsGenericAccessible();
-};
-
-/**
- * And accessible that observes a dom node
- * supports:
- * - selection
- * - focus
- */
-class nsDOMAccessible : public nsGenericAccessible
-{
-  public:
-    nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD AccTakeSelection(void); 
-    NS_IMETHOD AccTakeFocus(void); 
-    NS_IMETHOD AccRemoveSelection(void);
-
-  protected:
-    nsIWeakReference* mPresShell;
-    nsCOMPtr<nsIDOMNode> mNode;
-};
-
-/* Leaf version of DOM Accessible
- * has no children
- */
-class nsLeafDOMAccessible : public nsDOMAccessible
-{
-  public:
-    nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/nsHTMLFormControlAccessible.cpp

@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLFormControlAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsINameSpaceManager.h"
-#include "nsHTMLAtoms.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsReadableUtils.h"
-
-nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsLeafDOMAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(PRUnichar **_retval)
-{
-  // go up tree get name of label if there is one.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
-{
-    // can be
-    // focusable, focused, checked
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    *_retval = (checked ? STATE_CHECKED : 0);
-    return NS_OK;
-}
-
-// --- checkbox -----
-
-nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("check box"));
-    return NS_OK;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    // check or uncheck
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    if (checked)
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("Check"));
-    else
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("UnCheck"));
-
-    return NS_OK;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  PRBool checked = PR_FALSE;
-  element->GetChecked(&checked);
-  element->SetChecked(checked ? PR_FALSE : PR_TRUE);
-
-  return NS_OK;
-}
-
-
-//------ Radio button -------
-
-nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Select"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("radio button"));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}
-
-// ----- Button -----
-
-nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Press"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("push button"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(PRUnichar **_retval)
-{
-    *_retval = nsnull;
-    nsCOMPtr<nsIDOMHTMLInputElement> button = do_QueryInterface(mNode);
-
-    if (!button)
-      return NS_ERROR_FAILURE;
-
-    nsAutoString name;
-    button->GetValue(name);
-    name.CompressWhitespace();
-
-    *_retval = name.ToNewUnicode();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}

mozilla/accessible/src/nsHTMLFormControlAccessible.h

@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLFormControlAccessible_H_
-#define _nsHTMLFormControlAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsICheckboxControlFrame;
-
-/* Accessible for supporting for controls
- * supports:
- * - walking up to get name from label
- * - support basic state
- */
-class nsHTMLFormControlAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-};
-
-class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-
-};
-
-#endif  

mozilla/accessible/src/nsHTMLTextAccessible.cpp

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTextAccessible.h"
-#include "nsICheckboxControlFrame.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-
-nsHTMLTextAccessible::nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode):
-nsLeafDOMAccessible(aShell, aDomNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsAutoString value;
-  mNode->GetNodeValue(value);
-  value.CompressWhitespace();
-  *_retval = value.ToNewUnicode();
-  return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUnichar **_retval)
-{
-    nsAutoString role(NS_LITERAL_STRING("text"));
-    *_retval = role.ToNewUnicode();
-
-    return NS_OK;
-}

mozilla/accessible/src/nsHTMLTextAccessible.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLTextAccessible_H_
-#define _nsHTMLTextAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsIWeakReference;
-class nsITextControlFrame;
-
-class nsHTMLTextAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-
-private:
-  nsCOMPtr<nsIDOMNode> mDomNode;
-};
-
-#endif  

mozilla/accessible/src/nsMutableAccessible.cpp

@@ -1,263 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsMutableAccessible.h"
-#include "nsINameSpaceManager.h"
-
-NS_IMPL_ISUPPORTS1(nsMutableAccessible, nsIAccessible)
-
-nsMutableAccessible::nsMutableAccessible(nsISupports* aNode)
-{
-  NS_INIT_ISUPPORTS();
-  NS_ASSERTION(aNode,"We must have a valid node!!");
-  mNode = aNode;
-  mNameNodeValue = PR_FALSE;
-  mNameStringSet = PR_FALSE;
-  mRole = NS_LITERAL_STRING("unknown");
-  mIsLeaf = PR_FALSE;
-}
-
-nsMutableAccessible::~nsMutableAccessible()
-{
-}
-
-NS_IMETHODIMP nsMutableAccessible::SetIsLeaf(PRBool aLeaf)
-{
-    mIsLeaf = aLeaf;
-    return NS_OK;
-}
-
-/* void SetNodeAsNodeValue (); */
-NS_IMETHODIMP nsMutableAccessible::SetNameAsNodeValue()
-{
-    mNameNodeValue = PR_TRUE;
-    return NS_OK;
-}
-
-/* void SetName (in wstring name); */
-NS_IMETHODIMP nsMutableAccessible::SetName(const PRUnichar *aName)
-{
-    mName = aName; 
-    mNameStringSet = PR_TRUE;
-    return NS_OK;
-}
-
-/* void SetNameAsAttribute (in nsIAtom atom); */
-NS_IMETHODIMP nsMutableAccessible::SetNameAsAttribute(nsIAtom *aAttribute)
-{
-   mNameAttribute = aAttribute;
-   return NS_OK;
-}
-
-/* void SetNameAsAttribute (in nsIAtom atom); */
-NS_IMETHODIMP nsMutableAccessible::SetRole(const PRUnichar *aRole)
-{
-   mRole = aRole;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccParent(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{ 
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  if (mIsLeaf) {
-    *_retval = nsnull;
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  if (mIsLeaf) {
-    *_retval = nsnull;
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  if (mIsLeaf) {
-    *_retval = 0;
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsAutoString value;
-
-  if (mNameNodeValue) {
-    // see if we can get nodevalue
-    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mNode);
-    if (node) {
-      node->GetNodeValue(value);
-      value.CompressWhitespace();
-    } else {
-      *_retval = nsnull;
-      return NS_ERROR_NOT_IMPLEMENTED;
-    }
-  } else if (mNameStringSet) {
-    value = mName;
-  } else if (mNameAttribute) {
-    nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
-    content->GetAttribute(kNameSpaceID_None, mNameAttribute, value);
-    value.CompressWhitespace();
-  } else {
-     *_retval = nsnull;
-     return NS_ERROR_NOT_IMPLEMENTED;
-  }
-    
-  *_retval = value.ToNewUnicode();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccValue(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::SetAccName(const PRUnichar *name)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::SetAccValue(const PRUnichar *value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccDescription(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = mRole.ToNewUnicode();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccExtState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccHelp(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccFocused(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccAddSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccRemoveSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccExtendSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccTakeSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccTakeFocus()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccDoDefaultAction()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/accessible/src/nsMutableAccessible.h

@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsMutableAccessible_H_
-#define _nsMutableAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsString.h"
-
-#include "nsIMutableAccessible.h"
-
-class nsMutableAccessible : public nsIMutableAccessible
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-  NS_DECL_NSIMUTABLEACCESSIBLE
-
-  nsMutableAccessible(nsISupports* aNode);
-  virtual ~nsMutableAccessible();
-
-private:
-  nsCOMPtr<nsISupports> mNode;
-  nsAutoString mName;
-  nsAutoString mRole;
-  nsCOMPtr<nsIAtom> mNameAttribute;
-  PRPackedBool mNameNodeValue;
-  PRPackedBool mNameStringSet;
-  PRPackedBool mIsLeaf;
-};
-
-#endif
-

mozilla/accessible/src/nsRootAccessible.cpp

@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsRootAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessibleEventReceiver)
-NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
-
-NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
-NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame):nsAccessible(nsnull,nsnull,aShell)
-{
- // mFrame = aFrame;
- mListener = nsnull;
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsRootAccessible::~nsRootAccessible()
-{
-  RemoveAccessibleEventListener(mListener);
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsRootAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  *aAccName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document"));
-  return NS_OK;  
-}
-
-// helpers
-nsIFrame* nsRootAccessible::GetFrame()
-{
-  //if (!mFrame) {
-    nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-    nsIFrame* root = nsnull;
-    if (shell) 
-      shell->GetRootFrame(&root);
-  
-    return root;
-  //}
- 
- // return mFrame;
-}
-
-nsIAccessible* nsRootAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  *aAccRole = ToNewUnicode(NS_LITERAL_STRING("client"));
-  return NS_OK;  
-}
-
-/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (!mListener)
-  {
-     // add an event listener to the document
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> receiver;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(receiver))) && receiver)
-     {
-        nsresult rv = receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  // create a weak reference to the listener
-  mListener =  aListener;
-
-  return NS_OK;
-}
-
-/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (mListener)
-  {
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     if (!shell)
-       return NS_OK;
-
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> erP;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
-     {
-        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  mListener = nsnull;
-
-  return NS_OK;
-}
-
-
-nsresult nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
-{
-  if (mListener) {
-     nsCOMPtr<nsIDOMEventTarget> t;
-     aEvent->GetOriginalTarget(getter_AddRefs(t));
-  
-     // create and accessible for the target
-     nsCOMPtr<nsIContent> content = do_QueryInterface(t); 
-
-     if (!content)
-       return NS_OK;
-
-     if (mCurrentFocus == content)
-       return NS_OK;
-
-     mCurrentFocus = content;
-
-     nsIFrame* frame = nsnull;
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     shell->GetPrimaryFrameFor(content, &frame);
-
-     if (!frame)
-       return NS_OK;
-
-     nsCOMPtr<nsIAccessible> a = do_QueryInterface(frame);
-
-     if (!a)
-       a = do_QueryInterface(content);
-
-     nsCOMPtr<nsIAccessible> na = CreateNewAccessible(a, content, mPresShell);
-
-     mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, na);
-  }
-
-  return NS_OK;
-}
-
-nsresult nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK; 
-}
-
-nsresult nsRootAccessible::Blur(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK;
-}
-
-
-

mozilla/accessible/src/nsRootAccessible.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsRootAccessible_H_
-#define _nsRootAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIAccessibleEventReceiver.h"
-#include "nsIAccessibleEventListener.h"
-#include "nsIDOMFocusListener.h"
-
-class nsRootAccessible : public nsAccessible,
-                         public nsIAccessibleEventReceiver,
-                         public nsIDOMFocusListener
-
-{
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame = nsnull);
-    virtual ~nsRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(PRUnichar * *aAccName);
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-    NS_IMETHOD GetAccRole(PRUnichar * *aAccRole);
-
-    // ----- nsIAccessibleEventReceiver ------
-
-    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
-
-    // ----- nsIDOMEventListener --------
-    virtual nsresult HandleEvent(nsIDOMEvent* anEvent);
-    virtual nsresult Focus(nsIDOMEvent* aEvent);
-    virtual nsresult Blur(nsIDOMEvent* aEvent);
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  // not a com pointer. We don't own the listener
-  // it is the callers responsibility to remove the listener
-  // otherwise we will get into circular referencing problems
-  nsIAccessibleEventListener* mListener;
-  nsCOMPtr<nsIContent> mCurrentFocus;
-};
-
-
-#endif  

mozilla/accessible/src/nsSelectAccessible.cpp

@@ -1,717 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsSelectAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsIDOMMenuListener.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-class nsSelectChildAccessible : public nsAccessible,
-                                public nsIDOMMenuListener
-{
-public:
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectChildAccessible();
-
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  nsresult HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectChildAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectWindowAccessible : public nsAccessible,
-                                 public nsIDOMMenuListener
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectWindowAccessible();
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccExtState(PRUint32 *_retval);
-  
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  nsresult HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  // helpers
-  virtual nsIFrame* GetBoundsFrame();
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAccessible> mPrev;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectWindowAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectListAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-class nsListChildAccessible : public nsAccessible
-{
-public:
-  
-  nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsListChildAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-};
-
-//---------
- 
-nsSelectAccessible::nsSelectAccessible(nsIAtom* aPopupAtom, 
-                                       nsIAccessible* aAccessible, 
-                                       nsIContent* aContent, 
-                                       nsIWeakReference* aShell)
-                                               :nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccValue(PRUnichar **_retval)
-{
-  // our value is our first child's value. Which is the combo boxes text.
-  nsCOMPtr<nsIAccessible> text;
-  nsresult rv = GetAccFirstChild(getter_AddRefs(text));
-
-  if (NS_FAILED(rv)) {
-     *_retval = nsnull;
-     return rv;
-  }
-
-  if (!text) {
-     *_retval = nsnull;
-     return NS_ERROR_FAILURE;
-  }
-
-  // look at our role
-  return text->GetAccValue(_retval);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccName(PRUnichar **_retval)
-{
-   *_retval = nsnull;
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("combo box"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> last;
-  nsresult rv = nsAccessible::GetAccLastChild(getter_AddRefs(last));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!last) {
-    // we have a parent but not previous
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = last;
-  }
-
-  NS_ADDREF(*_retval);
-
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> first;
-  nsresult rv = nsAccessible::GetAccFirstChild(getter_AddRefs(first));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!first) {
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = first;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewLastAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  nsresult rv = nsAccessible::GetAccChildCount(_retval);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // always have one more that is our window child
-  (*_retval)++;
-  return NS_OK;
-}
-
-//--------------------
-
-nsSelectChildAccessible::nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccValue(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // if its the text in the combo box then
-  // its value should be its name.
-  if (role.EqualsIgnoreCase("text")) {
-    rv = nsAccessible::GetAccName(_retval);
-  } else {
-    rv = nsAccessible::GetAccValue(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // any text in the combo box is static
-  if (role.EqualsIgnoreCase("text")) {
-    // if it the comboboxes text. Make it static
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("static text"));
-  } else {
-    rv = nsAccessible::GetAccRole(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  nsAccessible::GetAccRole(&string);
-  nsAutoString role(string);
-
-  // if button then we need to make the name be open or close
-  if (role.EqualsIgnoreCase("push button"))
-  {
-     // if its a button and not already registered, 
-     // register ourselves as a popup listener   
-     if (!mRegistered) {
-       nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-       if (!eventReceiver) {
-         *_retval = nsnull;
-         return NS_ERROR_NOT_IMPLEMENTED;
-       }
-
-       eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-       mRegistered = PR_TRUE;
-     }
-
-     // get the current state open or closed
-     // set _retval to it.
-     // notice its supposed to be reversed. Close if opened
-     // and Open if closed.
-
-     if (mOpen)
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Close"));
-     else
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Open"));
-
-  } else {
-    /*rv = nsAccessible::GetAccName(_retval);*/
-    rv = NS_ERROR_NOT_IMPLEMENTED;
-    *_retval = nsnull;
-  }
-
-  delete string;
-
-  return rv;
-}
-
-
-nsSelectChildAccessible::~nsSelectChildAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewPreviousAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mSelectContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{ 
-  nsCOMPtr<nsIAccessible> next;
-  nsresult rv = nsAccessible::GetAccNextSibling(getter_AddRefs(next));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!next) {
-    // ok no more siblings. Lets create our window
-    nsCOMPtr<nsIAccessible> parent;
-    GetAccParent(getter_AddRefs(parent));
-
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, parent, nsnull, nsnull, mSelectContent, mPresShell);
-  } else {
-    *_retval = next;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-} 
-
-
-//---------------------
-
-
-nsSelectWindowAccessible::nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPrev = aPrev;
-  mPopupAtom = aPopupAtom;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-nsSelectWindowAccessible::~nsSelectWindowAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccState(PRUint32 *_retval)
-{
-  // not not already one register ourselves as a popup listener
-   
-  if (!mRegistered) {
-
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (!eventReceiver) {
-       *_retval = 0;
-       return NS_ERROR_NOT_IMPLEMENTED;
-     }
-
-     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-     if (NS_FAILED(rv)) {
-       *_retval = 0;
-       return rv;
-     }
-
-     mRegistered = PR_TRUE;
-  }
-
-  // if open we are visible if closed we are invisible
-   // set _retval to it.
-   if (mOpen)
-     *_retval |= STATE_DEFAULT;
-   else
-     *_retval |= STATE_INVISIBLE;
-
-   return NS_OK;
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccExtState(PRUint32 *_retval)
-{
-	*_retval=0;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccName(PRUnichar **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("window"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = mPrev;
-  NS_IF_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/*
-NS_IMETHODIMP nsSelectWindowAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  *x = *y = *width = *height = 0;
-  return NS_OK;
-}
-*/
-
-nsIFrame* nsSelectWindowAccessible::GetBoundsFrame()
-{
-  // get our frame
-  nsIFrame* frame = GetFrame();
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  // get its first popup child that should be the window
-  frame->FirstChild(context, mPopupAtom, &frame);
-
-  return frame;
-}
-
-//----------
-
-
-nsSelectListAccessible::nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-    mPopupAtom = aPopupAtom;
-    mParent = aParent;
-}
-
-void nsSelectListAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return mParent->AccGetBounds(x,y,width,height);
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_ADDREF(*_retval);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccName(PRUnichar **_retval)
-{
-  *_retval = nsnull;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
- 
-//--------
-
-nsListChildAccessible::nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-}
-
-nsIAccessible* nsListChildAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mSelectContent, mParent, aAccessible, aContent, aShell);
-}
-
-void nsListChildAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mSelectContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list item"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
-

mozilla/accessible/src/nsSelectAccessible.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsSelectAccessible_h__
-#define __nsSelectAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-
-class nsSelectAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectAccessible(nsIAtom* aPopupAtom, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-  virtual ~nsSelectAccessible() {}
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-};
-
-
-#endif

mozilla/content/base/public/nsCopySupport.h

@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nscore.h"
-#include "nsCOMPtr.h"
-
-class nsISelection;
-class nsIDocument;
- 
-class nsCopySupport
-{
-  // class of static helper functions for copy support
-  public:
-    static nsresult HTMLCopy(nsISelection *aSel, nsIDocument *aDoc, PRInt16 aClipboardID);
-};

mozilla/content/base/src/nsCopySupport.cpp

@@ -1,227 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nsCopySupport.h"
-#include "nsIDocumentEncoder.h"
-#include "nsISupports.h"
-#include "nsIContent.h"
-#include "nsIComponentManager.h" 
-#include "nsIServiceManager.h"
-#include "nsIClipboard.h"
-#include "nsWidgetsCID.h"
-#include "nsIEventStateManager.h"
-#include "nsIPresContext.h"
-#include "nsIDOMNSHTMLInputElement.h"
-#include "nsIDOMNSHTMLTextAreaElement.h"
-#include "nsISupportsPrimitives.h"
-#ifdef IBMBIDI
-#include "nsIUBidiUtils.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-static NS_DEFINE_CID(kUBidiUtilCID, NS_UNICHARBIDIUTIL_CID);
-#endif
-
-static NS_DEFINE_CID(kCClipboardCID,           NS_CLIPBOARD_CID);
-static NS_DEFINE_CID(kCTransferableCID,        NS_TRANSFERABLE_CID);
-static NS_DEFINE_CID(kHTMLConverterCID,        NS_HTMLFORMATCONVERTER_CID);
-static NS_DEFINE_CID(kTextEncoderCID,          NS_TEXT_ENCODER_CID);
-
-// private clipboard data flavors for html copy, used by editor when pasting
-#define kHTMLContext   "text/_moz_htmlcontext"
-#define kHTMLInfo      "text/_moz_htmlinfo"
-
-
-nsresult nsCopySupport::HTMLCopy(nsISelection *aSel, nsIDocument *aDoc, PRInt16 aClipboardID)
-{
-  nsresult rv = NS_OK;
-  
-  nsCOMPtr<nsIDocumentEncoder> docEncoder;
-
-  docEncoder = do_CreateInstance(NS_HTMLCOPY_ENCODER_CONTRACTID);
-  NS_ENSURE_TRUE(docEncoder, NS_ERROR_FAILURE);
-
-  rv = docEncoder->Init(aDoc, NS_LITERAL_STRING("text/html"), 0);
-  if (NS_FAILED(rv)) return rv;
-  rv = docEncoder->SetSelection(aSel);
-  if (NS_FAILED(rv)) return rv;
-  nsAutoString mimeType;
-  rv = docEncoder->GetMimeType(mimeType);
-  if (NS_FAILED(rv)) return rv;
-
-  nsAutoString buffer, parents, info;
-  PRBool bIsHTMLCopy = PR_FALSE;
-  if (mimeType.EqualsWithConversion("text/html")) 
-    bIsHTMLCopy = PR_TRUE;
-    
-  if (bIsHTMLCopy)
-  {
-    // encode the selection as html with contextual info
-    rv = docEncoder->EncodeToStringWithContext(buffer, parents, info);
-    if (NS_FAILED(rv)) 
-      return rv;
-  }
-  else
-  {
-    // encode the selection
-    rv = docEncoder->EncodeToString(buffer);
-    if (NS_FAILED(rv)) 
-      return rv;
-  }
-  
-#ifdef IBMBIDI //ahmed
-  rv = NS_OK;
-  PRBool arabicCharset;
-  
-  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDoc);
-  if (doc) {
-    nsIPresShell* shell = doc->GetShellAt(0);
-    if (shell) {
-      nsCOMPtr<nsIPresContext> context;
-      shell->GetPresContext(getter_AddRefs(context) );
-      if (context) {
-        context->IsArabicEncoding(arabicCharset);
-        if (arabicCharset) {
-          nsCOMPtr<nsIUBidiUtils> bidiUtils = do_GetService("@mozilla.org/intl/unicharbidiutil;1");
-          PRUint32 bidiOptions;
-          PRBool isVisual;
-          PRBool isBidiSystem;
-    
-          context->GetBidi(&bidiOptions);
-          context->IsVisualMode(isVisual);
-          context->GetIsBidiSystem(isBidiSystem);
-          if ( (GET_BIDI_OPTION_CLIPBOARDTEXTMODE(bidiOptions) == IBMBIDI_CLIPBOARDTEXTMODE_LOGICAL)&&(isVisual)//&&(isBidiSystem)
-             ) {
-            nsAutoString newBuffer;
-            if (isBidiSystem) {
-#if 0 // Until we finalize the conversion routine
-              if (GET_BIDI_OPTION_DIRECTION(bidiOptions) == IBMBIDI_TEXTDIRECTION_LTR) {
-                bidiUtils->Conv_FE_06_WithReverse(buffer, newBuffer);
-              } 
-              if (GET_BIDI_OPTION_DIRECTION(bidiOptions) == IBMBIDI_TEXTDIRECTION_RTL) {
-                bidiUtils->Conv_FE_06 (buffer, newBuffer);
-              }
-#endif
-            }
-            else { //nonbidisystem
-              bidiUtils->HandleNumbers(buffer, newBuffer);//ahmed
-            }
-            buffer = newBuffer;
-          }
-          //Mohamed
-          else {
-#if 0 // Until we finalize the conversion routine
-            nsAutoString bidiCharset;
-            context->GetBidiCharset(bidiCharset);
-            if (bidiCharset.EqualsIgnoreCase("UTF-8") || (!isVisual)) {
-              if ( (GET_BIDI_OPTION_CLIPBOARDTEXTMODE(bidiOptions) == IBMBIDI_CLIPBOARDTEXTMODE_VISUAL) || (!isBidiSystem) ) {
-                nsAutoString newBuffer;
-                bidiUtils->Conv_06_FE_WithReverse(buffer, newBuffer, GET_BIDI_OPTION_DIRECTION(bidiOptions));
-                bidiUtils->HandleNumbers(newBuffer, buffer);
-              }
-            }
-#endif
-          }
-        }
-      }
-    }
-  }
-#endif // IBMBIDI
-
-  // Get the Clipboard
-  NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv);
-  if (NS_FAILED(rv)) 
-    return rv;
-
-  if ( clipboard ) 
-  {
-    // Create a transferable for putting data on the Clipboard
-    nsCOMPtr<nsITransferable> trans = do_CreateInstance(kCTransferableCID);
-    if ( trans ) 
-    {
-      if (bIsHTMLCopy)
-      {
-        // set up the data converter
-        nsCOMPtr<nsIFormatConverter> htmlConverter = do_CreateInstance(kHTMLConverterCID);
-        NS_ENSURE_TRUE(htmlConverter, NS_ERROR_FAILURE);
-        trans->SetConverter(htmlConverter);
-      }
-      
-      // get wStrings to hold clip data
-      nsCOMPtr<nsISupportsWString> dataWrapper, contextWrapper, infoWrapper;
-      dataWrapper = do_CreateInstance(NS_SUPPORTS_WSTRING_CONTRACTID);
-      NS_ENSURE_TRUE(dataWrapper, NS_ERROR_FAILURE);
-      if (bIsHTMLCopy)
-      {
-        contextWrapper = do_CreateInstance(NS_SUPPORTS_WSTRING_CONTRACTID);
-        NS_ENSURE_TRUE(contextWrapper, NS_ERROR_FAILURE);
-        infoWrapper = do_CreateInstance(NS_SUPPORTS_WSTRING_CONTRACTID);
-        NS_ENSURE_TRUE(infoWrapper, NS_ERROR_FAILURE);
-      }
-      
-      // populate the strings
-      dataWrapper->SetData ( NS_CONST_CAST(PRUnichar*,buffer.GetUnicode()) );
-      if (bIsHTMLCopy)
-      {
-        contextWrapper->SetData ( NS_CONST_CAST(PRUnichar*,parents.GetUnicode()) );
-        infoWrapper->SetData ( NS_CONST_CAST(PRUnichar*,info.GetUnicode()) );
-      }
-      
-      // QI the data object an |nsISupports| so that when the transferable holds
-      // onto it, it will addref the correct interface.
-      nsCOMPtr<nsISupports> genericDataObj ( do_QueryInterface(dataWrapper) );
-      if (bIsHTMLCopy)
-      {
-        if (buffer.Length())
-        {
-          // Add the html DataFlavor to the transferable
-          trans->AddDataFlavor(kHTMLMime);
-          trans->SetTransferData(kHTMLMime, genericDataObj, buffer.Length()*2);
-        }
-        if (parents.Length())
-        {
-          // Add the htmlcontext DataFlavor to the transferable
-          trans->AddDataFlavor(kHTMLContext);
-          genericDataObj = do_QueryInterface(contextWrapper);
-          trans->SetTransferData(kHTMLContext, genericDataObj, parents.Length()*2);
-        }
-        if (info.Length())
-        {
-          // Add the htmlinfo DataFlavor to the transferable
-          trans->AddDataFlavor(kHTMLInfo);
-          genericDataObj = do_QueryInterface(infoWrapper);
-          trans->SetTransferData(kHTMLInfo, genericDataObj, info.Length()*2);
-        }
-      }
-      else
-      {
-        if (buffer.Length())
-        {
-         // Add the unicode DataFlavor to the transferable
-          trans->AddDataFlavor(kUnicodeMime);
-          trans->SetTransferData(kUnicodeMime, genericDataObj, buffer.Length()*2);
-        }
-      }
-      // put the transferable on the clipboard
-      clipboard->SetData(trans, nsnull, aClipboardID);
-    }
-  }
-  return rv;
-}

mozilla/content/html/content/public/nsIHTMLContent.h

@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsIHTMLContent_h___
-#define nsIHTMLContent_h___
-
-#include "nsIXMLContent.h"
-#include "nsHTMLValue.h"
-class nsString;
-class nsIFrame;
-class nsIStyleRule;
-class nsIMutableStyleContext;
-class nsIPresContext;
-class nsIHTMLMappedAttributes;
-class nsIURI;
-
-// IID for the nsIHTMLContent class
-#define NS_IHTMLCONTENT_IID   \
-{ 0xb9e110b0, 0x94d6, 0x11d1, \
-  {0x89, 0x5c, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-typedef void (*nsMapAttributesFunc)(const nsIHTMLMappedAttributes* aAttributes, 
-                                    nsIMutableStyleContext* aContext, 
-                                    nsIPresContext* aPresContext);
-
-// Abstract interface for all html content
-class nsIHTMLContent : public nsIXMLContent
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTMLCONTENT_IID)
-
-  /**
-   * If this html content is a container, then compact asks it to minimize
-   * it's storage usage.
-   */
-  NS_IMETHOD Compact() = 0;
-
-  NS_IMETHOD SetHTMLAttribute(nsIAtom* aAttribute,
-                              const nsHTMLValue& aValue,
-                              PRBool aNotify) = 0;
-
-  NS_IMETHOD GetHTMLAttribute(nsIAtom* aAttribute,
-                              nsHTMLValue& aValue) const = 0;
-  NS_IMETHOD GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc,
-                                          nsMapAttributesFunc& aMapFunc) const = 0;
-
-  NS_IMETHOD AttributeToString(nsIAtom* aAttribute,
-                               const nsHTMLValue& aValue,
-                               nsAWritableString& aResult) const = 0;
-
-  NS_IMETHOD StringToAttribute(nsIAtom* aAttribute,
-                               const nsAReadableString& aValue,
-                               nsHTMLValue& aResult) = 0;
-
-  /**
-   * Get the base URL for any relative URLs within this piece
-   * of content. Generally, this is the document's base URL,
-   * but certain content carries a local base for backward
-   * compatibility.
-   */
-  NS_IMETHOD GetBaseURL(nsIURI*& aBaseURL) const = 0;
-
-  /**
-   * Get the base target for any links within this piece
-   * of content. Generally, this is the document's base target,
-   * but certain content carries a local base for backward
-   * compatibility.
-   */
-  NS_IMETHOD GetBaseTarget(nsAWritableString& aBaseTarget) const = 0;
-};
-
-#endif /* nsIHTMLContent_h___ */

mozilla/ef/Compiler/RegisterAllocator/BitSet.cpp

@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "BitSet.h"
+
+// Return the next bit after index set to true or -1 if none.
+//
+Int32 BitSet::nextOne(Int32 pos) const
+{
+	++pos;
+
+	if (pos < 0 || Uint32(pos) >= universeSize)
+		return -1;
+
+	Uint32 offset = getWordOffset(pos);
+	Uint8 index = getBitOffset(pos);
+	Word* ptr = &word[offset];
+	Word currentWord = *ptr++ >> index;
+	
+	if (currentWord != Word(0)) {
+		while ((currentWord & Word(1)) == 0) {
+			++index;
+			currentWord >>= 1;
+		}
+		return (offset << nBitsInWordLog2) + index;
+	}
+
+	Word* limit = &word[getSizeInWords(universeSize)];
+	while (ptr < limit) {
+		++offset;
+		currentWord = *ptr++;
+		if (currentWord != Word(0)) {
+			index = 0;
+			while ((currentWord & Word(1)) == 0) {
+				++index;
+				currentWord >>= 1;
+			}
+			return (offset << nBitsInWordLog2) + index;
+		}
+	}
+	return -1;
+}
+
+// Return the next bit after index set to false or -1 if none.
+//
+Int32 BitSet::nextZero(Int32 pos) const
+{
+	++pos;
+
+	if (pos < 0 || Uint32(pos) >= universeSize)
+		return -1;
+
+	Uint32 offset = getWordOffset(pos);
+	Uint8 index = getBitOffset(pos);
+	Word* ptr = &word[offset];
+	Word currentWord = *ptr++ >> index;
+	
+	if (currentWord != Word(~0)) {
+		for (; index < nBitsInWord; ++index) {
+			if ((currentWord & Word(1)) == 0) {
+				Int32 ret = (offset << nBitsInWordLog2) + index;
+				return (Uint32(ret) < universeSize) ? ret : -1;
+			}
+			currentWord >>= 1;
+		}
+	}
+
+	Word* limit = &word[getSizeInWords(universeSize)];
+	while (ptr < limit) {
+		++offset;
+		currentWord = *ptr++;
+		if (currentWord != Word(~0)) {
+			for (index = 0; index < nBitsInWord; ++index) {
+				if ((currentWord & Word(1)) == 0) {
+					Int32 ret = (offset << nBitsInWordLog2) + index;
+					return (Uint32(ret) < universeSize) ? ret : -1;
+				}
+				currentWord >>= 1;
+			}
+		}
+	}
+	return -1;
+}
+
+#ifdef DEBUG_LOG
+
+// Print the set.
+//
+void BitSet::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("[ "));
+
+	for (Int32 i = firstOne(); i != -1; i = nextOne(i)) {
+		Int32 currentBit = i;
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%d", currentBit));
+
+		Int32 nextBit = nextOne(currentBit);
+		if (nextBit != currentBit + 1) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" "));
+			continue;
+		}
+		  
+		while ((nextBit != -1) && (nextBit == (currentBit + 1))) {
+			currentBit = nextBit;
+			nextBit = nextOne(nextBit);
+		}
+
+		if (currentBit > (i+1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("-%d ", currentBit));
+		else
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" %d ", currentBit));
+
+		i = currentBit;
+	}
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("]\n"));
+}
+
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/BitSet.h

@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _BITSET_H_
+#define _BITSET_H_
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "Pool.h"
+#include <string.h>
+
+//------------------------------------------------------------------------------
+// BitSet -
+
+class BitSet
+{
+private:
+
+#if (PR_BITS_PER_WORD == 64)
+	typedef Uint64 Word;
+#elif (PR_BITS_PER_WORD == 32)
+	typedef Uint32 Word;
+#endif
+
+	static const nBitsInWord = 		PR_BITS_PER_WORD;
+	static const nBytesInWord = 	PR_BYTES_PER_WORD;
+	static const nBitsInWordLog2 =	PR_BITS_PER_WORD_LOG2;
+	static const nBytesInWordLog2 = PR_BYTES_PER_WORD_LOG2;
+
+	// Return the number of Word need to store the universe.
+	static Uint32 getSizeInWords(Uint32 sizeOfUniverse) {return (sizeOfUniverse + (nBitsInWord - 1)) >> nBitsInWordLog2;}
+	// Return the given element offset in its containing Word.
+	static Uint32 getBitOffset(Uint32 element) {return element & (nBitsInWord - 1);}
+	// Return the Word offset for the given element int the universe.
+	static Uint32 getWordOffset(Uint32 element) {return element >> nBitsInWordLog2;}
+	// Return the mask for the given bit index.
+	static Word getMask(Uint8 index) {return Word(1) << index;}
+	
+private:
+
+	Uint32							universeSize;			// Size of the universe
+	Word*							word;					// universe memory.
+
+private:
+
+	// No copy constructor.
+	BitSet(const BitSet&);
+
+	// Check if the given set's universe is of the same size than this universe.
+	void checkUniverseCompatibility(const BitSet& set) const {assert(set.universeSize == universeSize);}
+	// Check if pos is valid for this set's universe.
+	void checkMember(Int32 pos) const {assert(pos >=0 && Uint32(pos) < universeSize);}
+
+public:
+
+	// Create a bitset of universeSize bits.
+	BitSet(Pool& pool, Uint32 universeSize) : universeSize(universeSize) {word = new(pool) Word[getSizeInWords(universeSize)]; clear();}
+
+	// Return the size of this bitset.
+	Uint32 getSize() const {return universeSize;}
+
+	// Clear the bitset.
+	void clear() {memset(word, 0x00, getSizeInWords(universeSize) << nBytesInWordLog2);}
+	// Clear the bit at index.
+	void clear(Uint32 index) {checkMember(index); word[getWordOffset(index)] &= ~getMask(index);}
+	// Set the bitset.
+	void set() {memset(word, 0xFF, getSizeInWords(universeSize) << nBytesInWordLog2);}
+	// Set the bit at index.
+	void set(Uint32 index) {checkMember(index); word[getWordOffset(index)] |= getMask(index);}
+	// Return true if the bit at index is set.
+	bool test(Uint32 index) const {checkMember(index); return (word[getWordOffset(index)] & getMask(index)) != 0;}
+	// Union with the given bitset.
+	inline void or(const BitSet& set);
+	// Intersection with the given bitset.
+	inline void and(const BitSet& set);
+	// Difference with the given bitset.
+	inline void difference(const BitSet& set);
+	// Copy set.
+	inline BitSet& operator = (const BitSet& set);
+	// Return true if the bitset are identical.
+	friend bool operator == (const BitSet& set1, const BitSet& set2);
+	// Return true if the bitset are different.
+	friend bool operator != (const BitSet& set1, const BitSet& set2);
+
+	// Logical operators.
+	BitSet& operator |= (const BitSet& set) {or(set); return *this;}
+	BitSet& operator &= (const BitSet& set) {and(set); return *this;}
+	BitSet& operator -= (const BitSet& set) {difference(set); return *this;}
+
+	// Return the first bit at set to true or -1 if none.
+	Int32 firstOne() const {return nextOne(-1);}
+	// Return the next bit after index set to true or -1 if none.
+	Int32 nextOne(Int32 pos) const;
+	// Return the first bit at set to false or -1 if none.
+	Int32 firstZero() const {return nextZero(-1);}
+	// Return the next bit after index set to false or -1 if none.
+	Int32 nextZero(Int32 pos) const;
+
+	// Iterator to conform with the set API.
+	typedef Int32 iterator;
+	// Return true if the walk is ordered.
+	static bool isOrdered() {return true;}
+	// Return the iterator for the first element of this set.
+	iterator begin() const {return firstOne();}
+	// Return the next iterator.
+	iterator advance(iterator pos) const {return nextOne(pos);}
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos == -1;}
+	// Return the element corresponding to the given iterator.
+	Uint32 get(iterator pos) const {return pos;}
+
+#ifdef DEBUG_LOG
+	// Print the set.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+// Union with the given bitset.
+//
+inline void  BitSet::or(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ |= *src++;
+}
+
+// Intersection with the given bitset.
+//
+inline void  BitSet::and(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ &= *src++;
+}
+
+// Difference with the given bitset.
+//
+inline void BitSet::difference(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ &= ~*src++;
+}
+
+// Copy the given set into this set.
+//
+inline BitSet& BitSet::operator = (const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	if (this != &set)
+		memcpy(word, set.word, getSizeInWords(universeSize) << nBytesInWordLog2);
+	return *this;
+}
+
+// Return true if the given set is identical to this set.
+inline bool operator == (const BitSet& set1, const BitSet& set2)
+{
+	set1.checkUniverseCompatibility(set2);
+
+	if (&set1 == &set2)
+		return true;
+
+	return memcmp(set1.word, set2.word, BitSet::getSizeInWords(set1.universeSize) << BitSet::nBytesInWordLog2) == 0;
+}
+
+inline bool operator != (const BitSet& set1, const BitSet& set2) {return !(set1 == set2);}
+
+#endif // _BITSET_H

mozilla/ef/Compiler/RegisterAllocator/Coalescing.h

@@ -0,0 +1,159 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _COALESCING_H_
+#define _COALESCING_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "RegisterPressure.h"
+#include "InterferenceGraph.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "SparseSet.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+#if 1
+// Performing an ultra conservative coalescing meens that when we look at
+// candidates (source,destination) for coalescing we need to make sure
+// that the combined interference of the source and destination register
+// will not exceed the total number of register available for the register
+// class. 
+#define ULTRA_CONSERVATIVE_COALESCING
+#else
+// If we are not doing an ultra conservative coalescing we have to make sure 
+// that the total number of neighbor whose degree is greater than the total 
+// number of register is not greater than the total number of register.
+#undef ULTRA_CONSERVATIVE_COALESCING
+#endif
+
+template <class RegisterPressure>
+struct Coalescing
+{
+	static bool coalesce(RegisterAllocator& registerAllocator);
+};
+
+template <class RegisterPressure>
+bool Coalescing<RegisterPressure>::coalesce(RegisterAllocator& registerAllocator)
+{
+	Pool& pool = registerAllocator.pool;
+
+   	// Initialize the lookup table
+	//
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* newRange = new RegisterName[2 * rangeCount];
+	RegisterName* coalescedRange = &newRange[rangeCount];
+	RegisterName* name2range = registerAllocator.name2range;
+
+	init(coalescedRange, rangeCount);
+
+	SparseSet interferences(pool, rangeCount);
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+	bool removedInstructions = false;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.lndList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+
+	// Walk the nodes in the loop nesting depth list.
+	for (Int32 n = nNodes - 1; n >= 0; n--) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		InstructionList::iterator it = instructions.begin();
+		while (!instructions.done(it)) {
+			Instruction& instruction = instructions.get(it);
+			it = instructions.advance(it);
+
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(instruction.getInstructionUseBegin() != instruction.getInstructionUseEnd() && instruction.getInstructionUseBegin()[0].isRegister());
+				assert(instruction.getInstructionDefineBegin() != instruction.getInstructionDefineEnd() && instruction.getInstructionDefineBegin()[0].isRegister());
+
+				RegisterName source = findRoot(name2range[instruction.getInstructionUseBegin()[0].getRegisterName()], coalescedRange);
+				RegisterName destination = findRoot(name2range[instruction.getInstructionDefineBegin()[0].getRegisterName()], coalescedRange);
+
+				if (source == destination) {
+					instruction.remove();
+				} else if (!iGraph.interfere(source, destination)) {
+					InterferenceVector* sourceVector = iGraph.getInterferenceVector(source);
+					InterferenceVector* destinationVector = iGraph.getInterferenceVector(destination);
+
+#ifdef ULTRA_CONSERVATIVE_COALESCING
+					interferences.clear();
+
+					InterferenceVector* vector;
+					for (vector = sourceVector; vector != NULL; vector = vector->next) {
+						RegisterName* neighbors = vector->neighbors;
+						for (Uint32 i = 0; i < vector->count; i++)
+							interferences.set(findRoot(neighbors[i], coalescedRange));
+					}
+					for (vector = destinationVector; vector != NULL; vector = vector->next) {
+						RegisterName* neighbors = vector->neighbors;
+						for (Uint32 i = 0; i < vector->count; i++)
+							interferences.set(findRoot(neighbors[i], coalescedRange));
+					}
+
+					Uint32 count = interferences.getSize();
+#else // ULTRA_CONSERVATIVE_COALESCING
+					trespass("not implemented");
+					Uint32 count = 0;
+#endif // ULTRA_CONSERVATIVE_COALESCING
+
+					if (count < 6 /* FIX: should get the number from the class */) {
+						// Update the interferences vector.
+						if (sourceVector == NULL) {
+							iGraph.setInterferenceVector(source, destinationVector);
+							sourceVector = destinationVector;
+						} else if (destinationVector == NULL)
+							iGraph.setInterferenceVector(destination, sourceVector);
+						else {
+							InterferenceVector* last = NULL;
+							for (InterferenceVector* v = sourceVector; v != NULL; v = v->next)
+								last = v;
+							assert(last);
+							last->next = destinationVector;
+							iGraph.setInterferenceVector(destination, sourceVector);
+						}
+						// Update the interference matrix.
+						for (InterferenceVector* v = sourceVector; v != NULL; v = v->next) {
+							RegisterName* neighbors = v->neighbors;
+							for (Uint32 i = 0; i < v->count; i++) {
+								RegisterName neighbor = findRoot(neighbors[i], coalescedRange);
+								iGraph.setInterference(neighbor, source);
+								iGraph.setInterference(neighbor, destination);
+							}
+						}
+
+						instruction.remove();
+						coalescedRange[source] = destination;
+						removedInstructions = true;
+					}
+				}
+			}
+		}
+	}
+
+	registerAllocator.rangeCount = compress(registerAllocator.name2range, coalescedRange, registerAllocator.nameCount, rangeCount);
+	delete newRange;
+
+	return removedInstructions;
+}
+
+#endif // _COALESCING_H_

mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp

@@ -0,0 +1,283 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef NEW_LAURENTM_CODE
+
+#include "Coloring.h"
+#include "VirtualRegister.h"
+#include "FastBitSet.h"
+#include "FastBitMatrix.h"
+#include "CpuInfo.h"
+
+bool Coloring::
+assignRegisters(FastBitMatrix& interferenceMatrix)
+{
+  PRUint32 *stackPtr = new(pool) PRUint32[vRegManager.count()];
+
+  return select(interferenceMatrix, stackPtr, simplify(interferenceMatrix, stackPtr));
+}
+
+PRInt32 Coloring::
+getLowestSpillCostRegister(FastBitSet& bitset)
+{
+  PRInt32 lowest = bitset.firstOne();
+  if (lowest != -1)
+	{
+	  Flt32 cost = vRegManager.getVirtualRegister(lowest).spillInfo.spillCost;
+	  for (PRInt32 r = bitset.nextOne(lowest); r != -1; r = bitset.nextOne(r))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+		  if (!vReg.spillInfo.infiniteSpillCost && (vReg.spillInfo.spillCost < cost))
+			{
+			  cost = vReg.spillInfo.spillCost;
+			  lowest = r;
+			}
+		}
+	}
+  return lowest;
+}
+
+PRUint32* Coloring::
+simplify(FastBitMatrix interferenceMatrix, PRUint32* stackPtr)
+{
+  // first we construct the sets low and high. low contains all nodes of degree
+  // inferior to the number of register available on the processor. All the
+  // nodes with an high degree and a finite spill cost are placed in high.
+  // Nodes of high degree and infinite spill cost are not included in either sets.
+
+  PRUint32 nRegisters = vRegManager.count();
+  FastBitSet low(pool, nRegisters);
+  FastBitSet high(pool, nRegisters);
+  FastBitSet stack(pool, nRegisters);
+
+  for (VirtualRegisterManager::iterator i = vRegManager.begin(); !vRegManager.done(i); i = vRegManager.advance(i))
+	{
+	  VirtualRegister& vReg = vRegManager.getVirtualRegister(i);
+	  
+	  if (vReg.getClass() == vrcStackSlot)
+		{
+		  stack.set(i);
+		  vReg.colorRegister(nRegisters);
+		}
+	  else
+		{
+		  if (vReg.colorInfo.interferenceDegree < NUMBER_OF_REGISTERS)
+			low.set(i);
+		  else // if (!vReg.spillInfo.infiniteSpillCost)
+			high.set(i);
+
+		  // Set coloring info.
+		  vReg.spillInfo.willSpill = false;
+
+		  switch(vReg.getClass())
+			{
+			case vrcInteger:
+			  vReg.colorRegister(LAST_GREGISTER + 1);
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+			  vReg.colorRegister(LAST_FPREGISTER + 1);
+			  break;
+			default:
+			  PR_ASSERT(false); // Cannot happen.
+			}
+		}
+	}
+
+  // push the stack registers
+  PRInt32 j;
+  for (j = stack.firstOne(); j != -1; j = stack.nextOne(j))
+	*stackPtr++ = j;
+
+  // simplify
+  while (true)
+	{
+	  PRInt32 r;
+	  while ((r = getLowestSpillCostRegister(low)) != -1)
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+
+		  /* update low and high */
+		  FastBitSet inter(interferenceMatrix.getRow(r), nRegisters);
+		  for (j = inter.firstOne(); j != -1; j = inter.nextOne(j))
+			{
+			  VirtualRegister& neighbor = vRegManager.getVirtualRegister(j);
+			  // if the new interference degree of one of his neighbor becomes
+			  // NUMBER_OF_REGISTERS - 1 then it is added to the set 'low'.
+			  
+			  PRUint32 maxInterference = 0;
+			  switch (neighbor.getClass())
+				{
+				case vrcInteger:
+				  maxInterference = NUMBER_OF_GREGISTERS;
+				  break;
+				case vrcFloatingPoint:
+				case vrcFixedPoint:
+				  maxInterference = NUMBER_OF_FPREGISTERS;
+				  break;
+				default:
+				  PR_ASSERT(false);
+				}
+			  if ((vRegManager.getVirtualRegister(j).colorInfo.interferenceDegree-- == maxInterference))
+				{
+				  high.clear(j);
+				  low.set(j);
+				}
+			  vReg.colorInfo.interferenceDegree--;
+			  interferenceMatrix.clear(r, j);
+			  interferenceMatrix.clear(j, r);
+			}
+		  low.clear(r);
+
+		  // Push this register.
+		  *stackPtr++ = r;
+		}
+	  if ((r = getLowestSpillCostRegister(high)) != -1)
+		{
+		  high.clear(r);
+		  low.set(r);
+		}
+	  else
+		break;
+	}
+
+  return stackPtr;
+}
+
+bool Coloring::
+select(FastBitMatrix& interferenceMatrix, PRUint32* stackBase, PRUint32* stackPtr)
+{
+  PRUint32 nRegisters = vRegManager.count();
+  FastBitSet usedRegisters(NUMBER_OF_REGISTERS + 1); // usedRegisters if used for both GR & FPR.
+  FastBitSet preColoredRegisters(NUMBER_OF_REGISTERS + 1);
+  FastBitSet usedStack(nRegisters + 1);
+  bool success = true;
+  Int32 lastUsedSSR = -1;
+
+  // select
+  while (stackPtr != stackBase)
+	{
+	  // Pop one register.
+	  PRUint32 r = *--stackPtr;
+	  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+
+	  FastBitSet neighbors(interferenceMatrix.getRow(r), nRegisters);
+		  
+	  if (vReg.getClass() == vrcStackSlot)
+		// Stack slots coloring.
+		{
+		  usedStack.clear();
+
+		  for (PRInt32 i = neighbors.firstOne(); i != -1; i = neighbors.nextOne(i))
+			usedStack.set(vRegManager.getVirtualRegister(i).getColor());
+
+		  Int32 color = usedStack.firstZero();
+		  vReg.colorRegister(color);
+		  if (color > lastUsedSSR)
+			  lastUsedSSR = color;
+		}
+	  else
+		// Integer & Floating point register coloring.
+		{
+		  usedRegisters.clear();
+		  preColoredRegisters.clear();
+		  
+		  for (PRInt32 i = neighbors.firstOne(); i != -1; i = neighbors.nextOne(i))
+			{
+			  VirtualRegister& nvReg = vRegManager.getVirtualRegister(i);
+			  usedRegisters.set(nvReg.getColor());
+			  if (nvReg.isPreColored())
+				preColoredRegisters.set(nvReg.getPreColor());
+			}
+		  if (vReg.hasSpecialInterference)
+			usedRegisters |= vReg.specialInterference;
+
+		  PRInt8 c = -1;
+		  PRInt8 maxColor = 0;
+		  PRInt8 firstColor = 0;
+		  switch (vReg.getClass())
+			{
+			case vrcInteger:
+			  firstColor = FIRST_GREGISTER;
+			  maxColor = LAST_GREGISTER;
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+			  firstColor = FIRST_FPREGISTER;
+			  maxColor = LAST_FPREGISTER;
+			  break;
+			default:
+			  PR_ASSERT(false);
+			}
+
+		  if (vReg.isPreColored())
+			{
+			  c = vReg.getPreColor();
+			  if (usedRegisters.test(c))
+				c = -1;
+			}
+		  else
+			{
+			  for (c = usedRegisters.nextZero(firstColor - 1); (c >= 0) && (c <= maxColor) && (preColoredRegisters.test(c)); 
+				   c = usedRegisters.nextZero(c)) {}
+			}
+
+		  if ((c >= 0) && (c <= maxColor))
+			{
+			  vReg.colorRegister(c);
+			}
+		  else
+			{
+			  VirtualRegister& stackRegister = vRegManager.newVirtualRegister(vrcStackSlot);
+			  vReg.equivalentRegister[vrcStackSlot] = &stackRegister;	  
+			  vReg.spillInfo.willSpill = true;
+			  success = false;
+			}
+		}
+	}
+  
+#ifdef DEBUG
+  if (success)
+	{
+	  for (VirtualRegisterManager::iterator i = vRegManager.begin(); !vRegManager.done(i); i = vRegManager.advance(i))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(i);
+		  switch (vReg.getClass())
+			{
+			case vrcInteger:
+			  if (vReg.getColor() > LAST_GREGISTER)
+				PR_ASSERT(false);
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+#if NUMBER_OF_FPREGISTERS != 0
+			  if (vReg.getColor() > LAST_FPREGISTER)
+				PR_ASSERT(false);
+#endif
+			  break;
+			default:
+			  break;
+			}
+		}
+	}
+#endif
+
+  vRegManager.nUsedStackSlots = lastUsedSSR + 1;
+  return success;
+}
+#endif // NEW_LAURENTM_CODE

mozilla/ef/Compiler/RegisterAllocator/Coloring.h

@@ -0,0 +1,284 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "VirtualRegister.h"
+#include "InterferenceGraph.h"
+#include "SparseSet.h"
+#include "Spilling.h"
+#include "Splits.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+template <class RegisterPressure>
+class Coloring
+{
+private:
+	static RegisterName* simplify(RegisterAllocator& registerAllocator, RegisterName* coloringStack);
+	static bool select(RegisterAllocator& registerAllocator, RegisterName* coloringStack, RegisterName* coloringStackPtr);
+
+public:
+	static bool color(RegisterAllocator& registerAllocator);
+	static void finalColoring(RegisterAllocator& registerAllocator);
+};
+
+
+template <class RegisterPressure>
+void Coloring<RegisterPressure>::finalColoring(RegisterAllocator& registerAllocator)
+{
+	RegisterName* color = registerAllocator.color;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					usePtr->setRegisterName(color[name2range[usePtr->getRegisterName()]]);
+#ifdef DEBUG
+					RegisterID rid = usePtr->getRegisterID();
+					setColoredRegister(rid);
+					usePtr->setRegisterID(rid);
+#endif // DEBUG
+				}
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					definePtr->setRegisterName(color[name2range[definePtr->getRegisterName()]]);
+#ifdef DEBUG
+					RegisterID rid = definePtr->getRegisterID();
+					setColoredRegister(rid);
+					definePtr->setRegisterID(rid);
+#endif // DEBUG
+				}
+		}
+	}
+}
+
+template <class RegisterPressure>
+bool Coloring<RegisterPressure>::select(RegisterAllocator& registerAllocator, RegisterName* coloringStack, RegisterName* coloringStackPtr)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* color = new RegisterName[rangeCount];
+	registerAllocator.color = color;
+
+	for (Uint32 r = 1; r < rangeCount; r++)
+		color[r] = RegisterName(6); // FIX;
+
+	// Color the preColored registers.
+	//
+	VirtualRegisterManager& vrManager = registerAllocator.vrManager;
+	RegisterName* name2range = registerAllocator.name2range;
+	PreColoredRegister* machineEnd = vrManager.getMachineRegistersEnd();
+	for (PreColoredRegister* machinePtr = vrManager.getMachineRegistersBegin(); machinePtr < machineEnd; machinePtr++)
+		if (machinePtr->id != invalidID) {
+			color[name2range[getName(machinePtr->id)]] = machinePtr->color;
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\twill preColor range %d as %d\n", name2range[getName(machinePtr->id)], machinePtr->color));
+		}
+
+	SpillCost* cost = registerAllocator.spillCost;
+	Pool& pool = registerAllocator.pool;
+	SparseSet& spill = *new(pool) SparseSet(pool, rangeCount);
+	registerAllocator.willSpill = &spill;
+	SparseSet neighborColors(pool, 6); // FIX
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+
+	bool coloringFailed = false;
+	while (coloringStackPtr > coloringStack) {
+		RegisterName range = *--coloringStackPtr;
+
+		if (!cost[range].infinite && cost[range].cost < 0) {
+			coloringFailed = true;
+			spill.set(range);
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tfailed to color %d, will spill.\n", range));
+		} else {
+			neighborColors.clear();
+
+			for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+				for (Int32 i = vector->count - 1; i >= 0; --i) {
+					RegisterName neighborColor = color[vector->neighbors[i]];
+					if (neighborColor < 6) // FIX
+						neighborColors.set(neighborColor);
+				}
+
+			if (neighborColors.getSize() == 6) { // FIX
+				coloringFailed = true;
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tfailed to color %d, ", range));
+
+				if (!Splits<RegisterPressure>::findSplit(registerAllocator, color, range)) {
+					UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("will spill.\n"));
+					spill.set(range);
+				} else
+					UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("will split.\n"));
+			} else {
+				for (Uint32 i = 0; i < 6; i++) // FIX
+					if (!neighborColors.test(i)) {
+						fprintf(stdout, "\twill color %d as %d\n", range, i);
+						color[range] = RegisterName(i);
+						break;
+					}
+			}
+		}
+	}
+
+#ifdef DEBUG_LOG
+	if (coloringFailed) {
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring failed:\n"));
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\twill spill: "));
+		spill.printPretty(UT_LOG_MODULE(RegAlloc));
+	} else {
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring succeeded:\n"));
+		for (Uint32 i = 1; i < rangeCount; i++)
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\trange %d colored as %d\n", i, color[i]));
+	}
+#endif
+
+	return !coloringFailed;
+}
+
+template <class RegisterPressure>
+RegisterName* Coloring<RegisterPressure>::simplify(RegisterAllocator& registerAllocator, RegisterName* coloringStack)
+{
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+	SpillCost* spillCost = registerAllocator.spillCost;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+
+	Uint32* degree = new Uint32[rangeCount];
+	for (RegisterName i = RegisterName(1); i < rangeCount; i = RegisterName(i + 1)) {
+		InterferenceVector* vector = iGraph.getInterferenceVector(i);
+		degree[i] = (vector != NULL) ? vector->count : 0;
+	}
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet low(pool, rangeCount);
+	SparseSet high(pool, rangeCount);
+	SparseSet highInfinite(pool, rangeCount);
+	SparseSet preColored(pool, rangeCount);
+
+	// Get the precolored registers.
+	//
+	VirtualRegisterManager& vrManager = registerAllocator.vrManager;
+	RegisterName* name2range = registerAllocator.name2range;
+	PreColoredRegister* machineEnd = vrManager.getMachineRegistersEnd();
+	for (PreColoredRegister* machinePtr = vrManager.getMachineRegistersBegin(); machinePtr < machineEnd; machinePtr++)
+		if (machinePtr->id != invalidID)
+			preColored.set(name2range[getName(machinePtr->id)]);
+
+	// Insert the live ranges in the sets.
+	//
+	for (Uint32 range = 1; range < rangeCount; range++)
+		if (!preColored.test(range))
+			if (degree[range] < 6) // FIX
+				low.set(range);
+			else if (!spillCost[range].infinite)
+				high.set(range);
+			else
+				highInfinite.set(range);
+
+#ifdef DEBUG_LOG
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring sets:\n\tlow = "));
+	low.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\thigh = "));
+	high.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\thighInfinite = "));
+	highInfinite.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tpreColored = "));
+	preColored.printPretty(UT_LOG_MODULE(RegAlloc));
+#endif // DEBUG_LOG
+
+	RegisterName* coloringStackPtr = coloringStack;
+
+	while (low.getSize() != 0 || high.getSize() != 0) {
+		while (low.getSize() != 0) {
+			RegisterName range = RegisterName(low.getOne());
+			low.clear(range);
+			*coloringStackPtr++ = range;
+
+			for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+				for (Int32 i = (vector->count - 1); i >= 0; --i) {
+					RegisterName neighbor = vector->neighbors[i];
+					degree[neighbor]--;
+
+					if (degree[neighbor] < 6) // FIX
+						if (high.test(neighbor)) {
+							high.clear(neighbor);
+							low.set(neighbor);
+						} else if (highInfinite.test(neighbor)) {
+							highInfinite.clear(neighbor);
+							low.set(neighbor);
+						}
+				}
+		}
+
+		if (high.getSize() != 0) {
+			RegisterName best = RegisterName(high.getOne());
+			double bestCost = spillCost[best].cost;
+			double bestDegree = degree[best];
+
+			// Choose the next best candidate.
+			//
+			for (SparseSet::iterator i = high.begin(); !high.done(i); i = high.advance(i)) {
+				RegisterName range = RegisterName(high.get(i));
+				double thisCost = spillCost[range].cost;
+				double thisDegree = degree[range];
+
+				if (thisCost * bestDegree < bestCost * thisDegree) {
+					best = range;
+					bestCost = thisCost;
+					bestDegree = thisDegree;
+				}
+			}
+			
+			high.clear(best);
+			low.set(best);
+		}
+ 	}
+	assert(highInfinite.getSize() == 0);
+
+	delete degree;
+
+#ifdef DEBUG_LOG
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring stack:\n\t"));
+	for (RegisterName* sp = coloringStack; sp < coloringStackPtr; ++sp)
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("%d ", *sp));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\n"));
+#endif // DEBUG_LOG
+
+	return coloringStackPtr;
+}
+
+
+template <class RegisterPressure>
+bool Coloring<RegisterPressure>::color(RegisterAllocator& registerAllocator)
+{
+	RegisterName* coloringStack = new RegisterName[registerAllocator.rangeCount];
+	return select(registerAllocator, coloringStack, simplify(registerAllocator, coloringStack));
+}

mozilla/ef/Compiler/RegisterAllocator/DominatorGraph.cpp

@@ -0,0 +1,212 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+
+#include "DominatorGraph.h"
+
+DominatorGraph::DominatorGraph(ControlGraph& controlGraph) : controlGraph(controlGraph)
+{
+	Uint32 nNodes = controlGraph.nNodes;
+
+	GtoV = new Uint32[nNodes + 1];
+	VtoG = new Uint32[nNodes + 1];
+
+	Uint32 v = 1;
+	for (Uint32 n = 0; n < nNodes; n++) {
+		VtoG[v] = n;
+		GtoV[n] = v++;
+	}
+
+	// Initialize all the 1-based arrays.
+	//
+	parent =	new Uint32[v];
+	semi =		new Uint32[v];
+	vertex =	new Uint32[v];
+	label =		new Uint32[v];
+	size =		new Uint32[v];
+	ancestor =	new Uint32[v];
+	child =		new Uint32[v];
+	dom =		new Uint32[v];
+	bucket =	new DGLinkedList*[v];
+
+	memset(semi, '\0', v * sizeof(Uint32));
+	memset(bucket, '\0', v * sizeof(DGLinkedList*));
+
+	vCount = v;
+
+	build();
+
+	delete parent;
+	delete semi;
+	delete vertex;
+	delete label;
+	delete size;
+	delete ancestor;
+	delete child;
+	delete dom;
+	delete bucket;
+}
+
+Uint32 DominatorGraph::DFS(Uint32 vx, Uint32 n)
+{
+	semi[vx] = ++n;
+	vertex[n] = label[vx] = vx;
+	ancestor[vx] = child[vx] = 0;
+	size[vx] = 1;
+
+
+	ControlNode& node = *controlGraph.dfsList[VtoG[vx]];
+	ControlEdge* successorEnd = node.getSuccessorsEnd();
+	for (ControlEdge* successorPtr = node.getSuccessorsBegin(); successorPtr < successorEnd; successorPtr++) {
+		Uint32 w = GtoV[successorPtr->getTarget().dfsNum];
+		if (semi[w] == 0) {
+			parent[w] = vx;
+			n = DFS(w, n);
+		}
+	}
+	return n;
+}
+
+void DominatorGraph::LINK(Uint32 vx, Uint32 w)
+{
+    Uint32 s = w;
+
+	while (semi[label[w]] < semi[label[child[s]]]) {
+		if (size[s] + size[child[child[s]]] >= (size[child[s]] << 1)) {
+			ancestor[child[s]] = s;
+			child[s] = child[child[s]];
+		} else {
+			size[child[s]] = size[s];
+			s = ancestor[s] = child[s];
+		}
+	}
+	label[s] = label[w];
+	size[vx] += size[w];
+	if(size[vx] < (size[w] << 1)) {
+		Uint32 t = s;
+		s = child[vx]; 
+		child[vx] = t;
+	}
+	while( s != 0 ) {
+		ancestor[s] = vx;
+		s = child[s];
+	}
+}
+
+
+void DominatorGraph::COMPRESS(Uint32 vx)
+{
+	if(ancestor[ancestor[vx]] != 0) {
+		COMPRESS(ancestor[vx]);
+		if(semi[label[ancestor[vx]]] < semi[label[vx]])
+			label[vx] = label[ancestor[vx]];
+		ancestor[vx] = ancestor[ancestor[vx]];
+	}
+}
+
+Uint32 DominatorGraph::EVAL(Uint32 vx)
+{
+	if(ancestor[vx] == 0) 
+		return label[vx];
+	COMPRESS(vx);
+	return (semi[label[ancestor[vx]]] >= semi[label[vx]]) ? label[vx] : label[ancestor[vx]];
+}
+
+void DominatorGraph::build()
+{
+	Uint32 n = DFS(GtoV[0], 0);
+	size[0] = label[0] = semi[0];
+
+	for (Uint32 i = n; i >= 2; i--) {
+		Uint32 w = vertex[i];
+
+		ControlNode& node = *controlGraph.dfsList[VtoG[w]];
+		const DoublyLinkedList<ControlEdge>& predecessors = node.getPredecessors();
+		for (DoublyLinkedList<ControlEdge>::iterator p = predecessors.begin(); !predecessors.done(p); p = predecessors.advance(p)) {
+			Uint32 vx = GtoV[predecessors.get(p).getSource().dfsNum];
+			Uint32 u = EVAL(vx);
+
+			if(semi[u] < semi[w])
+				semi[w] = semi[u];
+		}
+
+		DGLinkedList* elem = new DGLinkedList();
+		elem->next = bucket[vertex[semi[w]]];
+		elem->index = w;
+		bucket[vertex[semi[w]]] = elem;
+
+		LINK(parent[w], w);
+
+		elem = bucket[parent[w]];
+		while(elem != NULL) {
+			Uint32 vx = elem->index;
+			Uint32 u = EVAL(vx);
+			dom[vx] = (semi[u] < semi[vx]) ? u : parent[w];
+			elem = elem->next;
+		}
+	}
+
+	memset(size, '\0', n * sizeof(Uint32));
+	Pool& pool = controlGraph.pool;
+	nodes = new(pool) DGNode[n];
+
+	for(Uint32 j = 2; j <= n; j++) {
+		Uint32 w = vertex[j];
+		Uint32 d = dom[w];
+		if(d != vertex[semi[w]]) {
+			d = dom[d];
+			dom[w] = d;
+		}
+		size[d]++;
+	}
+	dom[GtoV[0]] = 0;
+
+	for (Uint32 k = 1; k <= n; k++) {
+		DGNode& node = nodes[VtoG[k]];
+		Uint32 count = size[k];
+		node.successorsEnd = node.successorsBegin = (count) ? new(pool) Uint32[count] : (Uint32*) 0;
+	}
+
+	for (Uint32 l = 2; l <= n; l++)
+		*(nodes[VtoG[dom[l]]].successorsEnd)++ = VtoG[l];
+}
+
+#ifdef DEBUG_LOG
+void DominatorGraph::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Dominator Graph:\n"));
+	Uint32 nNodes = controlGraph.nNodes;
+	for (Uint32 i = 0; i < nNodes; i++) {
+		DGNode& node = nodes[i];
+		if (node.successorsBegin !=  node.successorsEnd) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tN%d dominates ", i));
+			for (Uint32* successorsPtr = node.successorsBegin; successorsPtr < node.successorsEnd; successorsPtr++)
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("N%d ", *successorsPtr));
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+		}
+	}
+}
+
+#endif // DEBUG_LOG
+
+
+

mozilla/ef/Compiler/RegisterAllocator/DominatorGraph.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _DOMINATOR_GRAPH_H_
+#define _DOMINATOR_GRAPH_H_
+
+#include "LogModule.h"
+
+class ControlGraph;
+
+struct DGNode
+{
+	Uint32* successorsBegin;
+	Uint32* successorsEnd;
+};
+
+struct DGLinkedList
+{
+	DGLinkedList* next;
+	Uint32 index;
+};
+
+class DominatorGraph
+{
+private:
+
+	ControlGraph&	controlGraph;
+
+	Uint32			vCount;
+
+	Uint32*			VtoG;
+	Uint32*			GtoV;
+	Uint32*			parent;
+	Uint32*			semi;
+	Uint32*			vertex;
+	Uint32*			label;
+	Uint32*			size;
+	Uint32*			ancestor;
+	Uint32*			child;
+	Uint32*			dom;
+	DGLinkedList**	bucket;
+	DGNode*			nodes;
+	
+private:
+
+	void build();
+
+	Uint32 DFS(Uint32 vx, Uint32 n);
+	void LINK(Uint32 vx, Uint32 w);
+	void COMPRESS(Uint32 vx);
+	Uint32 EVAL(Uint32 vx);
+
+public:
+
+	DominatorGraph(ControlGraph& controlGraph);
+
+	Uint32* getSuccessorsBegin(Uint32 n) const {return nodes[n].successorsBegin;}
+	Uint32* getSuccessorsEnd(Uint32 n) const {return nodes[n].successorsEnd;}
+
+#ifdef DEBUG_LOG
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+#endif // _DOMINATOR_GRAPH_H_

mozilla/ef/Compiler/RegisterAllocator/HashSet.cpp

@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "HashSet.h"

mozilla/ef/Compiler/RegisterAllocator/HashSet.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _HASH_SET_H_
+#define _HASH_SET_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include <string.h>
+
+struct HashSetElement
+{
+	Uint32 index;
+	HashSetElement* next;
+};
+
+class HashSet
+{
+private:
+
+	static const hashSize = 64;
+
+	// Return the hash code for the given element index.
+	static Uint32 getHashCode(Uint32 index) {return index & (hashSize - 1);} // Could be better !
+
+private:
+
+	Pool&					allocationPool;
+	HashSetElement**		bucket;
+	HashSetElement*			free;
+
+private:
+
+	// No copy constructor.
+	HashSet(const HashSet&);
+	// No copy operator.
+	void operator = (const HashSet&);
+
+public:
+
+	// Create a new HashSet.
+	inline HashSet(Pool& pool, Uint32 universeSize);
+
+	// Clear the hashset.
+	void clear();
+	// Clear the element for the given index.
+	void clear(Uint32 index);
+	// Set the element for the given index.
+	void set(Uint32 index);
+	// Return true if the element at index is a member.
+	bool test(Uint32 index) const;
+	// Union with the given hashset.
+	inline void or(const HashSet& set);
+	// Intersection with the given hashset.
+	inline void and(const HashSet& set);
+	// Difference with the given hashset.
+	inline void difference(const HashSet& set);
+
+	// Logical operators.
+	HashSet& operator |= (const HashSet& set) {or(set); return *this;}
+	HashSet& operator &= (const HashSet& set) {and(set); return *this;}
+	HashSet& operator -= (const HashSet& set) {difference(set); return *this;}
+
+	// Iterator to conform with the set API.
+	typedef HashSetElement* iterator;
+	// Return the iterator for the first element of this set.
+	iterator begin() const;
+	// Return the next iterator.
+	iterator advance(iterator pos) const;
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos == NULL;}
+};
+
+
+inline HashSet::HashSet(Pool& pool, Uint32 /*universeSize*/)
+	: allocationPool(pool), free(NULL)
+{
+	bucket = new(pool) HashSetElement*[hashSize];
+	memset(bucket, '\0', sizeof(HashSetElement*));
+}
+
+#endif // _HASH_SET_H_

mozilla/ef/Compiler/RegisterAllocator/IndexedPool.h

@@ -0,0 +1,213 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _INDEXED_POOL_H_
+#define _INDEXED_POOL_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include <stdlib.h>
+
+//------------------------------------------------------------------------------
+// IndexedPool<IndexedObjectSubclass> is an indexed pool of objects. The
+// template parameter 'IndexedObjectSubclass' must be a subclass of the struct
+// IndexedObject.
+// 
+// When the indexed pool is ask to allocate and initialize a new object (using
+// the operator new(anIndexedPool) it will zero the memory used to store the
+// object and initialize the field 'index' of this object to its position in
+// the pool.
+//
+// An object allocated by the indexed pool can be freed by calling the method
+// IndexedPool::release(IndexedElement& objectIndex).
+//
+// example:
+//
+//   IndexedPool<IndexedElement> elementPool;
+//
+//   IndexedElement& element1 = *new(elementPool) IndexedElement();
+//   IndexedElement& element2 = *new(elementPool) IndexedElement();
+//
+//   indexedPool.release(element1);
+//   IndexedElement& element3 = *new(elementPool) IndexedElement();
+//
+//  At this point element1 is no longer a valid object, element2 is at
+//  index 2 and element3 is at index 1.
+//
+
+//------------------------------------------------------------------------------
+// IndexedObject -
+//
+
+template<class Object>
+struct IndexedObject
+{
+	Uint32			index;				// Index in the pool.
+	Object*			next;				// Used to link IndexedObject together.
+
+	Uint32 getIndex() {return index;}
+};
+
+//------------------------------------------------------------------------------
+// IndexedPool<IndexedObject> -
+//
+
+template <class IndexedObject>
+class IndexedPool
+{
+private:
+
+	static const	blockSize = 4;		// Size of one block.
+
+	Uint32			nBlocks;			// Number of blocks in the pool.
+	IndexedObject**	block;				// Array of block pointers.
+	IndexedObject*  freeObjects;		// Chained list of free IndexedObjects.
+	Uint32			nextIndex;			// Index of the next free object in the last block. 
+
+private:
+
+	void allocateAnotherBlock();
+	IndexedObject& newObject();
+
+public:
+
+	IndexedPool() : nBlocks(0), block(NULL), freeObjects(NULL), nextIndex(1) {}
+	~IndexedPool();
+
+	IndexedObject& get(Uint32 index) const;
+	void release(IndexedObject& object);
+
+	void setSize(Uint32 size) {assert(size < nextIndex); nextIndex = size;}
+
+	// Return the universe size.
+	Uint32 getSize() {return nextIndex;}
+
+	friend void* operator new(size_t, IndexedPool<IndexedObject>& pool); // Needs to call newObject().
+};
+
+// Free all the memory allocated for this object.
+//
+template <class IndexedObject>
+IndexedPool<IndexedObject>::~IndexedPool()
+{
+	for (Uint32 n = 0; n < nBlocks; n++)
+		free(&((IndexedObject **) &block[n][n*blockSize])[-(n + 1)]);
+}
+
+// Release the given. This object will be iserted in the chained
+// list of free IndexedObjects. To minimize the fragmentation the chained list 
+// is ordered by ascending indexes.
+//
+template <class IndexedObject>
+void IndexedPool<IndexedObject>::release(IndexedObject& object)
+{
+	Uint32 index = object.index;
+	IndexedObject* list = freeObjects;
+
+	assert(&object == &get(index)); // Make sure that object is owned by this pool.
+
+	if (list == NULL) { // The list is empty.
+		freeObjects = &object;
+		object.next = NULL;
+	} else { // The list contains at least 1 element.
+		if (index < list->index) { // insert as first element.
+			freeObjects = &object;
+			object.next = list;
+		} else { // Find this object's place.
+			while ((list->next) != NULL && (list->next->index < index))
+				list = list->next;
+
+			object.next = list->next;
+			list->next = &object;
+		}
+	}
+
+#ifdef DEBUG
+	// Sanity check to be sure that the list is correctly ordered.
+	for (IndexedObject* obj = freeObjects; obj != NULL; obj = obj->next)
+		if (obj->next != NULL)
+			assert(obj->index < obj->next->index);
+#endif
+}
+
+// Create a new block of IndexedObjects. We will allocate the memory to
+// store IndexedPool::blockSize IndexedObject and the new Array of block
+// pointers.
+// The newly created IndexedObjects will not be initialized.
+//
+template <class IndexedObject>
+void IndexedPool<IndexedObject>::allocateAnotherBlock()
+{
+	void* memory = (void *) malloc((nBlocks + 1) * sizeof(Uint32) + blockSize * sizeof(IndexedObject));
+
+	memcpy(memory, block, nBlocks * sizeof(Uint32));
+
+	block = (IndexedObject **) memory;
+	IndexedObject* objects = (IndexedObject *) &block[nBlocks + 1];
+
+	block[nBlocks] = &objects[-(nBlocks * blockSize)];
+	nBlocks++;
+}
+
+// Return the IndexedObject at the position 'index' in the pool.
+//
+template <class IndexedObject>
+IndexedObject& IndexedPool<IndexedObject>::get(Uint32 index) const
+{
+	Uint32 blockIndex = index / blockSize;
+	assert(blockIndex < nBlocks);
+
+	return block[blockIndex][index];
+}
+
+// Return the reference of an unused object in the pool.
+//
+template <class IndexedObject>
+IndexedObject& IndexedPool<IndexedObject>::newObject()
+{
+	if (freeObjects != NULL) {
+		IndexedObject& newObject = *freeObjects;
+		freeObjects = newObject.next;
+		return newObject;
+	}
+	
+	Uint32 nextIndex = this->nextIndex++;
+	Uint32 blockIndex = nextIndex / blockSize;
+
+	while (blockIndex >= nBlocks)
+		allocateAnotherBlock();
+	
+	IndexedObject& newObject = block[blockIndex][nextIndex];
+	newObject.index = nextIndex;
+
+	return newObject;
+}
+
+// Return the address of the next unsused object in the given
+// indexed pool. The field index of the newly allocated object
+// will be initialized to the corresponding index of this object
+// in the pool.
+//
+template <class IndexedObject>
+void* operator new(size_t size, IndexedPool<IndexedObject>& pool)
+{
+	assert(size == sizeof(IndexedObject));
+	return (void *) &pool.newObject();
+}
+
+#endif // _INDEXED_POOL_H_

mozilla/ef/Compiler/RegisterAllocator/InterferenceGraph.h

@@ -0,0 +1,258 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _INTERFERENCE_GRAPH_H_
+#define _INTERFERENCE_GRAPH_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "Primitives.h"
+#include "Instruction.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h"
+#include "SparseSet.h"
+#include <string.h>
+
+struct InterferenceVector
+{
+	Uint32				count;
+	InterferenceVector*	next;
+	RegisterName*		neighbors;
+
+	InterferenceVector() : count(0), next(NULL) {}
+};
+
+class RegisterAllocator;
+
+template <class RegisterPressure>
+class InterferenceGraph
+{
+private:
+
+	RegisterAllocator&			registerAllocator;
+
+	RegisterPressure::Set*		interferences;
+	InterferenceVector**		vector;
+	Uint32*						offset;
+	Uint32 						rangeCount;
+
+private:
+
+	// No copy constructor.
+	InterferenceGraph(const InterferenceGraph&);
+	// No copy operator.
+	void operator = (const InterferenceGraph&);
+
+	// Check if reg is a member of the universe.
+	void checkMember(RegisterName name) {assert(name < rangeCount);}
+	// Return the edge index for the interference between name1 and name2.
+	Uint32 getEdgeIndex(RegisterName name1, RegisterName name2);
+
+public:
+	InterferenceGraph(RegisterAllocator& registerAllocator) : registerAllocator(registerAllocator) {}
+
+	// Calculate the interferences.
+	void build();
+	// Return true if reg1 and reg2 interfere.
+	bool interfere(RegisterName name1, RegisterName name2);
+	// Return the interference vector for the given register or NULL if there is none.
+	InterferenceVector* getInterferenceVector(RegisterName name) {return vector[name];}
+	// Set the interference between name1 and name2.
+	void setInterference(RegisterName name1, RegisterName name2);
+	// Set the interference vector for the given register.
+	void setInterferenceVector(RegisterName name, InterferenceVector* v) {vector[name] = v;}
+
+
+#ifdef DEBUG_LOG
+	// Print the interferences.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::build()
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	this->rangeCount = rangeCount;
+
+	// Initialize the structures.
+	//
+	offset = new(pool) Uint32[rangeCount + 1];
+	vector = new(pool) InterferenceVector*[rangeCount];
+	memset(vector, '\0', sizeof(InterferenceVector*) * rangeCount);
+
+	Uint32 o = 0;
+	offset[0] = 0;
+	for (Uint32 i = 1; i <= rangeCount; ++i) {
+		offset[i] = o;
+		o += i;
+	}
+	
+	interferences = new(pool) RegisterPressure::Set(pool, (rangeCount * rangeCount) / 2);
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	RegisterName* name2range = registerAllocator.name2range;
+	LivenessInfo<RegisterPressure> liveness = Liveness<RegisterPressure>::analysis(controlGraph, rangeCount, name2range);
+	registerAllocator.liveness = liveness;
+	SparseSet currentLive(pool, rangeCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		currentLive = liveness.liveOut[n];
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			// Handle the copy instruction to avoid unnecessary interference between the 2 registers.
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				currentLive.clear(name2range[useBegin[0].getRegisterName()]);
+			}
+
+			// Create the interferences.
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					RegisterName define = name2range[definePtr->getRegisterName()];
+
+					for (SparseSet::iterator e = currentLive.begin(); !currentLive.done(e); e = currentLive.advance(e)) {
+						RegisterName live = RegisterName(currentLive.get(e));
+
+						if ((live != define) && !interfere(live, define) && registerAllocator.canInterfere(live, define)) {
+
+							if (vector[define] == NULL)
+								vector[define] = new(pool) InterferenceVector();
+							vector[define]->count++;
+
+							if (vector[live] == NULL)
+								vector[live] = new(pool) InterferenceVector();
+							vector[live]->count++;
+
+							setInterference(live, define);
+						}
+					}
+				}
+
+			// Now update the liveness.
+			//
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					currentLive.set(name2range[usePtr->getRegisterName()]);
+		}
+	}
+
+	// Allocate the memory to store the interferences.
+	//
+	for (Uint32 e = 0; e < rangeCount; e++)
+		if (vector[e] != NULL) {
+			InterferenceVector& v = *vector[e];
+			v.neighbors = new(pool) RegisterName[v.count];
+			v.count = 0;
+		}
+
+	// Initialize the edges.
+	//
+	if (RegisterPressure::Set::isOrdered()) {
+		RegisterName name1 = RegisterName(0);
+
+		for (RegisterPressure::Set::iterator i = interferences->begin(); !interferences->done(i); i = interferences->advance(i)) {
+			Uint32 interferenceIndex = interferences->get(i);
+
+			while(interferenceIndex >= offset[name1 + 1])
+				name1 = RegisterName(name1 + 1);
+
+			assert((interferenceIndex >= offset[name1]) && (interferenceIndex < offset[name1 + 1]));
+
+			RegisterName name2 = RegisterName(interferenceIndex - offset[name1]);
+
+			assert(interfere(name1, name2));
+
+			InterferenceVector& vector1 = *vector[name1];
+			vector1.neighbors[vector1.count++] = name2;
+		
+			InterferenceVector& vector2 = *vector[name2];
+			vector2.neighbors[vector2.count++] = name1;
+		}
+	} else {
+		trespass("not Implemented"); // FIX: need one more pass to initialize the vectors.
+	}
+}
+
+template <class RegisterPressure>
+Uint32 InterferenceGraph<RegisterPressure>::getEdgeIndex(RegisterName name1, RegisterName name2)
+{
+	checkMember(name1); checkMember(name2);
+	assert(name1 != name2); // This is not possible.
+	return (name1 < name2) ? offset[name2] + name1 : offset[name1] + name2;
+}
+
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::setInterference(RegisterName name1, RegisterName name2)
+{
+	interferences->set(getEdgeIndex(name1, name2));
+}
+
+template <class RegisterPressure>
+bool InterferenceGraph<RegisterPressure>::interfere(RegisterName name1, RegisterName name2)
+{
+	return interferences->test(getEdgeIndex(name1, name2));
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Interference Vectors:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		if (vector[i] != NULL) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tvr%d: (", i));
+			for (InterferenceVector* v = vector[i]; v != NULL; v = v->next)
+				for (Uint32 j = 0; j < v->count; j++) {
+					UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%d", v->neighbors[j]));
+					if (v->next != NULL || j != (v->count - 1))
+						UT_OBJECTLOG(log, PR_LOG_ALWAYS, (","));
+				}
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (")\n"));
+		}
+	}
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Interference Matrix:\n"));
+	for (RegisterName name1 = RegisterName(1); name1 < rangeCount; name1 = RegisterName(name1 + 1)) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\t%d:\t", name1));
+		for (RegisterName name2 = RegisterName(1); name2 < rangeCount; name2 = RegisterName(name2 + 1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%c", ((name1 != name2) && interfere(name1, name2)) ? '1' : '0'));
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _INTERFERENCE_GRAPH_H_

mozilla/ef/Compiler/RegisterAllocator/LiveRange.h

@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _LIVE_RANGE_H_
+#define _LIVE_RANGE_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Primitives.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+template <class RegisterPressure>
+struct LiveRange
+{
+	static void build(RegisterAllocator& registerAllocator);
+};
+
+template <class RegisterPressure>
+void LiveRange<RegisterPressure>::build(RegisterAllocator& registerAllocator)
+{
+	// Intialize the lookup table.
+	//
+	Uint32 nameCount = registerAllocator.nameCount;
+	RegisterName* nameTable = new(registerAllocator.pool) RegisterName[2*nameCount];
+	RegisterName* rangeName = &nameTable[nameCount];
+
+	init(rangeName, nameCount);
+
+	// Walk the graph.
+	//
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	SparseSet destination(registerAllocator.pool, nameCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+
+		destination.clear();
+		for (InstructionList::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+			Instruction& phiNode = phiNodes.get(i);
+			assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+			destination.set(findRoot(phiNode.getInstructionDefineBegin()[0].getRegisterName(), rangeName));
+		}
+
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& phiNode = phiNodes.get(p);
+
+			assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+			RegisterName destinationName = phiNode.getInstructionDefineBegin()[0].getRegisterName();
+			RegisterName destinationRoot = findRoot(destinationName, rangeName);
+
+			InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+			for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++) {
+				assert(usePtr->isRegister());
+				RegisterName sourceName = usePtr->getRegisterName();
+				RegisterName sourceRoot = findRoot(sourceName, rangeName);
+
+				if (sourceRoot != destinationRoot && !destination.test(sourceRoot))
+					rangeName[sourceRoot] = destinationRoot;
+			}
+		}
+	}
+
+	registerAllocator.rangeCount = compress(registerAllocator.name2range, rangeName, nameCount, nameCount);
+}
+
+#endif // _LIVE_RANGE_H_

mozilla/ef/Compiler/RegisterAllocator/LiveRangeGraph.h

@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _LIVE_RANGE_GRAPH_
+#define _LIVE_RANGE_GRAPH_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterTypes.h"
+
+class RegisterAllocator;
+
+template <class RegisterPressure>
+class LiveRangeGraph
+{
+private:
+
+	RegisterAllocator&		registerAllocator;
+
+	RegisterPressure::Set*	edges;
+	Uint32					rangeCount;
+
+public:
+	//
+	//
+	LiveRangeGraph(RegisterAllocator& registerAllocator) : registerAllocator(registerAllocator) {}
+
+	//
+	//
+	void build();
+
+	//
+	//
+	void addEdge(RegisterName name1, RegisterName name2);
+
+	//
+	//
+	bool haveEdge(RegisterName name1, RegisterName name2);
+
+#ifdef DEBUG_LOG
+	//
+	//
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::build()
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	this->rangeCount = rangeCount;
+
+	edges = new(pool) RegisterPressure::Set(pool, rangeCount * rangeCount);
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	RegisterName* name2range = registerAllocator.name2range;
+	LivenessInfo<RegisterPressure>& liveness = registerAllocator.liveness;
+	SparseSet currentLive(pool, rangeCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		currentLive = liveness.liveOut[n];
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				currentLive.clear(name2range[useBegin[0].getRegisterName()]);
+			}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					RegisterName define = name2range[definePtr->getRegisterName()];
+
+					for (SparseSet::iterator l = currentLive.begin(); !currentLive.done(l); l = currentLive.advance(l)) {
+						RegisterName live = RegisterName(currentLive.get(l));
+						if (define != live && registerAllocator.canInterfere(define, live))
+							addEdge(define, live);
+					}
+				}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					currentLive.set(name2range[usePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName use = name2range[usePtr->getRegisterName()];
+
+					for (SparseSet::iterator l = currentLive.begin(); !currentLive.done(l); l = currentLive.advance(l)) {
+						RegisterName live = RegisterName(currentLive.get(l));
+						if (use != live && registerAllocator.canInterfere(use, live))
+							addEdge(use, live);
+					}
+				}
+		}
+	}
+}
+
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::addEdge(RegisterName name1, RegisterName name2)
+{
+	assert(name1 != name2);
+	edges->set(name1 * rangeCount + name2);
+}
+
+template <class RegisterPressure>
+bool LiveRangeGraph<RegisterPressure>::haveEdge(RegisterName name1, RegisterName name2)
+{
+	assert(name1 != name2);
+	return edges->test(name1 * rangeCount + name2);
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Live ranges graph:\n"));
+	for (RegisterName name1 = RegisterName(1); name1 < rangeCount; name1 = RegisterName(name1 + 1)) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\t%d:\t", name1));
+		for (RegisterName name2 = RegisterName(1); name2 < rangeCount; name2 = RegisterName(name2 + 1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%c", ((name1 != name2) && haveEdge(name1, name2)) ? '1' : '0'));
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _LIVE_RANGE_GRAPH_

mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "Liveness.h"
+

mozilla/ef/Compiler/RegisterAllocator/Liveness.h

@@ -0,0 +1,301 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _LIVENESS_H_
+#define _LIVENESS_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterTypes.h"
+
+// ----------------------------------------------------------------------------
+// LivenessInfo -
+
+template <class RegisterPressure>
+struct LivenessInfo
+{
+	RegisterPressure::Set*	liveIn;
+	RegisterPressure::Set*	liveOut;
+	DEBUG_LOG_ONLY(Uint32	size);
+
+#ifdef DEBUG_LOG
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+// ----------------------------------------------------------------------------
+// Liveness
+//
+// The liveness is defined by the following data-flow equations:
+//
+//		LiveIn(n) = LocalLive(n) U (LiveOut(n) - Killed(n)).
+//		LiveOut(n) = U LiveIn(s) (s a successor of n).
+//
+//	where LocalLive(n) is the set of used registers in the block n, Killed(n)
+//  is the set of defined registers in the block n, LiveIn(n) is the set of
+//  live registers at the begining of the block n and LiveOut(n) is the set
+//  of live registers at the end of the block n.
+//
+//
+// We will compute the liveness analysis in two stages:
+//
+//	1- Build LocalLive(n) (wich is an approximation of LiveIn(n)) and Killed(n) 
+//     for each block n.
+//  2- Perform a backward data-flow analysis to propagate the liveness information
+//     through the entire control-flow graph.
+//
+
+template <class RegisterPressure>
+struct Liveness
+{
+	static LivenessInfo<RegisterPressure> analysis(ControlGraph& controlGraph, Uint32 rangeCount, const RegisterName* name2range);
+	static LivenessInfo<RegisterPressure> analysis(ControlGraph& controlGraph, Uint32 nameCount);
+};
+
+template <class RegisterPressure>
+LivenessInfo<RegisterPressure> Liveness<RegisterPressure>::analysis(ControlGraph& controlGraph, Uint32 rangeCount, const RegisterName* name2range)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Allocate the temporary sets.
+	RegisterPressure::Set* killed = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+	
+	// Allocate the globals sets.
+	RegisterPressure::Set* liveIn = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+	RegisterPressure::Set* liveOut = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+
+	// First stage of the liveness analysis: Compute the sets LocalLive(stored in LiveIn) and Killed.
+	//
+	for (Uint32 n = 0; n < (nNodes - 1); n++) {
+		ControlNode& node = *nodes[n];
+
+		RegisterPressure::Set& currentLocalLive = liveIn[n];
+		RegisterPressure::Set& currentKilled = killed[n];
+		
+		// Find the instructions contributions to the sets LocalLive and Killed.
+		//
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			// If a VirtualRegister is 'used' before being 'defined' then we add it to set LocalLive.
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					Uint32 index = name2range[usePtr->getRegisterName()];
+
+					if (!currentKilled.test(index))
+						currentLocalLive.set(index);
+				}
+
+			// If a Virtualregister is 'defined' then we add it to the set Killed.
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentKilled.set(name2range[definePtr->getRegisterName()]);
+		}
+	}
+
+	// Second stage of the liveness analysis: We propagate the LiveIn & LiveOut through the entire 
+	// control-flow graph.
+	//
+	RegisterPressure::Set temp(pool, rangeCount);
+
+	bool changed;
+	do {
+		changed = false;
+
+		// For all nodes is this graph except the endNode.
+		for (Int32 n = (nNodes - 2); n >= 0; n--) {
+			ControlNode& node = *nodes[n];
+
+			RegisterPressure::Set& currentLiveIn = liveIn[n];
+			RegisterPressure::Set& currentLiveOut = liveOut[n];
+
+			// Compute temp = Union of LiveIn(s) (s a successor of this node) | usedByPhiNodes(n).
+			// temp will be the new LiveOut(n).
+			Uint32 nSuccessors = node.nSuccessors();
+			if (nSuccessors != 0) {
+				temp = liveIn[node.nthSuccessor(0).getTarget().dfsNum];
+				for (Uint32 s = 1; s < nSuccessors; s++)
+					temp |= liveIn[node.nthSuccessor(s).getTarget().dfsNum];
+			} else 
+				temp.clear();
+
+			// If temp and LiveOut(n) differ then set LiveOut(n) = temp and recalculate the
+			// new LiveIn(n).
+			if (currentLiveOut != temp) {
+				currentLiveOut = temp;
+				temp -= killed[n]; // FIX: could be optimized with one call to unionDiff !
+				temp |= currentLiveIn;
+			
+				if (currentLiveIn != temp) {
+					currentLiveIn = temp;
+					changed = true;
+				}
+			}
+		}
+	} while(changed);
+
+	LivenessInfo<RegisterPressure> liveness;
+	liveness.liveIn = liveIn;
+	liveness.liveOut = liveOut;
+	DEBUG_LOG_ONLY(liveness.size = nNodes);
+	return liveness;
+}
+
+template <class RegisterPressure>
+LivenessInfo<RegisterPressure> Liveness<RegisterPressure>::analysis(ControlGraph& controlGraph, Uint32 nameCount)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Allocate the temporary sets.
+	RegisterPressure::Set* killed = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+	RegisterPressure::Set* usedByPhiNodes = NULL;
+	
+	// Allocate the globals sets.
+	RegisterPressure::Set* liveIn = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+	RegisterPressure::Set* liveOut = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+
+	// First stage of the liveness analysis: Compute the sets LocalLive(stored in LiveIn) and Killed.
+	//
+	for (Uint32 n = 0; n < (nNodes - 1); n++) {
+		ControlNode& node = *nodes[n];
+
+		RegisterPressure::Set& currentLocalLive = liveIn[n];
+		RegisterPressure::Set& currentKilled = killed[n];
+		
+		InstructionList& phiNodes = node.getPhiNodeInstructions();
+
+		if ((usedByPhiNodes == NULL) && !phiNodes.empty())
+			usedByPhiNodes = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& phiNode = phiNodes.get(p);
+
+			InstructionDefine& define = phiNode.getInstructionDefineBegin()[0];
+			currentKilled.set(define.getRegisterName());
+
+			typedef DoublyLinkedList<ControlEdge> ControlEdgeList;
+			const ControlEdgeList& predecessors = node.getPredecessors();
+			ControlEdgeList::iterator p = predecessors.begin();
+			InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+			for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++, p = predecessors.advance(p))
+				if (usePtr->isRegister())
+					usedByPhiNodes[predecessors.get(p).getSource().dfsNum].set(usePtr->getRegisterName());
+		}
+
+		// Find the instructions contributions to the sets LocalLive and Killed.
+		//
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			// If a VirtualRegister is 'used' before being 'defined' then we add it to set LocalLive.
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					Uint32 index = usePtr->getRegisterName();
+
+					if (!currentKilled.test(index))
+						currentLocalLive.set(index);
+				}
+
+			// If a Virtualregister is 'defined' then we add it to the set Killed.
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentKilled.set(definePtr->getRegisterName());
+		}
+	}
+
+	// Second stage of the liveness analysis: We propagate the LiveIn & LiveOut through the entire 
+	// control-flow graph.
+	//
+	RegisterPressure::Set temp(pool, nameCount);
+
+	bool changed;
+	do {
+		changed = false;
+
+		// For all nodes is this graph except the endNode.
+		for (Int32 n = (nNodes - 2); n >= 0; n--) {
+			ControlNode& node = *nodes[n];
+
+			RegisterPressure::Set& currentLiveIn = liveIn[n];
+			RegisterPressure::Set& currentLiveOut = liveOut[n];
+
+			// Compute temp = Union of LiveIn(s) (s a successor of this node) | usedByPhiNodes(n).
+			// temp will be the new LiveOut(n).
+			Uint32 nSuccessors = node.nSuccessors();
+			if (nSuccessors != 0) {
+				temp = liveIn[node.nthSuccessor(0).getTarget().dfsNum];
+				for (Uint32 s = 1; s < nSuccessors; s++)
+					temp |= liveIn[node.nthSuccessor(s).getTarget().dfsNum];
+			} else 
+				temp.clear();
+
+			// Insert the phiNodes contribution.
+			if (usedByPhiNodes != NULL)
+				temp |= usedByPhiNodes[n];
+
+			// If temp and LiveOut(n) differ then set LiveOut(n) = temp and recalculate the
+			// new LiveIn(n).
+			if (currentLiveOut != temp) {
+				currentLiveOut = temp;
+				temp -= killed[n]; // FIX: could be optimized with one call to unionDiff !
+				temp |= currentLiveIn;
+			
+				if (currentLiveIn != temp) {
+					currentLiveIn = temp;
+					changed = true;
+				}
+			}
+		}
+	} while(changed);
+
+	LivenessInfo<RegisterPressure> liveness;
+	liveness.liveIn = liveIn;
+	liveness.liveOut = liveOut;
+	DEBUG_LOG_ONLY(liveness.size = nNodes);
+	return liveness;
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void LivenessInfo<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	for (Uint32 n = 0; n < size; n++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Node N%d:\n\tliveIn = ", n));
+		liveIn[n].printPretty(log);
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tliveOut = "));
+		liveOut[n].printPretty(log);
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _LIVENESS_H_

mozilla/ef/Compiler/RegisterAllocator/Makefile

@@ -0,0 +1,40 @@
+#! gmake
+
+DEPTH			= ../..
+
+MODULE_NAME		= RegisterAllocator
+
+include $(DEPTH)/config/config.mk
+
+INCLUDES		+=										\
+	-I$(DEPTH)/Utilities/General						\
+	-I$(DEPTH)/Utilities/zlib							\
+	-I$(DEPTH)/Runtime/ClassReader						\
+	-I$(DEPTH)/Runtime/NativeMethods					\
+	-I$(DEPTH)/Runtime/System							\
+	-I$(DEPTH)/Runtime/ClassInfo						\
+	-I$(DEPTH)/Runtime/FileReader						\
+	-I$(DEPTH)/Compiler/PrimitiveGraph					\
+	-I$(DEPTH)/Compiler/FrontEnd						\
+	-I$(DEPTH)/Compiler/Optimizer						\
+	-I$(DEPTH)/Compiler/CodeGenerator					\
+	-I$(DEPTH)/Compiler/CodeGenerator/md				\
+	-I$(DEPTH)/Compiler/CodeGenerator/md/$(CPU_ARCH)	\
+	-I$(DEPTH)/Compiler/RegisterAllocator				\
+	-I$(DEPTH)/Driver/StandAloneJava					\
+	-I$(DEPTH)/Debugger									\
+	$(NULL)
+
+CXXSRCS 		=										\
+	RegisterAllocator.cpp								\
+	RegisterAllocatorTools.cpp							\
+	DominatorGraph.cpp									\
+	VirtualRegister.cpp									\
+	BitSet.cpp											\
+	SparseSet.cpp										\
+	$(NULL)
+
+
+include $(DEPTH)/config/rules.mk
+
+libs:: $(MODULE)

mozilla/ef/Compiler/RegisterAllocator/PhiNodeRemover.h

@@ -0,0 +1,392 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _PHI_NODE_REMOVER_H_
+#define _PHI_NODE_REMOVER_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "DominatorGraph.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h"
+#include "Liveness.h"
+#include "Instruction.h"
+#include "InstructionEmitter.h"
+#include "SparseSet.h"
+#include <string.h>
+
+//------------------------------------------------------------------------------
+// RegisterNameNode -
+
+struct RegisterNameNode 
+{
+	RegisterNameNode*	next;
+	RegisterName		newName;
+	Uint32				nextPushed;
+};
+
+//------------------------------------------------------------------------------
+// CopyData -
+
+struct CopyData
+{
+	RegisterName		source;
+	RegisterClassKind	classKind;
+	Uint32				useCount;
+	bool				isLiveOut;
+	RegisterName		sourceNameToUse;
+	RegisterName		temporaryName;
+	RegisterNameNode*	newName;
+};
+
+//------------------------------------------------------------------------------
+// PhiNodeRemover<RegisterPressure> -
+
+template <class RegisterPressure>
+struct PhiNodeRemover
+{
+	// Replace the phi nodes by copy instructions.
+	static void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+};
+
+// Split some of the critical edges and return true if there are still some
+// in the graph after that.
+//
+static bool splitCriticalEdges(ControlGraph& /*cg*/)
+{
+	// FIX: not implemented.
+	return true;
+}
+
+inline void pushName(Pool& pool, RegisterNameNode** stack, SparseSet& pushed, Uint32* nodeListPointer, RegisterName oldName, RegisterName newName)
+{
+	RegisterNameNode& newNode = *new(pool) RegisterNameNode();
+
+	if (pushed.test(oldName))
+		(*stack)->newName = newName;
+	else {
+		newNode.newName = newName;
+		newNode.nextPushed = *nodeListPointer;
+		*nodeListPointer = oldName;
+		newNode.next = *stack;
+		*stack = &newNode;
+		pushed.set(oldName);
+	}
+}
+
+template <class RegisterPressure>
+void PhiNodeRemover<RegisterPressure>::replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Initialize the local variables.
+	//
+
+	// When we insert the copies we will also need to create new VirtualRegisters for
+	// the insertion of temporaries. The maximum number of temporary register will not
+	// exceed the number of phiNodes in the primitive graph.
+	Uint32 nameCount = vrManager.getSize();
+	Uint32 maxNameCount = nameCount;
+	for (Uint32 n = 0; n < nNodes; n++)
+		maxNameCount += nodes[n]->getPhiNodes().length();
+
+	// If the CFG contains some critical edges (backward edge which source has more than one
+	// outgoing edge and destination has more than one incomimg edge) then we need the liveness
+	// information to be able to insert temporary copies.
+	RegisterPressure::Set* liveOut = NULL;
+	if (splitCriticalEdges(controlGraph))
+		liveOut = Liveness<LowRegisterPressure>::analysis(controlGraph, nameCount).liveOut;
+
+	DominatorGraph dGraph(controlGraph);
+
+	SparseSet pushed(pool, maxNameCount);
+	SparseSet destinationList(pool, maxNameCount);
+	SparseSet workList(pool, maxNameCount);
+
+	CopyData* copyStats = new(pool) CopyData[maxNameCount];
+	memset(copyStats, '\0', maxNameCount*sizeof(CopyData));
+
+	struct NodeStack {
+		Uint32* next;
+		Uint32* limit;
+		Uint32 pushedList;
+	};
+
+	// Allocate the node stack and initialize the node stack pointer.
+	NodeStack* nodeStack = new(pool) NodeStack[nNodes + 1];
+	NodeStack* nodeStackPtr = nodeStack;
+
+	// We start by the begin node. 
+	Uint32 startNode = 0;
+	Uint32* next = &startNode;
+	Uint32* limit = &startNode + 1;
+
+	while (true) {
+
+		if (next == limit) {
+			// If there are no more node in the sibling, we have to pop the current
+			// frame from the stack and update the copyStats of the pushed nodes.
+			//
+			if (nodeStackPtr == nodeStack)
+				// We are at the bottom of the stack and there are no more nodes
+				// to look at. We are done !
+				break;
+
+			--nodeStackPtr;
+			// We are done with all the children of this node in the dominator tree.
+			// We need to update the copy information of all the new names pushed
+			// during the walk over this node.
+			Uint32 pushedList = nodeStackPtr->pushedList;
+			while (pushedList != 0) {
+				Uint32 nextName = copyStats[pushedList].newName->nextPushed;
+				copyStats[pushedList].newName = copyStats[pushedList].newName->next;
+				pushedList = nextName;
+			}
+
+			// restore the previous frame.
+			next = nodeStackPtr->next;
+			limit = nodeStackPtr->limit;
+		} else {
+			Uint32 currentNode = *next++;
+			Uint32 pushedList = 0;
+
+
+			// Initialize the sets.
+			pushed.clear();
+			destinationList.clear();
+
+			// STEP1:
+			//  Walk the instruction list and to replace all the instruction uses with their new name. 
+			//  If the instruction is a phi node and its defined register is alive at the end of this 
+			//  block then we push the defined register into the stack.
+			//
+			ControlNode& node = *nodes[currentNode];
+			RegisterPressure::Set* currentLiveOut = (liveOut != NULL) ? &liveOut[currentNode] : (RegisterPressure::Set*) 0;
+
+			InstructionList& phiNodes = node.getPhiNodeInstructions();
+			for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+				Instruction& phiNode = phiNodes.get(p);
+
+				InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+				for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++) {
+					assert(usePtr->isRegister());
+					RegisterName name = usePtr->getRegisterName();
+
+					if (copyStats[name].newName != NULL && copyStats[name].newName->newName != name)
+						usePtr->setRegisterName(copyStats[name].newName->newName);
+				}
+
+				if (currentLiveOut != NULL) {
+					// This is a phi node and we have to push its defined name if it is live
+					// at the end of the node. We only need to do this if the CFG has critical edges.
+					assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+					RegisterName name = phiNode.getInstructionDefineBegin()[0].getRegisterName();
+
+					if (currentLiveOut->test(name))
+						pushName(pool, &(copyStats[name].newName), pushed, &pushedList, name, name);
+				}
+				
+			}
+
+			InstructionList& instructions = node.getInstructions();
+			for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+				Instruction& instruction = instructions.get(i);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+
+						if (copyStats[name].newName != NULL && copyStats[name].newName->newName != name)
+							usePtr->setRegisterName(copyStats[name].newName->newName);
+					}
+			}
+
+			// STEP2:
+			//  Look at this node's successors' phiNodes. We keep track of the number of time
+			//  a VR will be used by another copy instruction and insert each definition into the 
+			//  destinationList. This is the only pass over this node's successors as we will
+			//  get all the information we need in the CopyData structures.
+			//
+			ControlEdge* successorEdgeEnd = node.getSuccessorsEnd();
+			for (ControlEdge* successorEdgePtr = node.getSuccessorsBegin(); successorEdgePtr < successorEdgeEnd; successorEdgePtr++) {
+				Uint32 useIndex = successorEdgePtr->getIndex();
+				ControlNode& successor = successorEdgePtr->getTarget();
+
+				// Look at its phi nodes. The phi nodes are at the top of the instruction list. We exit
+				// as soon as we find an instruction which is not a phi node
+				InstructionList& phiNodes = successor.getPhiNodeInstructions();
+				for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+					Instruction& phiNode = phiNodes.get(p);
+					
+					assert((phiNode.getInstructionUseBegin() + useIndex) < phiNode.getInstructionUseEnd());
+					assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd());
+
+					InstructionUse& source = phiNode.getInstructionUseBegin()[useIndex];
+					InstructionDefine& destination = phiNode.getInstructionDefineBegin()[0];
+
+					assert(source.isRegister() && destination.isRegister());
+
+					RegisterName sourceName = source.getRegisterName();
+					RegisterName destinationName = destination.getRegisterName();
+
+					// Get the correct name for the source.
+					if (copyStats[sourceName].newName != NULL)
+						sourceName = copyStats[sourceName].newName->newName;
+
+					// Update the CopyData structures.
+					if ((sourceName != rnInvalid) && (sourceName != destinationName)) {
+						copyStats[destinationName].source = sourceName;
+						copyStats[destinationName].classKind = destination.getRegisterClass();
+						copyStats[destinationName].isLiveOut = (currentLiveOut != NULL) ? currentLiveOut->test(destinationName) : false;
+						copyStats[destinationName].sourceNameToUse = destinationName;
+						copyStats[sourceName].sourceNameToUse = sourceName;
+						copyStats[sourceName].useCount++;
+						destinationList.set(destinationName);
+					}
+				}
+			}
+
+			// STEP3:
+			//  Insert into the worklist only the destination registers that will be not used in 
+			//  another copy instruction in this block.
+			//
+			assert(workList.getSize() == 0);
+			for (SparseSet::iterator d = destinationList.begin(); !destinationList.done(d); d = destinationList.advance(d)) {
+				Uint32 dest = destinationList.get(d);
+				if (copyStats[dest].useCount == 0)
+					workList.set(dest);
+			}
+
+			// STEP4:
+			//  Insert the copy instructions.
+			//
+			Uint32 destinationListSize = destinationList.getSize();
+			InstructionList::iterator endOfTheNode = instructions.end();
+
+			// Find the right place to insert the copy instructions.
+			if (destinationListSize != 0)
+				while (instructions.get(endOfTheNode).getFlags() & ifControl)
+					endOfTheNode = instructions.retreat(endOfTheNode);
+
+			while (destinationListSize != 0) {
+				while(workList.getSize()) {
+					RegisterName destinationName = RegisterName(workList.getOne());
+					RegisterName sourceName = copyStats[destinationName].source;
+
+					workList.clear(destinationName);
+					if (copyStats[destinationName].isLiveOut && !copyStats[destinationName].temporaryName) {
+						// Lost copy problem.
+						copyStats[destinationName].isLiveOut = false;
+
+						RegisterName sourceName = destinationName;
+						RegisterClassKind classKind = copyStats[sourceName].classKind;
+						RegisterName destinationName = getName(vrManager.newVirtualRegister(classKind));
+						assert(destinationName < maxNameCount);
+
+						copyStats[destinationName].classKind = classKind;
+						copyStats[sourceName].useCount = 0;
+				
+						// We need to insert a copy to a temporary register to keep the
+						// source register valid at the end of the node defining it.
+						// This copy will be inserted right after the phi node defining it.
+						RegisterName from = copyStats[sourceName].sourceNameToUse;
+						Instruction* definingPhiNode = vrManager.getVirtualRegister(from).getDefiningInstruction();
+						assert(definingPhiNode && (definingPhiNode->getFlags() & ifPhiNode) != 0);
+
+						RegisterID fromID = buildRegisterID(from, classKind);
+						RegisterID toID = buildRegisterID(destinationName, classKind);
+						Instruction& copy = emitter.newCopy(*definingPhiNode->getPrimitive(), fromID, toID);
+						vrManager.getVirtualRegister(destinationName).setDefiningInstruction(copy);
+						definingPhiNode->getPrimitive()->getContainer()->getInstructions().addFirst(copy);
+
+						copyStats[sourceName].temporaryName = destinationName;
+						copyStats[sourceName].sourceNameToUse = destinationName;
+						pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+					}
+
+					// Insert the copy instruction at the end of the current node.
+					RegisterName from = copyStats[sourceName].sourceNameToUse;
+
+					RegisterClassKind classKind = copyStats[destinationName].classKind;
+					RegisterID fromID = buildRegisterID(from, classKind);
+					RegisterID toID = buildRegisterID(destinationName, classKind);
+					Instruction& copy = emitter.newCopy(*vrManager.getVirtualRegister(from).getDefiningInstruction()->getPrimitive(), fromID, toID);
+					instructions.insertAfter(copy, endOfTheNode);
+					endOfTheNode = instructions.advance(endOfTheNode);
+
+					copyStats[sourceName].useCount = 0;
+					if (destinationList.test(sourceName) && copyStats[sourceName].isLiveOut)
+						pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+					copyStats[sourceName].isLiveOut = false;
+					copyStats[sourceName].sourceNameToUse = destinationName;
+
+					if (destinationList.test(sourceName))
+						workList.set(sourceName);
+					destinationList.clear(destinationName);
+				}
+
+				destinationListSize = destinationList.getSize();
+				if (destinationListSize != 0) {
+					RegisterName sourceName = RegisterName(destinationList.getOne());
+					RegisterName destinationName;
+
+					if (!copyStats[sourceName].temporaryName) {
+						// Cycle problem.
+						RegisterClassKind classKind = copyStats[sourceName].classKind;
+						destinationName = getName(vrManager.newVirtualRegister(classKind));
+						assert(destinationName < maxNameCount);
+				
+						copyStats[destinationName].classKind = classKind;
+						copyStats[sourceName].temporaryName = destinationName;
+
+						// Insert the copy instruction at the end of the current node.
+						RegisterName from = copyStats[sourceName].sourceNameToUse;
+
+						RegisterID fromID = buildRegisterID(from, classKind);
+						RegisterID toID = buildRegisterID(destinationName, classKind);
+						Instruction& copy = emitter.newCopy(*vrManager.getVirtualRegister(from).getDefiningInstruction()->getPrimitive(), fromID, toID);
+						vrManager.getVirtualRegister(destinationName).setDefiningInstruction(copy);
+						instructions.insertAfter(copy, endOfTheNode);
+						endOfTheNode = instructions.advance(endOfTheNode);
+					} else 
+						destinationName = copyStats[sourceName].temporaryName;
+
+					copyStats[sourceName].useCount = 0;
+					copyStats[sourceName].isLiveOut = false;
+					copyStats[sourceName].sourceNameToUse = destinationName;
+					pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+
+					workList.set(sourceName);
+				}
+			}
+
+			nodeStackPtr->pushedList = pushedList;
+			nodeStackPtr->next = next;
+			nodeStackPtr->limit = limit;
+			++nodeStackPtr;
+			next = dGraph.getSuccessorsBegin(currentNode);
+			limit = dGraph.getSuccessorsEnd(currentNode);
+		}
+	}
+}
+
+#endif // _PHI_NODE_REMOVER_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp

@@ -0,0 +1,155 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "RegisterAllocator.h"
+#include "RegisterPressure.h"
+#include "RegisterAllocatorTools.h"
+#include "PhiNodeRemover.h"
+#include "LiveRange.h"
+#include "Liveness.h"
+#include "InterferenceGraph.h"
+#include "LiveRangeGraph.h"
+#include "Coalescing.h"
+#include "Spilling.h"
+#include "Coloring.h"
+#include "Splits.h"
+
+class Pool;
+class ControlGraph;
+class VirtualRegisterManager;
+class InstructionEmitter;
+
+UT_DEFINE_LOG_MODULE(RegAlloc);
+
+void RegisterAllocator::allocateRegisters(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+{
+	// Insert the phi node instructions. We want to do this to have a single defined register per instruction.
+	// If we keep the PhiNode (as a DataNode) and a PhiNode is of DoubleWordKind then we have to execute
+	// some special code for the high word annotation.
+	//
+	RegisterAllocatorTools::insertPhiNodeInstructions(controlGraph, emitter);
+
+	// Perform some tests on the instruction graph.
+	//
+	DEBUG_ONLY(RegisterAllocatorTools::testTheInstructionGraph(controlGraph, vrManager));
+
+	// Replace the phi node instructions by their equivalent copy instructions.
+	//
+	PhiNodeRemover<LowRegisterPressure>::replacePhiNodes(controlGraph, vrManager, emitter);
+
+	// Do the register allocation.
+	//
+	RegisterAllocator registerAllocator(pool, controlGraph, vrManager, emitter);
+	registerAllocator.doGraphColoring();
+}
+
+void RegisterAllocator::doGraphColoring()
+{
+	// Initialize the liverange map.
+	//
+	initLiveRanges();
+
+	// Build the live ranges. We do this to compress the number of RegisterNames 
+	// used in the insterference graph.
+	//
+	LiveRange<LowRegisterPressure>::build(*this);
+
+	// Remove unnecessary copies.
+	//
+	RegisterAllocatorTools::removeUnnecessaryCopies(*this);
+
+	for (Uint8 loop = 0; loop < 10; loop++) {
+
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("********* RegisterAllocator loop %d *********\n", loop));
+
+		while(true) {
+			// Build the interference graph.
+			//
+			iGraph.build();
+
+			// Coalesce the copy instructions.
+			//
+			if (!Coalescing<LowRegisterPressure>::coalesce(*this))
+				break;
+		}
+
+		// Print the interference graph.
+		//
+		DEBUG_LOG_ONLY(iGraph.printPretty(UT_LOG_MODULE(RegAlloc)));
+
+		// Calculate the spill costs.
+		//
+		Spilling<LowRegisterPressure>::calculateSpillCosts(*this);
+		DEBUG_LOG_ONLY(RegisterAllocatorTools::printSpillCosts(*this));
+
+		// Calculate the split costs.
+		//
+		Splits<LowRegisterPressure>::calculateSplitCosts(*this);
+		DEBUG_LOG_ONLY(RegisterAllocatorTools::printSplitCosts(*this));
+
+		// Build the live range graph.
+		//
+		lGraph.build();
+		DEBUG_LOG_ONLY(lGraph.printPretty(UT_LOG_MODULE(RegAlloc)));
+
+		// Color the graph. If it succeeds then we're done with the
+		// register allocation.
+		//
+		if (Coloring<LowRegisterPressure>::color(*this)) {
+			// Write the final colors in the instruction graph.
+			//
+			Coloring<LowRegisterPressure>::finalColoring(*this);
+
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("********** RegisterAllocator  done **********\n"));
+			DEBUG_LOG_ONLY(RegisterAllocatorTools::printInstructions(*this));
+
+			return;
+		}
+
+		// We need to spill some registers.
+		//
+		Spilling<LowRegisterPressure>::insertSpillCode(*this);
+
+		// Insert the split instructions.
+		//
+		Splits<LowRegisterPressure>::insertSplitCode(*this);
+
+		// Update the live ranges.
+		// 
+		// FIX
+	}
+
+#ifdef DEBUG_LOG
+	RegisterAllocatorTools::updateInstructionGraph(*this);
+	RegisterAllocatorTools::printInstructions(*this);
+#endif
+	fprintf(stderr, "!!! Coloring failed after 10 loops !!!\n");
+	abort();
+}
+
+void RegisterAllocator::initLiveRanges()
+{
+	Uint32 count = this->nameCount;
+	RegisterName* name2range = new(pool) RegisterName[nameCount];
+	for (RegisterName r = RegisterName(1); r < count; r = RegisterName(r + 1))
+		name2range[r] = r;
+	this->name2range = name2range;
+	rangeCount = count;
+}

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h

@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_ALLOCATOR_H_
+#define _REGISTER_ALLOCATOR_H_
+
+class Pool;
+class ControlGraph;
+class InstructionEmitter;
+struct SpillCost;
+struct SplitCost;
+
+#include "Liveness.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h" // This should included by Backend.cpp
+#include "InterferenceGraph.h"
+#include "LiveRangeGraph.h"
+
+//template <class RegisterPressure>
+class RegisterAllocator
+{
+public:
+
+	Pool&									pool;			//
+	ControlGraph&							controlGraph;	//
+	VirtualRegisterManager&					vrManager;		//
+	InstructionEmitter&						emitter;		//
+
+	RegisterName*							name2range;		//
+	RegisterName*							color;			//
+	SpillCost*								spillCost;		//
+	SparseSet*								willSpill;		//
+	SplitCost*								splitCost;		//
+	NameLinkedList**						splitAround;	//
+	InterferenceGraph<LowRegisterPressure>	iGraph;			//
+	LiveRangeGraph<LowRegisterPressure>		lGraph;			//
+	LivenessInfo<LowRegisterPressure>		liveness;		//
+	Uint32									nameCount;		//
+	Uint32									rangeCount;		//
+	bool									splitFound;		//
+
+private:
+
+	//
+	//
+	void doGraphColoring();
+
+public:
+
+	//
+	//
+	inline RegisterAllocator(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+
+	//
+	//
+	bool canInterfere(RegisterName /*name1*/, RegisterName /*name2*/) const {return true;}
+
+	//
+	//
+	void initLiveRanges();
+
+	//
+	//
+	static void allocateRegisters(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+};
+
+//
+//
+inline RegisterAllocator::RegisterAllocator(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+	: pool(pool), controlGraph(controlGraph), vrManager(vrManager), emitter(emitter), iGraph(*this), lGraph(*this), nameCount(vrManager.getSize()) {}
+
+#endif // _REGISTER_ALLOCATOR_H_
+

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocatorTools.cpp

@@ -0,0 +1,355 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "RegisterAllocatorTools.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Primitives.h"
+#include "InstructionEmitter.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "Spilling.h"
+#include "Splits.h"
+#include "BitSet.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+#ifdef DEBUG
+void RegisterAllocatorTools::testTheInstructionGraph(ControlGraph& controlGraph, VirtualRegisterManager& vrManager)
+{
+	// Test the declared VirtualRegisters. The register allocator tries to condense the register universe.
+	// Any gap in the VirtualRegister names will be a loss of efficiency !!!!
+
+	Uint32 nameCount = vrManager.getSize();
+	BitSet registerSeen(controlGraph.pool, nameCount);
+
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					registerSeen.set(usePtr->getRegisterName());
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					registerSeen.set(definePtr->getRegisterName());
+		}
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& instruction = phiNodes.get(p);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					registerSeen.set(usePtr->getRegisterName());
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					registerSeen.set(definePtr->getRegisterName());
+		}
+	}
+
+	bool renameRegisters = false;
+	for (BitSet::iterator i = registerSeen.nextZero(0); !registerSeen.done(i); i = registerSeen.nextZero(i)) {
+		renameRegisters = true;
+		fprintf(stderr, 
+				"WARNING: The VirtualRegister vr%d has been allocated during CodeGeneration but\n"
+				"         is never used nor defined by any instruction in the instruction graph\n"
+				"                                  PLEASE FIX                                  \n",
+				i);
+	}
+	if (renameRegisters) {
+		Instruction** definingInstruction = new Instruction*[nameCount];
+		memset(definingInstruction, '\0', nameCount * sizeof(Instruction*));
+		RegisterName* newName = new RegisterName[nameCount];
+		memset(newName, '\0', nameCount * sizeof(RegisterName));
+		RegisterName nextName = RegisterName(1);
+
+		for (Uint32 n = 0; n < nNodes; n++) {
+
+			InstructionList& instructions = nodes[n]->getInstructions();
+			for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+				Instruction& instruction = instructions.get(i);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						usePtr->setRegisterName(newName[name]);
+					}
+
+				InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+				for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+					if (definePtr->isRegister()) {
+						RegisterName name = definePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						definePtr->setRegisterName(newName[name]);
+					}
+			}
+
+			InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+			for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+				Instruction& instruction = phiNodes.get(p);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						usePtr->setRegisterName(newName[name]);
+					}
+
+				InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+				for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+					if (definePtr->isRegister()) {
+						RegisterName name = definePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						definePtr->setRegisterName(newName[name]);
+					}
+			}
+		}
+		
+		vrManager.setSize(nextName);
+
+		for (RegisterName r = RegisterName(1); r < nextName; r = RegisterName(r + 1))
+			vrManager.getVirtualRegister(r).definingInstruction = definingInstruction[r];
+
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("RegisterMap:\n"));
+		for (Uint32 i = 1; i < nameCount; i++)
+			if (newName[i] != 0)
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tvr%d becomes vr%d.\n", i, newName[i]));
+			else
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tvr%d is dead.\n", i));
+
+
+		delete newName;
+		delete definingInstruction;
+	}
+
+}
+#endif // DEBUG
+
+void RegisterAllocatorTools::removeUnnecessaryCopies(RegisterAllocator& registerAllocator)
+{
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i);) {
+			Instruction& instruction = instructions.get(i);
+			i = instructions.advance(i);
+
+			if (instruction.getFlags() & ifCopy) {
+				assert(instruction.getInstructionUseBegin() != instruction.getInstructionUseEnd() && instruction.getInstructionUseBegin()[0].isRegister());
+				assert(instruction.getInstructionDefineBegin() != instruction.getInstructionDefineEnd() && instruction.getInstructionDefineBegin()[0].isRegister());
+				
+				RegisterName source = name2range[instruction.getInstructionUseBegin()[0].getRegisterName()];
+				RegisterName destination = name2range[instruction.getInstructionDefineBegin()[0].getRegisterName()];
+
+				if (source == destination)
+					instruction.remove();
+			}
+		}
+	}
+}
+
+
+void RegisterAllocatorTools::updateInstructionGraph(RegisterAllocator& registerAllocator)
+{
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					usePtr->setRegisterName(name2range[usePtr->getRegisterName()]);
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					definePtr->setRegisterName(name2range[definePtr->getRegisterName()]);
+		}
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& instruction = phiNodes.get(p);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					usePtr->setRegisterName(name2range[usePtr->getRegisterName()]);
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					definePtr->setRegisterName(name2range[definePtr->getRegisterName()]);
+		}
+	}
+}
+
+
+void RegisterAllocatorTools::insertPhiNodeInstructions(ControlGraph& controlGraph, InstructionEmitter& emitter)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		DoublyLinkedList<PhiNode>& phiNodes = node.getPhiNodes();
+
+		if (!phiNodes.empty()) {
+
+			// Set the index of the incoming edges.
+			Uint32 index = 0;
+			const DoublyLinkedList<ControlEdge>& predecessors = node.getPredecessors();
+			for (DoublyLinkedList<ControlEdge>::iterator p = predecessors.begin(); !predecessors.done(p); p = predecessors.advance(p))
+				predecessors.get(p).setIndex(index++);
+
+			// Insert the phi node instruction in the instruction list.
+			for (DoublyLinkedList<PhiNode>::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+				PhiNode& phiNode = phiNodes.get(i);
+				ValueKind kind = phiNode.getKind();
+
+				if (!isStorableKind(kind))
+					continue;
+
+				RegisterClassKind classKind = rckGeneral; // FIX: get class kind from phi node kind.
+				Uint32 nInputs = phiNode.nInputs();
+
+				PhiNodeInstruction& phiNodeInstruction = *new(pool) PhiNodeInstruction(&phiNode, pool, nInputs);
+
+				emitter.defineProducer(phiNode, phiNodeInstruction, 0, classKind, drLow);
+				for (Uint32 whichInput = 0; whichInput < nInputs; whichInput++)
+					emitter.useProducer(phiNode.nthInputVariable(whichInput), phiNodeInstruction, whichInput, classKind, drLow);
+
+				node.addPhiNodeInstruction(phiNodeInstruction);
+
+				if (isDoublewordKind(kind)) {
+					PhiNodeInstruction& phiNodeInstruction = *new(pool) PhiNodeInstruction(&phiNode, pool, nInputs);
+
+					emitter.defineProducer(phiNode, phiNodeInstruction, 0, classKind, drHigh);
+					for (Uint32 whichInput = 0; whichInput < nInputs; whichInput++)
+						emitter.useProducer(phiNode.nthInputVariable(whichInput), phiNodeInstruction, whichInput, classKind, drHigh);
+
+					node.addPhiNodeInstruction(phiNodeInstruction);
+				}
+			}
+		}
+	}
+}
+
+#ifdef DEBUG_LOG
+
+void RegisterAllocatorTools::printSpillCosts(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	SpillCost* cost = registerAllocator.spillCost;
+
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Spill costs:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\trange %d : ", i));
+		if (cost[i].infinite)
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("infinite\n"));
+		else
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%f\n", cost[i].cost));
+	}
+}
+
+void RegisterAllocatorTools::printSplitCosts(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	SplitCost* cost = registerAllocator.splitCost;
+
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Split costs:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\trange %d : loads = %f stores = %f\n", i, cost[i].loads, cost[i].stores));
+	}
+}
+
+void RegisterAllocatorTools::printInstructions(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	ControlNode** nodes = registerAllocator.controlGraph.dfsList;
+	Uint32 nNodes = registerAllocator.controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("N%d:\n", n));
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		if (!phiNodes.empty()) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" PhiNodes:\n", n));
+			for(InstructionList::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+				phiNodes.get(i).printPretty(log);
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+			}
+			if (!instructions.empty())
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" Instructions:\n", n));
+		}
+
+		for(InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			instructions.get(i).printPretty(log);
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+		}
+	}
+}
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocatorTools.h

@@ -0,0 +1,117 @@
+//	-*- mode:C++; tab-width:4; truncate-lines:t -*-
+//
+//           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+//              NETSCAPE COMMUNICATIONS CORPORATION
+// Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+// Reserved.  Use of this Source Code is subject to the terms of the
+// applicable license agreement from Netscape Communications Corporation.
+// The copyright notice(s) in this Source Code does not indicate actual or
+// intended publication of this Source Code.
+//
+// $Id: RegisterAllocatorTools.h,v 1.1.2.1 1999-03-02 16:12:05 fur%netscape.com Exp $
+//
+
+#ifndef _REGISTER_ALLOCATOR_TOOLS_H_
+#define _REGISTER_ALLOCATOR_TOOLS_H_
+
+#include "LogModule.h"
+#include "RegisterTypes.h"
+#include <string.h>
+
+class RegisterAllocator;
+class ControlGraph;
+class InstructionEmitter;
+class VirtualRegisterManager;
+
+struct RegisterAllocatorTools
+{
+	//
+	//
+	static void insertPhiNodeInstructions(ControlGraph& controlGraph, InstructionEmitter& emitter);
+
+	//
+	//
+	static void updateInstructionGraph(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void removeUnnecessaryCopies(RegisterAllocator& registerAllocator);
+
+#ifdef DEBUG
+	//
+	//
+	static void testTheInstructionGraph(ControlGraph& controlGraph, VirtualRegisterManager& vrManager);
+#endif // DEBUG
+
+#ifdef DEBUG_LOG
+	//
+	//
+	static void printInstructions(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void printSpillCosts(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void printSplitCosts(RegisterAllocator& registerAllocator);
+#endif // DEBUG_LOG
+};
+
+//
+// FIX: this should go in a class (LookupTable ?)
+//
+
+inline RegisterName findRoot(RegisterName name, RegisterName* table)
+{
+	RegisterName* stack = table;
+	RegisterName* stackPtr = stack;
+
+	RegisterName newName;
+	while((newName = table[name]) != name) {
+		*--stackPtr = name;
+		name = newName;
+	}
+
+	while (stackPtr != stack)
+		table[*stackPtr++] = name;
+
+	return name;
+}
+
+inline void init(RegisterName* table, Uint32 nameCount)
+{
+	for (RegisterName r = RegisterName(0); r < nameCount; r = RegisterName(r + 1))
+		table[r] = r;
+}
+
+inline Uint32 compress(RegisterName* name2range, RegisterName* table, Uint32 nameCount, Uint32 tableSize)
+{
+	RegisterName* liveRange = new RegisterName[tableSize];
+	memset(liveRange, '\0', tableSize * sizeof(RegisterName));
+
+	// Update the lookup table.
+	for (RegisterName r = RegisterName(1); r < tableSize; r = RegisterName(r + 1))
+		findRoot(r, table);
+
+	// Count the liveranges.
+	Uint32 liveRangeCount = 1;
+	for (RegisterName s = RegisterName(1); s < tableSize; s = RegisterName(s + 1))
+		if (table[s] == s)
+			liveRange[s] = RegisterName(liveRangeCount++);
+
+	for (RegisterName t = RegisterName(1); t < nameCount; t = RegisterName(t + 1))
+		name2range[t] = liveRange[table[name2range[t]]];
+
+	return liveRangeCount;
+}
+
+inline double doLog10(Uint32 power)
+{
+	double log = 1.0;
+	while (power--)
+		log *= 10.0;
+	return log;
+}
+
+#endif // _REGISTER_ALLOCATOR_TOOLS_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h

@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_ASSIGNER_H_
+#define _REGISTER_ASSIGNER_H_
+
+#include "Fundamentals.h"
+#include "VirtualRegister.h"
+
+class FastBitMatrix;
+
+class RegisterAssigner
+{
+protected:
+  VirtualRegisterManager& vRegManager;
+  
+public:
+  RegisterAssigner(VirtualRegisterManager& vrMan) : vRegManager(vrMan) {}
+  
+  virtual bool assignRegisters(FastBitMatrix& interferenceMatrix) = 0;
+};
+
+#endif /* _REGISTER_ASSIGNER_H_ */

mozilla/ef/Compiler/RegisterAllocator/RegisterClass.h

@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_CLASS_H_
+#define _REGISTER_CLASS_H_
+
+#include "Fundamentals.h"
+#include "RegisterTypes.h"
+
+#endif // _REGISTER_CLASS_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterPressure.h

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_PRESSURE_H_
+#define _REGISTER_PRESSURE_H_
+
+#include "BitSet.h"
+#include "HashSet.h"
+
+struct LowRegisterPressure
+{
+	typedef BitSet Set;
+	static const bool setIsOrdered = true;
+};
+
+struct HighRegisterPressure
+{
+	typedef HashSet Set;
+	static const bool setIsOrdered = false;
+};
+
+#endif // _REGISTER_PRESSURE_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterTypes.h

@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _REGISTER_TYPES_H_
+#define _REGISTER_TYPES_H_
+
+#include "Fundamentals.h"
+
+//------------------------------------------------------------------------------
+// RegisterName -
+//
+
+enum RegisterName {
+	rnInvalid = 0,
+};
+
+//------------------------------------------------------------------------------
+// RegisterClassKind -
+//
+
+enum RegisterClassKind {
+	rckInvalid = 0,
+	rckGeneral,
+	rckStackSlot,
+
+	nRegisterClassKind
+};
+
+//------------------------------------------------------------------------------
+// RegisterID -
+//
+
+enum RegisterID {
+	invalidID = 0
+};
+
+//------------------------------------------------------------------------------
+// RegisterKind -
+//
+
+enum RegisterKind {
+	rkCallerSave = 0,
+	rkCalleeSave,
+};
+
+struct NameLinkedList {
+	RegisterName name;
+	NameLinkedList* next;
+};
+
+#ifdef DEBUG
+
+const registerNameMask = 		0x03ffffff;
+const coloredRegisterMask = 	0x04000000;
+const machineRegisterMask = 	0x08000000;
+const registerClassMask = 		0xf0000000;
+
+const registerNameShift = 		0;
+const coloredRegisterShift = 	26;
+const machineRegisterShift = 	27;
+const registerClassShift = 		28;
+
+#else // DEBUG
+
+const registerNameMask = 		0x0fffffff;
+const registerClassMask = 		0xf0000000;
+
+const registerNameShift = 		0;
+const registerClassShift = 		28;
+
+#endif // DEBUG
+
+
+inline RegisterClassKind getClass(RegisterID registerID) {return RegisterClassKind((registerID & registerClassMask) >> registerClassShift);}
+inline RegisterName getName(RegisterID registerID) {return RegisterName((registerID & registerNameMask) >> registerNameShift);}
+inline void setClass(RegisterID& registerID, RegisterClassKind classKind) {registerID = RegisterID((registerID & ~registerClassMask) | ((classKind << registerClassShift) & registerClassMask));}
+inline void setName(RegisterID& registerID, RegisterName name) {assert((name & ~registerNameMask) == 0); registerID = RegisterID((registerID & ~registerNameMask) | ((name << registerNameShift) & registerNameMask));}
+inline RegisterID buildRegisterID(RegisterName name, RegisterClassKind classKind) {return RegisterID(((classKind << registerClassShift) & registerClassMask) | ((name << registerNameShift) & registerNameMask));}
+
+#ifdef DEBUG
+
+inline bool isMachineRegister(RegisterID rid) {return (rid & machineRegisterMask) != 0;}
+inline void setMachineRegister(RegisterID& rid) {rid = RegisterID(rid | machineRegisterMask);}
+inline bool isColoredRegister(RegisterID rid) {return (rid & coloredRegisterMask) != 0;}
+inline void setColoredRegister(RegisterID& rid) {rid = RegisterID(rid | coloredRegisterMask);}
+
+#endif // DEBUG
+
+#endif // _REGISTER_TYPES_H_

mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "SSATools.h"
+#include "ControlGraph.h"
+#include "VirtualRegister.h"
+#include "Liveness.h"
+
+void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager)
+{
+	if (!controlGraph.hasBackEdges)
+		return;
+
+	Liveness liveness(controlGraph.pool);
+	liveness.buildLivenessAnalysis(controlGraph, vrManager);
+}

mozilla/ef/Compiler/RegisterAllocator/SSATools.h

@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _SSA_TOOLS_H_
+#define _SSA_TOOLS_H_
+
+#include "Fundamentals.h"
+
+class ControlGraph;
+class VirtualRegisterManager;
+
+extern void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager);
+
+#endif // _SSA_TOOLS_H_

mozilla/ef/Compiler/RegisterAllocator/SparseSet.cpp

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "SparseSet.h"
+#include "BitSet.h"
+#include "Pool.h"
+
+#ifdef DEBUG_LOG
+// Print the set.
+//
+void SparseSet::printPretty(LogModuleObject log)
+{
+	Pool pool;
+	BitSet set(pool, universeSize);
+
+	for (Uint32 i = 0; i < count; i++)
+	   set.set(node[i].element);
+
+	set.printPretty(log);
+}
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/SparseSet.h

@@ -0,0 +1,168 @@
+//	-*- mode:C++; tab-width:4; truncate-lines:t -*-
+//
+//           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+//              NETSCAPE COMMUNICATIONS CORPORATION
+// Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+// Reserved.  Use of this Source Code is subject to the terms of the
+// applicable license agreement from Netscape Communications Corporation.
+// The copyright notice(s) in this Source Code does not indicate actual or
+// intended publication of this Source Code.
+//
+// $Id: SparseSet.h,v 1.1.2.1 1999-03-02 16:12:07 fur%netscape.com Exp $
+//
+
+#ifndef _SPARSE_SET_H_
+#define _SPARSE_SET_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "LogModule.h"
+#include "BitSet.h"
+
+class SparseSet
+{
+private:
+
+	struct Node {
+		Uint32		element;
+		Uint32		stackIndex;
+	};
+
+	Node*			node;
+	Uint32			count;
+	Uint32			universeSize;
+
+private:
+
+	// No copy constructor.
+	SparseSet(const SparseSet&);
+
+	// Check if the given set's universe is of the same size than this universe.
+	void checkUniverseCompatibility(const SparseSet& set) const {assert(set.universeSize == universeSize);}
+	// Check if pos is valid for this set's universe.
+	void checkMember(Int32 pos) const {assert(pos >=0 && Uint32(pos) < universeSize);}
+
+public:
+
+	SparseSet(Pool& pool, Uint32 universeSize) : universeSize(universeSize) {node = new(pool) Node[universeSize]; clear();}
+
+	// Clear the sparse set.
+	void clear() {count = 0;}
+	// Clear the element at index.
+	inline void clear(Uint32 index);
+	// Set the element at index.
+	inline void set(Uint32 index);
+	// Return true if the element at index is set.
+	inline bool test(Uint32 index) const;
+	// Union with the given sparse set.
+	inline void or(const SparseSet& set);
+	// Intersection with the given sparse set.
+	inline void and(const SparseSet& set);
+	// Difference with the given sparse set.
+	inline void difference(const SparseSet& set);
+	// Copy set.
+	inline SparseSet& operator = (const SparseSet& set);
+	inline SparseSet& operator = (const BitSet& set);
+	// Return true if the sparse sets are identical.
+	friend bool operator == (const SparseSet& set1, const SparseSet& set2);
+	// Return true if the sparse sets are different.
+	friend bool operator != (const SparseSet& set1, const SparseSet& set2);
+
+	// Logical operators.
+	SparseSet& operator |= (const SparseSet& set) {or(set); return *this;}
+	SparseSet& operator &= (const SparseSet& set) {and(set); return *this;}
+	SparseSet& operator -= (const SparseSet& set) {difference(set); return *this;}
+
+	// Iterator to conform with the set API.
+	typedef Int32 iterator;
+	// Return the iterator for the first element of this set.
+	iterator begin() const {return count - 1;}
+	// Return the next iterator.
+	iterator advance(iterator pos) const {return --pos;}
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos < 0;}
+	// Return the element for the given iterator;
+	Uint32 get(iterator pos) const {return node[pos].element;}
+	// Return one element of this set.
+	Uint32 getOne() const {assert(count > 0); return node[0].element;}
+	// Return the size of this set.
+	Uint32 getSize() const {return count;}
+
+#ifdef DEBUG_LOG
+	// Print the set.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+inline void SparseSet::clear(Uint32 element)
+{
+	checkMember(element);
+	Uint32 count = this->count;
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+
+	if ((stackIndex < count) && (node[stackIndex].element == element)) {
+		Uint32 stackTop = node[count - 1].element;
+
+		node[stackIndex].element = stackTop;
+		node[stackTop].stackIndex = stackIndex;
+		this->count = count - 1;
+	}
+}
+
+inline void SparseSet::set(Uint32 element)
+{
+	checkMember(element);
+  	Uint32 count = this->count;
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+
+	if ((stackIndex >= count) || (node[stackIndex].element != element)) {
+		node[count].element = element;
+		node[element].stackIndex = count;
+		this->count = count + 1;
+	}
+}
+
+inline bool SparseSet::test(Uint32 element) const
+{
+	checkMember(element);
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+	return ((stackIndex < count) && (node[stackIndex].element == element));
+}
+
+inline SparseSet& SparseSet::operator = (const SparseSet& set)
+{
+	checkUniverseCompatibility(set);
+	Uint32 sourceCount = set.getSize();
+	Node* node = this->node;
+
+	memcpy(node, set.node, sourceCount * sizeof(Node));
+
+	for (Uint32 i = 0; i < sourceCount; i++) {
+		Uint32 element = node[i].element;
+		node[element].stackIndex = i;
+	}
+
+	count = sourceCount;
+
+	return *this;
+}
+
+
+inline SparseSet& SparseSet::operator = (const BitSet& set)
+{
+	// FIX: there's room for optimization here.
+	assert(universeSize == set.getSize());
+
+	clear();
+	for (Int32 i = set.firstOne(); i != -1; i = set.nextOne(i))
+		this->set(i);
+	return *this;
+}
+
+#endif // _SPARSE_SET_H_

mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp

@@ -0,0 +1,270 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef NEW_LAURENTM_CODE
+#define INCLUDE_EMITTER
+#include "CpuInfo.h"
+#include "Fundamentals.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "InstructionEmitter.h"
+#include "Spilling.h"
+
+
+void Spilling::
+insertSpillCode(ControlNode** dfsList, Uint32 nNodes)
+{
+  PRUint32 nVirtualRegisters = vRegManager.count();
+  FastBitSet currentLive(vRegManager.pool, nVirtualRegisters);
+  FastBitSet usedInThisInstruction(vRegManager.pool, nVirtualRegisters);
+  RegisterFifo grNeedLoad(nVirtualRegisters);
+  RegisterFifo fpNeedLoad(nVirtualRegisters);
+
+  for (PRInt32 n = nNodes - 1; n >= 0; n--)
+	{
+	  PR_ASSERT(grNeedLoad.empty() & fpNeedLoad.empty());
+	  ControlNode& node = *dfsList[n];
+
+	  currentLive = node.liveAtEnd;
+
+	  PRUint32 nGeneralAlive = 0;
+	  PRUint32 nFloatingPointAlive = 0;
+
+	  // Get the number of registers alive at the end of this node.
+	  for (PRInt32 j = currentLive.firstOne(); j != -1; j = currentLive.nextOne(j))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(j);
+		  if (vReg.spillInfo.willSpill)
+			{
+			  currentLive.clear(j);
+			}
+		  else
+			{
+			  switch (vReg.getClass())
+				{
+				case vrcInteger:
+				  nGeneralAlive++;
+				  break;
+				case vrcFloatingPoint:
+				case vrcFixedPoint:
+				  nFloatingPointAlive++;
+				  break;
+				default:
+				  break;
+				}
+			}
+		}
+	  
+//		  if(node.dfsNum == 8) printf("\n________Begin Node %d________\n", node.dfsNum);
+
+		InstructionList& instructions = node.getInstructions();
+	  for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i))
+		{
+		  Instruction&       instruction = instructions.get(i);
+		  InstructionUse*    useBegin    = instruction.getInstructionUseBegin();
+		  InstructionUse*    useEnd      = instruction.getInstructionUseEnd();
+		  InstructionUse*    usePtr;
+		  InstructionDefine* defBegin    = instruction.getInstructionDefineBegin();
+		  InstructionDefine* defEnd      = instruction.getInstructionDefineEnd();
+		  InstructionDefine* defPtr;
+
+//		if(node.dfsNum == 8)  { printf("\n");
+//		instruction.printPretty(stdout);
+//		printf("\n"); }
+
+		  // Handle definitions
+		  for (defPtr = defBegin; defPtr < defEnd; defPtr++)
+			if (defPtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = defPtr->getVirtualRegister();
+				currentLive.clear(vReg.getRegisterIndex());
+				switch (vReg.getClass())
+				  {
+				  case vrcInteger:
+					nGeneralAlive--;
+					break;
+				  case vrcFloatingPoint:
+				  case vrcFixedPoint:
+					nFloatingPointAlive--;
+					break;
+				  default:
+					break;
+				  }
+			  }
+
+		  // Check for deaths
+		  for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+			if (usePtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = usePtr->getVirtualRegister();
+				if (!currentLive.test(vReg.getRegisterIndex()))
+				  // This is the last use of this register.
+				  {
+					currentLive.set(vReg.getRegisterIndex());
+					switch (vReg.getClass())
+					  {
+					  case vrcInteger:
+						nGeneralAlive++;
+						while (/*(nGeneralAlive > NUMBER_OF_GREGISTERS) &&*/ !grNeedLoad.empty())
+						  {
+							PRUint32 toLoad = grNeedLoad.get();
+							currentLive.clear(toLoad);
+							nGeneralAlive--;
+							
+							VirtualRegister& nReg = vRegManager.getVirtualRegister(toLoad);
+							Instruction& lastUsingInstruction = *nReg.spillInfo.lastUsingInstruction;
+							emitter.emitLoadAfter(*lastUsingInstruction.getPrimitive(), lastUsingInstruction.getLinks().prev,
+												  nReg.getAlias(), *nReg.equivalentRegister[vrcStackSlot]);
+							nReg.releaseSelf();
+						  }
+						break;
+					  case vrcFloatingPoint:
+					  case vrcFixedPoint:
+						nFloatingPointAlive++;
+						while (/*(nFloatingPointAlive > NUMBER_OF_FPREGISTERS) &&*/ !fpNeedLoad.empty())
+						  {
+							PRUint32 toLoad = fpNeedLoad.get();
+							currentLive.clear(toLoad);
+							nFloatingPointAlive--;
+							
+							VirtualRegister& nReg = vRegManager.getVirtualRegister(toLoad);
+							Instruction& lastUsingInstruction = *nReg.spillInfo.lastUsingInstruction;
+							emitter.emitLoadAfter(*lastUsingInstruction.getPrimitive(), lastUsingInstruction.getLinks().prev,
+												  nReg.getAlias(), *nReg.equivalentRegister[vrcStackSlot]);
+							nReg.releaseSelf();
+						  }
+						break;
+					  default:
+						break;
+					  }
+				  }
+			  }
+
+		  // Handle uses
+		  for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+			if (usePtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = usePtr->getVirtualRegister();
+				PRUint32 registerIndex = vReg.getRegisterIndex();
+
+				if (vReg.spillInfo.willSpill) {
+#if defined(GENERATE_FOR_X86)
+				  if (!instruction.switchUseToSpill((usePtr - useBegin), *vReg.equivalentRegister[vrcStackSlot]))
+#endif
+					{
+					  switch (vReg.getClass())
+						{
+						case vrcInteger:
+						  if (!grNeedLoad.test(registerIndex))
+							{
+							  grNeedLoad.put(registerIndex);
+							  VirtualRegister& alias = vRegManager.newVirtualRegister(vrcInteger);
+							  if (vReg.isPreColored())
+								  alias.preColorRegister(vReg.getPreColor());
+							  /* if (vReg.hasSpecialInterference) {
+								  alias.specialInterference.sizeTo(NUMBER_OF_REGISTERS);
+								  alias.specialInterference = vReg.specialInterference;
+								  alias.hasSpecialInterference = true;
+							  } */
+							  vReg.setAlias(alias);
+							  vReg.retainSelf();
+							}
+						  break;
+						case vrcFloatingPoint:
+						case vrcFixedPoint:
+						  if (!fpNeedLoad.test(registerIndex))
+							{
+							  fpNeedLoad.put(registerIndex);
+							  VirtualRegister& alias = vRegManager.newVirtualRegister(vReg.getClass());
+							  if (vReg.isPreColored())
+								  alias.preColorRegister(vReg.getPreColor());
+							  /*if (vReg.hasSpecialInterference) {
+								  alias.specialInterference.sizeTo(NUMBER_OF_REGISTERS);
+								  alias.specialInterference = vReg.specialInterference;
+								  alias.hasSpecialInterference = true;
+							  } */
+							  vReg.setAlias(alias);
+							  vReg.retainSelf();
+							}
+						  break;
+						default:
+						  break;
+						}
+					  usePtr->getVirtualRegisterPtr().initialize(vReg.getAlias());
+					  usedInThisInstruction.set(registerIndex);
+					  vReg.spillInfo.lastUsingInstruction = &instruction;
+					}
+				  currentLive.clear(registerIndex);
+				} else { // will not spill
+				  currentLive.set(registerIndex);
+				}
+			  }
+		  
+		  // Handle definitions
+		  for (defPtr = defBegin; defPtr < defEnd; defPtr++)
+			if (defPtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = defPtr->getVirtualRegister();
+				
+				if (vReg.spillInfo.willSpill)
+#if defined(GENERATE_FOR_X86)
+				  if (!instruction.switchDefineToSpill((defPtr - defBegin), *vReg.equivalentRegister[vrcStackSlot]))
+#endif
+					{
+					  if (usedInThisInstruction.test(vReg.getRegisterIndex()))
+						// this virtualRegister was used in this instruction and is also defined. We need to move 
+						// this virtual register to its alias first and then save it to memory.
+						{
+						  emitter.emitStoreAfter(*instruction.getPrimitive(), &instruction.getLinks(), 
+												 vReg.getAlias(), *vReg.equivalentRegister[vrcStackSlot]);
+						  defPtr->getVirtualRegisterPtr().initialize(vReg.getAlias());
+						}
+					  else
+						{
+						  emitter.emitStoreAfter(*instruction.getPrimitive(), &instruction.getLinks(), 
+												 vReg, *vReg.equivalentRegister[vrcStackSlot]);
+						}
+					}
+			  }
+		}
+	  while (!grNeedLoad.empty())
+		{
+		  PRUint32 nl = grNeedLoad.get();
+		  VirtualRegister& nlReg = vRegManager.getVirtualRegister(nl);
+		  Instruction& lastUse = *nlReg.spillInfo.lastUsingInstruction;
+		  
+		  emitter.emitLoadAfter(*lastUse.getPrimitive(), lastUse.getLinks().prev, 
+								nlReg.getAlias(), *nlReg.equivalentRegister[vrcStackSlot]);
+		  nlReg.releaseSelf();
+		}
+	  while (!fpNeedLoad.empty())
+		{
+		  PRUint32 nl = fpNeedLoad.get();
+		  VirtualRegister& nlReg = vRegManager.getVirtualRegister(nl);
+		  Instruction& lastUse = *nlReg.spillInfo.lastUsingInstruction;
+
+		  emitter.emitLoadAfter(*lastUse.getPrimitive(), lastUse.getLinks().prev, 
+								nlReg.getAlias(), *nlReg.equivalentRegister[vrcStackSlot]);
+		  nlReg.releaseSelf();
+		}
+
+//	  if(node.dfsNum == 8) printf("\n________End Node %d________\n", node.dfsNum);
+
+	}
+}
+#endif

mozilla/ef/Compiler/RegisterAllocator/Spilling.h

@@ -0,0 +1,269 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _SPILLING_H_
+#define _SPILLING_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "SparseSet.h"
+
+template <class RegisterPressure>
+class Spilling
+{
+private:
+	static void insertStoreAfter(Instruction& instruction, RegisterName name);
+	static void insertLoadBefore(Instruction& instruction, RegisterName name);
+
+public:
+	static void calculateSpillCosts(RegisterAllocator& registerAllocator);
+	static void insertSpillCode(RegisterAllocator& registerAllocator);
+};
+
+struct SpillCost
+{
+	double loads;
+	double stores;
+	double copies;
+	double cost;
+	bool infinite;
+};
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertSpillCode(RegisterAllocator& registerAllocator)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet currentLive(pool, rangeCount);
+	SparseSet needLoad(pool, rangeCount);
+	SparseSet mustSpill(pool, rangeCount);
+	SparseSet& willSpill = *registerAllocator.willSpill;
+	
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+
+		needLoad.clear();
+		currentLive = liveOut[n];
+		mustSpill = currentLive;
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i);) {
+			Instruction& instruction = instructions.get(i);
+			i = instructions.retreat(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			bool foundLiveDefine = false;
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					if (currentLive.test(name2range[definePtr->getRegisterName()])) {
+						foundLiveDefine = true;
+						break;
+					}
+				} else {
+					foundLiveDefine = true;
+					break;
+				}
+			if (defineBegin != defineEnd && !foundLiveDefine) {
+				fprintf(stderr, "!!! Removed instruction because it was only defining unused registers !!!\n");
+				instruction.remove();
+			}
+
+ 			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					RegisterName range = name2range[definePtr->getRegisterName()];
+#ifdef DEBUG
+					if (needLoad.test(range))
+						if (!mustSpill.test(range) && registerAllocator.spillCost[range].infinite && willSpill.test(range)) {
+							fprintf(stderr, "Tried to spill a register with infinite spill cost\n");
+							abort();
+						}
+#endif // DEBUG
+					if (willSpill.test(range))
+						insertStoreAfter(instruction, range);
+
+					needLoad.clear(range);
+				}
+
+			if (instruction.getFlags() & ifCopy)
+				for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName range = name2range[usePtr->getRegisterName()];
+						if (!currentLive.test(range))
+							for (SparseSet::iterator r = needLoad.begin(); !needLoad.done(r); r = needLoad.advance(r)) {
+								RegisterName load = RegisterName(needLoad.get(r));
+								if (willSpill.test(load))
+									insertLoadBefore(instruction, load);
+								mustSpill.set(load);
+							}
+						needLoad.clear();
+					}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+					currentLive.set(range);
+					needLoad.set(range);
+				}
+		}
+
+		for (SparseSet::iterator l = needLoad.begin(); !needLoad.done(l); l = needLoad.advance(l)) {
+			RegisterName load = RegisterName(needLoad.get(l));
+			if (willSpill.test(load))
+				insertLoadBefore(instructions.first(), load);
+		}		
+	}
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertLoadBefore(Instruction& /*instruction*/, RegisterName name)
+{
+	fprintf(stdout, "will insert load for range %d\n", name);
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertStoreAfter(Instruction& /*instruction*/, RegisterName name)
+{
+	fprintf(stdout, "will insert store for range %d\n", name);
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::calculateSpillCosts(RegisterAllocator& registerAllocator)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet live(pool, rangeCount);
+	SparseSet needLoad(pool, rangeCount);
+	SparseSet mustSpill(pool, rangeCount);
+
+	SparseSet alreadyStored(pool, rangeCount); // FIX: should get this from previous spilling.
+
+	SpillCost* cost = new SpillCost[rangeCount];
+	memset(cost, '\0', rangeCount * sizeof(SpillCost));
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+
+		double weight = doLog10(node.loopDepth);
+
+		needLoad.clear();
+		live = liveOut[n];
+		mustSpill = live;
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					RegisterName range = name2range[definePtr->getRegisterName()];
+
+					if (needLoad.test(range))
+						if (!mustSpill.test(range))
+							cost[range].infinite = true;
+
+					if ((false /* !rematerializable(range) */ || !needLoad.test(range)) && !alreadyStored.test(range))
+						cost[range].stores += weight;
+
+					needLoad.clear(range);
+				}
+
+			if (instruction.getFlags() & ifCopy)
+				for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister())
+						if (!live.test(name2range[usePtr->getRegisterName()])) {
+							for (SparseSet::iterator l = needLoad.begin(); !needLoad.done(l); l = needLoad.advance(l)) {
+								Uint32 range = needLoad.get(l);
+								cost[range].loads += weight;
+								mustSpill.set(range);
+							}
+							needLoad.clear();
+						}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					live.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+
+					live.set(range);
+					needLoad.set(range);
+				}
+
+			if (instruction.getFlags() & ifCopy) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				assert(defineBegin != defineEnd && defineBegin[0].isRegister());
+
+				RegisterName source = name2range[useBegin[0].getRegisterName()];
+				RegisterName destination = name2range[defineBegin[0].getRegisterName()];
+
+				cost[source].copies += weight;
+				cost[destination].copies += weight;
+			}			
+		}
+
+		for (SparseSet::iterator s = needLoad.begin(); !needLoad.done(s); s = needLoad.advance(s))
+			cost[needLoad.get(s)].loads += weight;
+	}
+	
+	for (Uint32 r = 0; r < rangeCount; r++) {
+		SpillCost& c = cost[r];
+		c.cost = 2 * (c.loads + c.stores) - c.copies;
+	}
+
+	registerAllocator.spillCost = cost;
+}
+
+#endif // _SPILLING_H_

mozilla/ef/Compiler/RegisterAllocator/Splits.h

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _SPLITS_H_
+#define _SPLITS_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+template <class RegisterPressure>
+struct Splits
+{
+	static void calculateSplitCosts(RegisterAllocator& registerAllocator);
+	static bool findSplit(RegisterAllocator& registerAllocator, RegisterName* color, RegisterName range);
+	static void insertSplitCode(RegisterAllocator& registerAllocator);
+};
+
+struct SplitCost
+{
+	double loads;
+	double stores;
+};
+
+template <class RegisterPressure>
+void Splits<RegisterPressure>::insertSplitCode(RegisterAllocator& /*registerAllocator*/)
+{
+	// FIX
+}
+
+template <class RegisterPressure>
+bool Splits<RegisterPressure>::findSplit(RegisterAllocator& registerAllocator, RegisterName* color, RegisterName range)
+{
+	Pool& pool = registerAllocator.pool;
+	NameLinkedList** neighborsWithColor = new(pool) NameLinkedList*[6]; // FIX
+	memset(neighborsWithColor, '\0', 6 * sizeof(NameLinkedList*));
+
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+
+	for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+		for (Int32 i = vector->count - 1; i >=0; --i) {
+			RegisterName neighbor = vector->neighbors[i];
+			RegisterName c = color[neighbor];
+
+			if (c < 6) { // FIX
+				NameLinkedList* node = new(pool) NameLinkedList();
+				node->name = neighbor;
+				node->next = neighborsWithColor[c];
+				neighborsWithColor[c] = node;
+			}
+		}
+
+	bool splitAroundName = true;
+
+	LiveRangeGraph<RegisterPressure>& lGraph = registerAllocator.lGraph;
+	RegisterName bestColor = RegisterName(6); // FIX
+	double bestCost = registerAllocator.spillCost[range].cost;
+	SplitCost* splitCost = registerAllocator.splitCost;
+
+	for (RegisterName i = RegisterName(0); i < 6; i = RegisterName(i + 1)) { // FIX
+
+		double splitAroundNameCost = 0.0;
+		bool canSplitAroundName = true;
+
+		SplitCost& sCost = splitCost[range];
+		double addedCost = 2.0 * (sCost.stores + sCost.loads);
+
+		for (NameLinkedList* node = neighborsWithColor[i]; node != NULL; node = node->next) {
+			RegisterName neighbor = node->name;
+			if (lGraph.haveEdge(neighbor, range)) {
+				canSplitAroundName = false;
+				break;
+			} else
+				splitAroundNameCost += addedCost;
+		}
+		if (canSplitAroundName && splitAroundNameCost < bestCost) {
+			bestCost = splitAroundNameCost;
+			bestColor = i;
+			splitAroundName = true;
+		}
+
+		double splitAroundColorCost = 0.0;
+		bool canSplitAroundColor = true;
+
+		for (NameLinkedList* node = neighborsWithColor[i]; node != NULL; node = node->next) {
+			RegisterName neighbor = node->name;
+			if (lGraph.haveEdge(range, neighbor)) {
+				canSplitAroundColor = false;
+				break;
+			} else {
+				SplitCost& sCost = splitCost[neighbor];
+				double addedCost = 2.0 * (sCost.stores + sCost.loads);
+				splitAroundColorCost += addedCost;
+			}
+		}
+		if (canSplitAroundColor && splitAroundColorCost < bestCost) {
+			bestCost = splitAroundColorCost;
+			bestColor = i;
+			splitAroundName = false;
+		}
+ 	}
+	if (bestColor < RegisterName(6)) {
+		color[range] = bestColor;
+		registerAllocator.splitFound = true;
+
+		NameLinkedList** splitAround = registerAllocator.splitAround;
+
+		if (splitAroundName)
+			for (NameLinkedList* node = neighborsWithColor[bestColor]; node != NULL; node = node->next) {
+				NameLinkedList* newNode = new(pool) NameLinkedList();
+				newNode->name = node->name;
+				newNode->next = splitAround[range];
+				splitAround[range] = newNode;
+			}
+		else
+			for (NameLinkedList* node = neighborsWithColor[bestColor]; node != NULL; node = node->next) {
+				NameLinkedList* newNode = new(pool) NameLinkedList();
+				RegisterName neighbor = node->name;
+				newNode->name = range;
+				newNode->next = splitAround[neighbor];
+				splitAround[neighbor] = newNode;
+			}
+
+		trespass("Found a split");
+		return true;
+	}
+
+	return false;
+}
+
+template <class RegisterPressure>
+void Splits<RegisterPressure>::calculateSplitCosts(RegisterAllocator& registerAllocator)
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	SplitCost* splitCost = new(pool) SplitCost[rangeCount];
+	memset(splitCost, '\0', rangeCount * sizeof(SplitCost));
+
+	SparseSet live(pool, rangeCount);
+	RegisterPressure::Set* liveIn = registerAllocator.liveness.liveIn;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		double weight = doLog10(node.loopDepth);
+
+		live = liveOut[n];
+
+		ControlEdge* successorsEnd = node.getSuccessorsEnd();
+		for (ControlEdge* successorsPtr = node.getSuccessorsBegin(); successorsPtr < successorsEnd; successorsPtr++) {
+			ControlNode& successor = successorsPtr->getTarget();
+
+			if (successor.getControlKind() != ckEnd) {
+				RegisterPressure::Set& successorLiveIn = liveIn[successor.dfsNum];
+
+				for (SparseSet::iterator i = live.begin(); !live.done(i); i = live.advance(i)) {
+					RegisterName name = RegisterName(live.get(i));
+					if (!successorLiveIn.test(name))
+						splitCost[name].loads += doLog10(successor.loopDepth);
+				}
+			}
+		}
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					splitCost[name2range[definePtr->getRegisterName()]].stores += weight;
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+					if (!live.test(range)) {
+						if (&instruction != &instructions.last())
+							splitCost[range].loads += weight;
+						else {
+							ControlEdge* successorsEnd = node.getSuccessorsEnd();
+							for (ControlEdge* successorsPtr = node.getSuccessorsBegin(); successorsPtr < successorsEnd; successorsPtr++)
+								splitCost[range].loads += doLog10(successorsPtr->getTarget().loopDepth);
+						}
+					}
+				}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					live.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					live.set(name2range[usePtr->getRegisterName()]);
+		}
+	}
+
+	NameLinkedList** splitAround = new(pool) NameLinkedList*[rangeCount];
+	memset(splitAround, '\0', rangeCount * sizeof(NameLinkedList*));
+	registerAllocator.splitAround = splitAround;
+
+	registerAllocator.splitCost = splitCost;
+	registerAllocator.splitFound = false;
+}
+
+#endif // _SPLITS_H_

mozilla/ef/Compiler/RegisterAllocator/Timer.cpp

@@ -0,0 +1,186 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "HashTable.h"
+#include "Timer.h"
+#include "Pool.h"
+
+static Pool pool;											// Pool for the Timer class.
+static HashTable<TimerEntry*> timerEntries(pool);			// Timers hashtable.
+
+const nTimersInABlock = 128;								// Number of timers in a block.
+static PRTime *timers = new(pool) PRTime[nTimersInABlock];	// A block of timers.
+static Uint8 nextTimer = 0;									// nextAvailableTimer.
+
+//
+// Calibrate the call to PR_Now().
+//
+static PRTime calibrate()
+{
+	PRTime t = PR_Now();
+	PRTime& a = *new(pool) PRTime();
+
+	// Call 10 times the PR_Now() function.
+	a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); 
+	a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); 
+	t = (PR_Now() - t + 9) / 10;
+
+	return t;
+}
+
+static PRTime adjust = calibrate();
+
+//
+// Return the named timer..
+//
+TimerEntry& Timer::getTimerEntry(const char* name)
+{
+	if (!timerEntries.exists(name)) {
+		TimerEntry* newEntry = new(pool) TimerEntry();
+		newEntry->accumulator = 0;
+		newEntry->running = false;
+		timerEntries.add(name, newEntry);
+	}
+
+	return *timerEntries[name];
+}
+
+//
+// Return a reference to a new timer.
+//
+PRTime& Timer::getNewTimer()
+{
+	if (nextTimer >= nTimersInABlock) {
+		timers = new(pool) PRTime[nTimersInABlock];
+		nextTimer = 0;
+	}
+	return timers[nextTimer++];
+}
+
+static Uint32 timersAreFrozen = 0;
+
+//
+// Start the named timer.
+//
+void Timer::start(const char* name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+	PR_ASSERT(!timer.running);
+
+	timer.accumulator = 0;
+	timer.running = true;
+	timer.done = false;
+
+	unfreezeTimers();
+}
+
+//
+// Stop the named timer.
+//
+void Timer::stop(const char* name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+	PR_ASSERT(timer.running);
+	timer.running = false;
+	timer.done = true;
+
+	unfreezeTimers();
+}
+
+//
+// Freeze all the running timers.
+//
+void Timer::freezeTimers()
+{
+	PRTime when = PR_Now() - adjust;
+
+	if (timersAreFrozen == 0) {
+		Vector<TimerEntry*> entries = timerEntries;
+		Uint32 count = entries.size();
+
+		for (Uint32 i = 0; i < count; i++) {
+			TimerEntry& entry = *entries[i];
+			if (entry.running) {
+				entry.accumulator += (when - *entry.startTime);
+			}
+		}
+	}
+	timersAreFrozen++;
+}
+ 
+//
+// Unfreeze all the running timers.
+//
+void Timer::unfreezeTimers()
+{
+	PR_ASSERT(timersAreFrozen != 0);
+	timersAreFrozen--;
+
+	if (timersAreFrozen == 0) {
+		Vector<TimerEntry *> entries = timerEntries;
+		Uint32 count = entries.size();
+		
+		PRTime& newStart = getNewTimer();
+		
+		for (Uint32 i = 0; i < count; i++) {
+			TimerEntry& entry = *entries[i];
+			if (entry.running) {
+				entry.startTime = &newStart;
+			}
+		}
+		
+		newStart = PR_Now();
+	}
+}
+
+//
+// Print the named timer in the file f.
+//
+void Timer::print(FILE* f, const char *name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+  
+	PR_ASSERT(timer.done);
+	PRTime elapsed = timer.accumulator;
+
+	if (elapsed >> 32) {
+		fprintf(f, "[timer %s out of range]\n", name);
+	} else {
+		fprintf(f, "[%dus in %s]\n", Uint32(elapsed), name);
+	}
+	fflush(f);
+
+	unfreezeTimers();
+}
+

mozilla/ef/Compiler/RegisterAllocator/Timer.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _TIMER_H_
+#define _TIMER_H_
+
+#include "Fundamentals.h"
+#include "HashTable.h"
+#include "prtime.h"
+
+//
+// Naming convention:
+//  As the class Timer contains only static methods, the timer's name should start with the 
+//  module name. Otherwise starting 2 timers with the same name will assert.
+//
+
+#ifndef NO_TIMER
+
+struct TimerEntry
+{
+	PRTime *startTime;					// Current time when we start the timer.
+	PRTime accumulator;					// Time spent in this timer.
+	bool running;						// True if the timer is running.
+	bool done;							// True if the timer was running and was stopped. 
+};
+
+class Timer
+{
+private:
+
+	// Return the named timer.
+	static TimerEntry& getTimerEntry(const char* name);
+	// Return a reference to a new Timer.
+	static PRTime& getNewTimer();
+
+public:
+
+	// Start the timer.
+	static void start(const char* name);
+	// Stop the timer.
+	static void stop(const char* name);
+	// Freeze all the running timers.
+	static void freezeTimers();
+	// Unfreeze all the running timers.
+	static void unfreezeTimers();
+	// Print the timer.
+	static void print(FILE* f, const char *name);
+};
+
+inline void startTimer(const char* name) 		{Timer::start(name);}
+inline void stopTimer(const char* name) 		{Timer::stop(name); Timer::print(stdout, name);}
+#define START_TIMER_SAFE						Timer::freezeTimers();
+#define END_TIMER_SAFE							Timer::unfreezeTimers();
+#define TIMER_SAFE(x)							START_TIMER_SAFE x; END_TIMER_SAFE
+
+#else /* NO_TIMER */
+
+inline void startTimer(const char* /*name*/) 	{} 
+inline void stopTimer(const char* /*name*/) 	{} 
+#define START_TIMER_SAFE
+#define END_TIMER_SAFE
+#define TIMER_SAFE(x)							x;
+
+#endif /* NO_TIMER */
+#endif /* _TIMER_H_ */

mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "Fundamentals.h"
+#include "VirtualRegister.h"
+#include "Instruction.h"
+
+//------------------------------------------------------------------------------
+// VirtualRegister -
+
+#ifdef MANUAL_TEMPLATES
+template class IndexedPool<VirtualRegister>;
+#endif
+
+// Set the defining instruction.
+//
+void VirtualRegister::setDefiningInstruction(Instruction& instruction)
+{
+	if (definingInstruction != NULL) {
+		if ((instruction.getFlags() & ifCopy) && (definingInstruction->getFlags() & ifPhiNode))
+			return;
+	}
+	definingInstruction = &instruction;
+}
+

mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h

@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _VIRTUAL_REGISTER_H_
+#define _VIRTUAL_REGISTER_H_
+
+#include "Fundamentals.h"
+#include "IndexedPool.h"
+#include <string.h>
+
+#include "RegisterTypes.h"
+#include "RegisterClass.h"
+
+
+//------------------------------------------------------------------------------
+// VirtualRegister - 24b
+
+class Instruction;
+
+class VirtualRegister : public IndexedObject<VirtualRegister>
+{
+public:
+
+	Instruction*					definingInstruction;	// Instruction defining this VR.
+
+	// Initialize a VR of the given classKind.
+	VirtualRegister(RegisterClassKind /*classKind*/) : definingInstruction(NULL) {}
+
+	// Return the defining instruction for this VR.
+	Instruction* getDefiningInstruction() const {return definingInstruction;}
+	// Set the defining instruction.
+	void setDefiningInstruction(Instruction& insn);
+};
+
+// Return true if the VirtualRegisters are equals. The only way 2 VRs can be equal is if
+// they have the same index. If they have the same index then they are at the same
+// address in the indexed pool.
+//
+inline bool operator == (const VirtualRegister& regA, const VirtualRegister& regB) {return &regA == &regB;}
+
+//------------------------------------------------------------------------------
+// VirtualRegisterManager -
+
+struct PreColoredRegister
+{
+	RegisterID id;
+	RegisterName color;
+};
+
+class VirtualRegisterManager
+{
+private:
+
+	IndexedPool<VirtualRegister> registerPool;
+	PreColoredRegister machineRegister[6];
+
+public:
+	VirtualRegisterManager()
+		{
+			for (Uint32 i = 0; i < 6; i++)
+				machineRegister[i].id = invalidID;
+		}
+
+	// Return the VirtualRegister at the given index.
+	VirtualRegister& getVirtualRegister(RegisterName name) const {return registerPool.get(name);}
+
+	// Return a new VirtualRegister.
+	RegisterID newVirtualRegister(RegisterClassKind classKind)
+		{
+			VirtualRegister& vReg = *new(registerPool) VirtualRegister(classKind);
+			RegisterID rid;
+
+			setName(rid, RegisterName(vReg.getIndex()));
+			setClass(rid, classKind);
+			return rid;
+		}
+
+	RegisterID newMachineRegister(RegisterName name, RegisterClassKind classKind)
+		{
+			RegisterID rid = machineRegister[name].id;
+
+			if (rid == invalidID) {
+				rid = newVirtualRegister(classKind);
+				DEBUG_ONLY(setMachineRegister(rid));
+				machineRegister[name].id = rid;
+				machineRegister[name].color = name;
+			}
+
+			return rid;
+		}
+
+	PreColoredRegister* getMachineRegistersBegin() const {return (PreColoredRegister*) machineRegister;} // FIX
+	PreColoredRegister* getMachineRegistersEnd() const {return (PreColoredRegister*) &machineRegister[6];} // FIX
+
+	// Return the VirtualRegister universe size.
+	Uint32 getSize() {return registerPool.getSize();}
+
+	void setSize(Uint32 size) {registerPool.setSize(size);}
+};
+
+#endif // _VIRTUAL_REGISTER_H_

mozilla/layout/Makefile.in

@@ -1,46 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= base html xul
-
-ifdef MOZ_MATHML
-DIRS           += mathml
-endif
-
-ifdef MOZ_SVG
-DIRS           += svg
-endif
-
-DIRS           += build
-
-ifdef ENABLE_TESTS
-DIRS		+= html/tests
-endif
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/layout/base/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/layout/base/makefile.win

@@ -1,30 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-
-DIRS=public src \
-!if !defined(DISABLE_TESTS)
-     tests \
-!endif
-     $(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/layout/base/public/MANIFEST

@@ -1,41 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:layout directory
-#
-nsFrameList.h
-nsFrameTraversal.h
-nsHTMLReflowState.h
-nsIAutoCopy.h
-nsICaret.h
-nsIFocusTracker.h
-nsIFrame.h
-nsIFrameDebug.h
-nsIFrameImageLoader.h
-nsIFrameManager.h
-nsIFrameSelection.h
-nsIFrameUtil.h
-nsIIndependentSelection.h
-nsILayoutDebugger.h
-nsILayoutHistoryState.h
-nsIMutableStyleContext.h
-nsIPageSequenceFrame.h
-nsIPresContext.h
-nsIPresShell.h
-nsIPresState.h
-nsIPrintContext.h
-nsIReflowCallback.h
-nsIReflowCommand.h
-nsIScrollableFrame.h
-nsIScrollableViewProvider.h
-nsISpaceManager.h
-nsIStatefulFrame.h
-nsIStyleContext.h
-nsIStyleSet.h
-nslayout.h
-nsStyleChangeList.h
-nsStyleConsts.h
-nsIStyleFrameConstruction.h
-nsStyleStruct.h
-nsIFrameTraversal.h
-nsIObjectFrame.h
-nsIImageFrame.h
-nsITextFrame.h

mozilla/layout/base/public/MANIFEST_IDL

@@ -1,6 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:idl directory
-#
-
-nsIChromeEventHandler.idl
-nsIPrintListener.idl

mozilla/layout/base/public/Makefile.in

@@ -1,87 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= layout
-XPIDL_MODULE	= layout_base
-
-EXPORTS		= \
-nslayout.h \
-nsHTMLReflowState.h \
-nsIAutoCopy.h \
-nsICaret.h \
-nsIFocusTracker.h \
-nsIFrame.h \
-nsIImageFrame.h \
-nsIObjectFrame.h \
-nsIFrameTraversal.h \
-nsIFrameDebug.h \
-nsIFrameImageLoader.h \
-nsIFrameManager.h \
-nsIIndependentSelection.h \
-nsILayoutDebugger.h \
-nsIFrameUtil.h \
-nsIPageSequenceFrame.h \
-nsIPresContext.h \
-nsIPresShell.h \
-nsIPresState.h \
-nsIPrintContext.h \
-nsIReflowCallback.h \
-nsIReflowCommand.h \
-nsIFrameSelection.h \
-nsISpaceManager.h \
-nsIStyleContext.h \
-nsIMutableStyleContext.h \
-nsIStyleFrameConstruction.h \
-nsIStyleSet.h \
-nsFrameList.h \
-nsFrameTraversal.h \
-nsStyleChangeList.h \
-nsStyleConsts.h \
-nsStyleStruct.h \
-nsILayoutHistoryState.h \
-nsIStatefulFrame.h \
-nsIScrollableFrame.h \
-nsIScrollableViewProvider.h \
-$(NULL)
-
-ifdef IBMBIDI
-EXPORTS		+= \
-		nsBidiPresUtils.h \
-		nsITextFrame.h \
-		$(NULL)
-endif                
-
-XPIDLSRCS	= \
-		nsIChromeEventHandler.idl	\
-		nsIPrintListener.idl        \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/layout/base/public/makefile.win

@@ -1,77 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-EXPORTS =				\
-	nslayout.h			\
-	nsHTMLReflowState.h		\
-	nsIAutoCopy.h			\
-	nsICaret.h			\
-	nsIFocusTracker.h		\
-	nsIFrame.h			\
-	nsIObjectFrame.h			\
-	nsIImageFrame.h			\
-	nsIFrameTraversal.h			\
-	nsIFrameDebug.h			\
-	nsIFrameImageLoader.h		\
-	nsIFrameManager.h		\
-	nsIIndependentSelection.h		\
-	nsILayoutDebugger.h		\
-	nsIFrameUtil.h			\
-	nsIPageSequenceFrame.h		\
-	nsIPresContext.h		\
-	nsIPresShell.h			\
-	nsIPresState.h          \
-  nsIReflowCallback.h \
-	nsIReflowCommand.h		\
-	nsIFrameSelection.h		\
-	nsISpaceManager.h		\
-	nsIStyleContext.h		\
-	nsIMutableStyleContext.h		\
-	nsIStyleFrameConstruction.h	\
-	nsIStyleSet.h			\
-	nsFrameList.h			\
-	nsFrameTraversal.h		\
-	nsStyleChangeList.h		\
-	nsStyleConsts.h			\
-	nsStyleStruct.h			\
-	nsILayoutHistoryState.h \
-	nsIStatefulFrame.h \
-	nsIScrollableFrame.h \
-	nsIScrollableViewProvider.h \
-  nsIPrintContext.h \
-!ifdef IBMBIDI
-	nsBidiPresUtils.h		\
-	nsITextFrame.h			\
-!endif
-	$(NULL)
-
-MODULE=layout_base
-
-XPIDLSRCS=					\
-		.\nsIChromeEventHandler.idl	\
-		.\nsIPrintListener.idl          \
-		$(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/layout/base/public/nsBidiPresUtils.h

@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * IBM Corporation.  Portions created by IBM are
- * Copyright (C) 2000 IBM Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *
- */
-
-#ifdef IBMBIDI
-
-#ifndef nsBidiPresUtils_h___
-#define nsBidiPresUtils_h___
-
-#include "nsVoidArray.h"
-#include "nsIFrame.h"
-#include "nsIBidi.h"
-
-class nsIUBidiUtils;
-
-class nsBidiPresUtils {
-public:
-  nsBidiPresUtils();
-  ~nsBidiPresUtils();
-  PRBool IsSuccessful(void) const;
-  
-  /**
-   *  Make Bidi engine calculate embedding levels of the frames.
-   *
-   *  @lina 06/18/2000
-   */
-  nsresult Resolve(nsIPresContext* aPresContext,
-                   nsIFrame*       aBlockFrame,
-                   nsIFrame*       aFirstChild,
-                   PRBool&         aForceReflow);
-
-  /**
-   * Reorder this line using Bidi engine.
-   * Update frame array, following the new visual sequence.
-   * 
-   * @lina 05/02/2000
-   */
-  void ReorderFrames(nsIPresContext*      aPresContext,
-                     nsIRenderingContext* aRendContext,
-                     nsIFrame*            aFirstChild,
-                     nsIFrame*            aNextInFlow,
-                     PRInt32              aChildCount);
-
-  /**
-   * Format Unicode text, taking into account bidi capabilities
-   * of the platform. The formatting includes: reordering, Arabic shaping,
-   * symmetric and numeric swapping, removing control characters.
-   *
-   * @lina 06/18/2000 
-   */
-  nsresult FormatUnicodeText(nsIPresContext* aPresContext,
-                             PRUnichar*      aText,
-                             PRInt32&        aTextLength,
-                             nsCharType      aCharType,
-                             PRBool          aIsOddLevel,
-                             PRBool          aIsBidiSystem);
-
-  /**
-   * Return our nsIBidi object (bidi reordering engine)
-   */
-  nsresult GetBidiEngine(nsIBidi** aBidiEngine);
-
-private:
-  /**
-   *  Create a string containing entire text content of this block.
-   *
-   *  @lina 05/02/2000
-   */
-  void CreateBlockBuffer(nsIPresContext* aPresContext);
-
-  /**
-   * Set up an array of the frames after splitting frames so that each frame has
-   * consistent directionality. At this point the frames are still in logical
-   * order
-   */
-  nsresult InitLogicalArray(nsIPresContext* aPresContext,
-                            nsIFrame*       aCurrentFrame,
-                            nsIFrame*       aNextInFlow,
-                            PRBool          aAddMarkers = PR_FALSE);
-  /**
-   * Reorder the frame array from logical to visual order
-   *
-   * @param aPresContext the presentation context
-   * @param aBidiEnabled TRUE on return if the visual order is different from
-   *                      the logical order
-   */
-  nsresult Reorder(nsIPresContext* aPresContext,
-                   PRBool&         aBidiEnabled);
-  
-  /**
-   *  Adjust frame positions following their visual order
-   *
-   *  @param  <code>nsIPresContext*</code>, the first kid
-   *
-   *  @lina 04/11/2000
-   */
-  void RepositionInlineFrames(nsIPresContext*      aPresContext,
-                              nsIRenderingContext* aRendContext,
-                              nsIFrame*            aFirstChild,
-                              PRInt32              aChildCount) const;
-  
-  void RepositionContainerFrame(nsIPresContext* aPresContext,
-                                nsIFrame*       aContainer,
-                                PRInt32&        aMinX,
-                                PRInt32&        aMaxX) const;
-  PRBool EnsureBidiContinuation(nsIPresContext* aPresContext,
-                                nsIContent*     aContent,
-                                nsIFrame*       aFrame,
-                                nsIFrame**      aNewFrame,
-                                PRInt32&        aFrameIndex);
-  PRBool RemoveBidiContinuation(nsIPresContext* aPresContext,
-                                nsIFrame*       aFrame,
-                                nsIFrame*       aNextFrame,
-                                nsIContent*     aContent,
-                                PRInt32&        aFrameIndex,
-                                PRInt32&        aOffset) const;
-  void CalculateCharType(PRInt32  aLimit,
-                         PRInt32& aOffset,
-                         PRUint8& aCharType,
-                         PRUint8& aPrevCharType) const;
-  
-  nsAutoString    mBuffer;
-  nsVoidArray     mLogicalFrames;
-  nsVoidArray     mVisualFrames;
-  PRInt32         mArraySize;
-  PRInt32*        mIndexMap;
-  PRUint8*        mLevels;
-  nsresult        mSuccess;
-
-  nsIBidi*        mBidiEngine;
-  nsIUBidiUtils*  mUnicodeUtils;
-};
-
-#endif /* nsBidiPresUtils_h___ */
-
-#endif // IBMBIDI

mozilla/layout/base/public/nsFrameList.h

@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsFrameList_h___
-#define nsFrameList_h___
-
-#include "nsIFrame.h"
-
-/**
- * A class for managing a singly linked list of frames. Frames are
- * linked together through their next-sibling pointer.
- */
-class nsFrameList {
-public:
-  nsFrameList() {
-    mFirstChild = nsnull;
-  }
-
-  nsFrameList(nsIFrame* aHead) {
-    mFirstChild = aHead;
-  }
-
-  ~nsFrameList() {
-  }
-
-  void DestroyFrames(nsIPresContext* aPresContext);
-
-  void SetFrames(nsIFrame* aFrameList) {
-    mFirstChild = aFrameList;
-  }
-
-  void AppendFrames(nsIFrame* aParent, nsIFrame* aFrameList);
-
-  void AppendFrames(nsIFrame* aParent, nsFrameList& aFrameList) {
-    AppendFrames(aParent, aFrameList.mFirstChild);
-    aFrameList.mFirstChild = nsnull;
-  }
-
-  void AppendFrame(nsIFrame* aParent, nsIFrame* aFrame);
-
-  // Take aFrame out of the frame list. This also disconnects aFrame
-  // from the sibling list. This will return PR_FALSE if aFrame is
-  // nsnull or if aFrame is not in the list.
-  PRBool RemoveFrame(nsIFrame* aFrame);
-
-  // Remove the first child from the list. The caller is assumed to be
-  // holding a reference to the first child. This call is equivalent
-  // in behavior to calling RemoveFrame(FirstChild()).
-  PRBool RemoveFirstChild();
-
-  // Take aFrame out of the frame list and then destroy it. This also
-  // disconnects aFrame from the sibling list. This will return
-  // PR_FALSE if aFrame is nsnull or if aFrame is not in the list.
-  PRBool DestroyFrame(nsIPresContext* aPresContext, nsIFrame* aFrame);
-
-  void InsertFrame(nsIFrame* aParent,
-                   nsIFrame* aPrevSibling,
-                   nsIFrame* aNewFrame);
-
-  void InsertFrames(nsIFrame* aParent,
-                    nsIFrame* aPrevSibling,
-                    nsIFrame* aFrameList);
-
-  void InsertFrames(nsIFrame* aParent, nsIFrame* aPrevSibling,
-                    nsFrameList& aFrameList) {
-    InsertFrames(aParent, aPrevSibling, aFrameList.FirstChild());
-    aFrameList.mFirstChild = nsnull;
-  }
-
-  PRBool ReplaceFrame(nsIFrame* aParent,
-                      nsIFrame* aOldFrame,
-                      nsIFrame* aNewFrame);
-
-  PRBool ReplaceAndDestroyFrame(nsIPresContext* aPresContext,
-                                nsIFrame* aParent,
-                                nsIFrame* aOldFrame,
-                                nsIFrame* aNewFrame);
-
-  PRBool Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult);
-
-  nsIFrame* PullFrame(nsIFrame* aParent,
-                      nsIFrame* aLastChild,
-                      nsFrameList& aFromList);
-
-  nsIFrame* FirstChild() const {
-    return mFirstChild;
-  }
-
-  nsIFrame* LastChild() const;
-
-  nsIFrame* FrameAt(PRInt32 aIndex) const;
-
-  PRBool IsEmpty() const {
-    return nsnull == mFirstChild;
-  }
-
-  PRBool NotEmpty() const {
-    return nsnull != mFirstChild;
-  }
-
-  PRBool ContainsFrame(const nsIFrame* aFrame) const;
-
-  PRInt32 GetLength() const;
-
-  nsIFrame* GetPrevSiblingFor(nsIFrame* aFrame) const;
-
-#ifdef IBMBIDI
-  /**
-   * Return the frame before this frame in visual order (after Bidi reordering)
-   */
-  nsIFrame* GetPrevVisualFor(nsIFrame* aFrame) const;
-
-  /**
-   * Return the frame after this frame in visual order (after Bidi reordering)
-   */
-  nsIFrame* GetNextVisualFor(nsIFrame* aFrame) const;
-#endif // IBMBIDI
-
-  void VerifyParent(nsIFrame* aParent) const;
-
-#ifdef NS_DEBUG
-  void List(nsIPresContext* aPresContext, FILE* out) const;
-#endif
-
-protected:
-  nsIFrame* mFirstChild;
-};
-
-#endif /* nsFrameList_h___ */

mozilla/layout/base/public/nsFrameTraversal.h

@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef NSFRAMETRAVERSAL_H
-#define NSFRAMETRAVERSAL_H
-
-#include "nsIEnumerator.h"
-#include "nsIFrame.h"
-#include "nsIFrameTraversal.h"
-
-nsresult NS_NewFrameTraversal(nsIBidirectionalEnumerator **aEnumerator,
-                              nsTraversalType aType,
-                              nsIPresContext* aPresContext,
-                              nsIFrame *aStart);
-
-nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
-
-class nsFrameTraversal : public nsIFrameTraversal
-{
-public:
-  nsFrameTraversal();
-  virtual ~nsFrameTraversal();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD NewFrameTraversal(nsIBidirectionalEnumerator **aEnumerator,
-                              PRUint32 aType,
-                              nsIPresContext* aPresContext,
-                              nsIFrame *aStart);
-};
-
-#endif //NSFRAMETRAVERSAL_H

mozilla/layout/base/public/nsHTMLReflowState.h

@@ -1,411 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsHTMLReflowState_h___
-#define nsHTMLReflowState_h___
-
-#include "nslayout.h"
-
-class nsIFrame;
-class nsIPresContext;
-class nsIReflowCommand;
-class nsIRenderingContext;
-class nsISpaceManager;
-class nsLineLayout;
-
-struct nsStyleDisplay;
-struct nsStylePosition;
-struct nsStyleBorder;
-struct nsStyleMargin;
-struct nsStylePadding;
-struct nsStyleText;
-struct nsHypotheticalBox;
-
-/**
- * Constant used to indicate an unconstrained size.
- *
- * @see #Reflow()
- */
-#define NS_UNCONSTRAINEDSIZE NS_MAXSIZE
-
-/**
- * The reason the frame is being reflowed.
- *
- * XXX Should probably be a #define so it can be extended for specialized
- * reflow interfaces...
- *
- * @see nsHTMLReflowState
- */
-enum nsReflowReason {
-  eReflowReason_Initial = 0,       // initial reflow of a newly created frame
-  eReflowReason_Incremental = 1,   // an incremental change has occured. see the reflow command for details
-  eReflowReason_Resize = 2,        // general request to determine a desired size
-  eReflowReason_StyleChange = 3,   // request to reflow because of a style change. Note: you must reflow
-                                   // all your child frames
-  eReflowReason_Dirty = 4          // request to reflow because you and/or your children are dirty
-};
-
-/**
- * CSS Frame type. Included as part of the reflow state.
- */
-typedef PRUint32  nsCSSFrameType;
-
-#define NS_CSS_FRAME_TYPE_UNKNOWN         0
-#define NS_CSS_FRAME_TYPE_INLINE          1
-#define NS_CSS_FRAME_TYPE_BLOCK           2  /* block-level in normal flow */
-#define NS_CSS_FRAME_TYPE_FLOATING        3
-#define NS_CSS_FRAME_TYPE_ABSOLUTE        4
-#define NS_CSS_FRAME_TYPE_INTERNAL_TABLE  5  /* row group frame, row frame, cell frame, ... */
-
-/**
- * Bit-flag that indicates whether the element is replaced. Applies to inline,
- * block-level, floating, and absolutely positioned elements
- */
-#define NS_CSS_FRAME_TYPE_REPLACED        0x8000
-
-/**
- * Helper macros for telling whether items are replaced
- */
-#define NS_FRAME_IS_REPLACED(_ft) \
-  (NS_CSS_FRAME_TYPE_REPLACED == ((_ft) & NS_CSS_FRAME_TYPE_REPLACED))
-
-#define NS_FRAME_REPLACED(_ft) \
-  (NS_CSS_FRAME_TYPE_REPLACED | (_ft))
-
-/**
- * A macro to extract the type. Masks off the 'replaced' bit-flag
- */
-#define NS_FRAME_GET_TYPE(_ft) \
-  ((_ft) & ~NS_CSS_FRAME_TYPE_REPLACED)
-
-#define NS_INTRINSICSIZE    NS_UNCONSTRAINEDSIZE
-#define NS_SHRINKWRAPWIDTH  NS_UNCONSTRAINEDSIZE
-#define NS_AUTOHEIGHT       NS_UNCONSTRAINEDSIZE
-#define NS_AUTOMARGIN       NS_UNCONSTRAINEDSIZE
-#define NS_AUTOOFFSET       NS_UNCONSTRAINEDSIZE
-// NOTE: there are assumptions all over that these have the same value, namely NS_UNCONSTRAINEDSIZE
-//       if any are changed to be a value other than NS_UNCONSTRAINEDSIZE
-//       at least update AdjustComputedHeight/Width and test ad nauseum
-
-/**
- * Reflow state passed to a frame during reflow.
- *
- * @see nsIFrame#Reflow()
- */
-struct nsHTMLReflowState {
-  // the reflow states are linked together. this is the pointer to the
-  // parent's reflow state
-  const nsHTMLReflowState* parentReflowState;
-
-  // the frame being reflowed
-  nsIFrame*           frame;
-
-  // the reason for the reflow
-  nsReflowReason      reason;
-
-  // the reflow command. only set for a reflow reason of eReflowReason_Incremental
-  nsIReflowCommand*   reflowCommand;
-
-  // the available space in which to reflow the frame. The space represents the
-  // amount of room for the frame's border, padding, and content area (not the
-  // margin area. The parent frame deals with the child frame's margins). The
-  // frame size you choose should fit within the available space.
-  // A value of NS_UNCONSTRAINEDSIZE for the available height means you can
-  // choose whatever size you want. In galley mode the available height is always
-  // NS_UNCONSTRAINEDSIZE, and only page mode involves a constrained height
-  nscoord              availableWidth, availableHeight;
-
-  // rendering context to use for measurement
-  nsIRenderingContext* rendContext;
-
-  // is the current context at the top of a page?
-  PRPackedBool     isTopOfPage;
-
-  // The type of frame, from css's perspective. This value is
-  // initialized by the Init method below.
-  nsCSSFrameType   mFrameType;
-
-  // pointer to the space manager associated with this area
-  nsISpaceManager* mSpaceManager;
-
-  // LineLayout object (only for inline reflow; set to NULL otherwise)
-  nsLineLayout*    mLineLayout;
-
-  // The computed width specifies the frame's content area width, and it does
-  // not apply to inline non-replaced elements
-  //
-  // For replaced inline frames, a value of NS_INTRINSICSIZE means you should
-  // use your intrinsic width as the computed width
-  //
-  // For block-level frames, the computed width is based on the width of the
-  // containing block, the margin/border/padding areas, and the min/max width.
-  // A value of NS_SHRINKWRAPWIDTH means that you should choose a width based
-  // on your content. The width may be as large as the specified maximum width
-  // (see mComputedMaxWidth).
-  nscoord          mComputedWidth; 
-
-  // The computed height specifies the frame's content height, and it does
-  // not apply to inline non-replaced elements
-  //
-  // For replaced inline frames, a value of NS_INTRINSICSIZE means you should
-  // use your intrinsic height as the computed height
-  //
-  // For non-replaced block-level frames in the flow and floated, a value of
-  // NS_AUTOHEIGHT means you choose a height to shrink wrap around the normal
-  // flow child frames. The height must be within the limit of the min/max
-  // height if there is such a limit
-  //
-  // For replaced block-level frames, a value of NS_INTRINSICSIZE
-  // means you use your intrinsic height as the computed height
-  nscoord          mComputedHeight;
-
-  // Computed margin values
-  nsMargin         mComputedMargin;
-
-  // Cached copy of the border values
-  nsMargin         mComputedBorderPadding;
-
-  // Computed padding values
-  nsMargin         mComputedPadding;
-
-  // Computed values for 'left/top/right/bottom' offsets. Only applies to
-  // 'positioned' elements
-  nsMargin         mComputedOffsets;
-
-  // Computed values for 'min-width/max-width' and 'min-height/max-height'
-  nscoord          mComputedMinWidth, mComputedMaxWidth;
-  nscoord          mComputedMinHeight, mComputedMaxHeight;
-
-  // Compact margin available space
-  nscoord          mCompactMarginWidth;
-
-  // The following data members are relevant if nsStyleText.mTextAlign
-  // == NS_STYLE_TEXT_ALIGN_CHAR
-
-  // distance from reference edge (as specified in nsStyleDisplay.mDirection) 
-  // to the align character (which will be specified in nsStyleTable)
-  nscoord          mAlignCharOffset;
-
-  // if true, the reflow honors alignCharOffset and does not
-  // set it. if false, the reflow sets alignCharOffset
-  PRPackedBool     mUseAlignCharOffset;
-
-  // Cached pointers to the various style structs used during intialization
-  const nsStyleDisplay* mStyleDisplay;
-  const nsStylePosition* mStylePosition;
-  const nsStyleBorder* mStyleBorder;
-  const nsStyleMargin* mStyleMargin;
-  const nsStylePadding* mStylePadding;
-  const nsStyleText* mStyleText;
-
-  // This value keeps track of how deeply nested a given reflow state
-  // is from the top of the frame tree.
-  PRInt32 mReflowDepth;
-
-#ifdef IBMBIDI
-  nscoord mRightEdge;
-#endif
-
-#ifdef DEBUG
-  // hook for attaching debug info (e.g. tables may attach a timer during reflow)
-  void* mDebugHook;
-#endif
-
-  // Note: The copy constructor is written by the compiler
-  // automatically. You can use that and then override specific values
-  // if you want, or you can call Init as desired...
-
-  // Initialize a <b>root</b> reflow state with a rendering context to
-  // use for measuring things.
-  nsHTMLReflowState(nsIPresContext*          aPresContext,
-                    nsIFrame*                aFrame,
-                    nsReflowReason           aReason,
-                    nsIRenderingContext*     aRenderingContext,
-                    const nsSize&            aAvailableSpace);
-
-  // Initialize a <b>root</b> reflow state for an <b>incremental</b>
-  // reflow.
-  nsHTMLReflowState(nsIPresContext*          aPresContext,
-                    nsIFrame*                aFrame,
-                    nsIReflowCommand&        aReflowCommand,
-                    nsIRenderingContext*     aRenderingContext,
-                    const nsSize&            aAvailableSpace);
-
-  // Initialize a reflow state for a child frames reflow. Some state
-  // is copied from the parent reflow state; the remaining state is
-  // computed.
-  nsHTMLReflowState(nsIPresContext*          aPresContext,
-                    const nsHTMLReflowState& aParentReflowState,
-                    nsIFrame*                aFrame,
-                    const nsSize&            aAvailableSpace,
-                    nsReflowReason           aReason);
-
-  // Same as the previous except that the reason is taken from the
-  // parent's reflow state.
-  nsHTMLReflowState(nsIPresContext*          aPresContext,
-                    const nsHTMLReflowState& aParentReflowState,
-                    nsIFrame*                aFrame,
-                    const nsSize&            aAvailableSpace);
-
-  // Used when you want to override the default containing block
-  // width and height. Used by absolute positioning code
-  nsHTMLReflowState(nsIPresContext*          aPresContext,
-                    const nsHTMLReflowState& aParentReflowState,
-                    nsIFrame*                aFrame,
-                    const nsSize&            aAvailableSpace,
-                    nscoord                  aContainingBlockWidth,
-                    nscoord                  aContainingBlockHeight);
-
-  /**
-   * Get the containing block reflow state, starting from a frames
-   * <B>parent</B> reflow state (the parent reflow state may or may not end
-   * up being the containing block reflow state)
-   */
-  static const nsHTMLReflowState*
-    GetContainingBlockReflowState(const nsHTMLReflowState* aParentRS);
-
-  /**
-   * First find the containing block's reflow state using
-   * GetContainingBlockReflowState, then ask the containing block for
-   * it's content width using GetContentWidth
-   */
-  static nscoord
-    GetContainingBlockContentWidth(const nsHTMLReflowState* aParentRS);
-
-  /**
-   * Get the page box reflow state, starting from a frames
-   * <B>parent</B> reflow state (the parent reflow state may or may not end
-   * up being the containing block reflow state)
-   */
-  static const nsHTMLReflowState*
-    GetPageBoxReflowState(const nsHTMLReflowState* aParentRS);
-
-  /**
-   * Compute the border plus padding for <TT>aFrame</TT>. If a
-   * percentage needs to be computed it will be computed by finding
-   * the containing block, use GetContainingBlockReflowState.
-   * aParentReflowState is aFrame's
-   * parent's reflow state. The resulting computed border plus padding
-   * is returned in aResult.
-   */
-  static void ComputeBorderPaddingFor(nsIFrame* aFrame,
-                                      const nsHTMLReflowState* aParentRS,
-                                      nsMargin& aResult);
-
-  /**
-   * Calculate the raw line-height property for the given frame. The return
-   * value, if line-height was applied and is valid will be >= 0. Otherwise,
-   * the return value will be <0 which is illegal (CSS2 spec: section 10.8.1).
-   */
-  static nscoord CalcLineHeight(nsIPresContext* aPresContext,
-                                nsIRenderingContext* aRenderingContext,
-                                nsIFrame* aFrame);
-
-  static PRBool UseComputedHeight();
-
-  static nsCSSFrameType DetermineFrameType(nsIFrame* aFrame);
-
-  void ComputeContainingBlockRectangle(nsIPresContext*          aPresContext,
-                                       const nsHTMLReflowState* aContainingBlockRS,
-                                       nscoord&                 aContainingBlockWidth,
-                                       nscoord&                 aContainingBlockHeight);
-
-  void CalculateBlockSideMargins(nscoord aAvailWidth,
-                                 nscoord aComputedWidth);
-
-
-protected:
-  // This method initializes various data members. It is automatically
-  // called by the various constructors
-  void Init(nsIPresContext* aPresContext,
-            nscoord         aContainingBlockWidth = -1,
-            nscoord         aContainingBlockHeight = -1);
-
-  void InitConstraints(nsIPresContext* aPresContext,
-                       nscoord         aContainingBlockWidth,
-                       nscoord         aContainingBlockHeight);
-
-  void CalculateHypotheticalBox(nsIPresContext*    aPresContext,
-                                nsIFrame*          aPlaceholderFrame,
-                                nsIFrame*          aBlockFrame,
-                                nsMargin&          aBlockContentArea,
-                                nsIFrame*          aAbsoluteContainingBlockFrame,
-                                nsHypotheticalBox& aHypotheticalBox);
-
-  void InitAbsoluteConstraints(nsIPresContext* aPresContext,
-                               const nsHTMLReflowState* cbrs,
-                               nscoord aContainingBlockWidth,
-                               nscoord aContainingBlockHeight);
-
-  void ComputeRelativeOffsets(const nsHTMLReflowState* cbrs,
-                              nscoord aContainingBlockWidth,
-                              nscoord aContainingBlockHeight);
-
-  void ComputeBlockBoxData(nsIPresContext* aPresContext,
-                           const nsHTMLReflowState* cbrs,
-                           nsStyleUnit aWidthUnit,
-                           nsStyleUnit aHeightUnit,
-                           nscoord aContainingBlockWidth,
-                           nscoord aContainingBlockHeight);
-
-  void ComputeHorizontalValue(nscoord aContainingBlockWidth,
-                                     nsStyleUnit aUnit,
-                                     const nsStyleCoord& aCoord,
-                                     nscoord& aResult);
-
-  void ComputeVerticalValue(nscoord aContainingBlockHeight,
-                                   nsStyleUnit aUnit,
-                                   const nsStyleCoord& aCoord,
-                                   nscoord& aResult);
-
-  static nsCSSFrameType DetermineFrameType(nsIFrame* aFrame,
-                                           const nsStylePosition* aPosition,
-                                           const nsStyleDisplay* aDisplay);
-
-  // Computes margin values from the specified margin style information, and
-  // fills in the mComputedMargin member
-  void ComputeMargin(nscoord aContainingBlockWidth,
-                     const nsHTMLReflowState* aContainingBlockRS);
-  
-  // Computes padding values from the specified padding style information, and
-  // fills in the mComputedPadding member
-  void ComputePadding(nscoord aContainingBlockWidth,
-                      const nsHTMLReflowState* aContainingBlockRS);
-
-  // Calculates the computed values for the 'min-Width', 'max-Width',
-  // 'min-Height', and 'max-Height' properties, and stores them in the assorted
-  // data members
-  void ComputeMinMaxValues(nscoord                  aContainingBlockWidth,
-                           nscoord                  aContainingBlockHeight,
-                           const nsHTMLReflowState* aContainingBlockRS);
-
-  nscoord CalculateHorizBorderPaddingMargin(nscoord aContainingBlockWidth);
-
-  // Adjust Computed sizes for Min/Max Width and box-Sizing
-  // - guarantees that the computed height/width will be non-negative
-  //   If the value goes negative (because the padding or border is greater than
-  //   the width/height and it is removed due to box sizing) then it is driven to 0
-  void AdjustComputedHeight(void);
-  void AdjustComputedWidth(void);
-};
-
-#endif /* nsHTMLReflowState_h___ */
-

mozilla/layout/base/public/nsIAutoCopy.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-
-#include "nsISupports.h"
-
-
-#ifndef nsIAutoCopyService_h__
-#define nsIAutoCopyService_h__
-
-// {558B93CD-95C1-417d-A66E-F9CA66DC98A8}
-#define NS_IAUTOCOPYSERVICE_IID \
-{ 0x558b93cd, 0x95c1, 0x417d, { 0xa6, 0x6e, 0xf9, 0xca, 0x66, 0xdc, 0x98, 0xa8 } }
-
-
-class nsISelection;
-
-class nsIAutoCopyService : public nsISupports
-{
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IAUTOCOPYSERVICE_IID; return iid; }
-  
-  //This will add this service as a selection listener.
-  NS_IMETHOD Listen(nsISelection *aDomSelection)=0;
-
-};
-
-
-#endif //nsIAutoCopyService_h__
-

mozilla/layout/base/public/nsICaret.h

@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsICaret_h__
-#define nsICaret_h__
-
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-#include "nsIPresShell.h"
-
-class nsIRenderingContext;
-class nsIFrame;
-class nsIView;
-struct nsRect;
-struct nsPoint;
-
-// IID for the nsICaret interface
-#define NS_ICARET_IID       \
-{ 0xa6cf90e1, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-
-class nsICaret: public nsISupports
-{
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_ICARET_IID; return iid; }
-
-  typedef enum EViewCoordinates {
-      eTopLevelWindowCoordinates,
-      eRenderingViewCoordinates,
-      eClosestViewCoordinates,
-      eIMECoordinates
-    } EViewCoordinates;
-
-  NS_IMETHOD Init(nsIPresShell *inPresShell) = 0;
-  
-  NS_IMETHOD SetCaretDOMSelection(nsISelection *aDOMSel) = 0;
-
-  /** SetCaretVisible will set the visibility of the caret
-   *  @param inMakeVisible PR_TRUE to show the caret, PR_FALSE to hide it
-   */
-  NS_IMETHOD SetCaretVisible(PRBool inMakeVisible) = 0;
-
-  /** GetCaretVisible will get the visibility of the caret
-   *  @param inMakeVisible PR_TRUE it is shown, PR_FALSE it is hidden
-   */
-  NS_IMETHOD GetCaretVisible(PRBool *outMakeVisible) = 0;
-
-  /** SetCaretReadOnly set the appearance of the caret
-   *  @param inMakeReadonly PR_TRUE to show the caret in a 'read only' state,
-   *  PR_FALSE to show the caret in normal, editing state
-   */
-  NS_IMETHOD SetCaretReadOnly(PRBool inMakeReadonly) = 0;
-
-  /** GetCaretCoordinates
-   *  Get the position of the caret in coordinates relative to the typed specified (aRelativeToType).
-   *  If the selection is collapsed, this returns the caret location
-   *    and true in outIsCollapsed.
-   *  If the selection is not collapsed, this returns the location of the focus pos,
-   *    and false in outIsCollapsed.
-   */
-  NS_IMETHOD GetCaretCoordinates(EViewCoordinates aRelativeToType, nsISelection *aDOMSel, nsRect *outCoordinates, PRBool *outIsCollapsed) = 0;
-
-  /** ClearFrameRefs
-   *  The caret stores a reference to the frame that the caret was last drawn in.
-   *  This is called to tell the caret that that frame is going away.
-   */
-  NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;
-  /** Erase Caret
-   *  this will erase the caret if its drawn and reset drawn status
-   */
-  NS_IMETHOD EraseCaret() = 0;
-
-  /** Set Caret Width
-   *  this will set the caret width to the passed in value.
-   */
-  NS_IMETHOD SetCaretWidth(nscoord aPixels) = 0;
-
-};
-
-extern nsresult NS_NewCaret(nsICaret** aInstancePtrResult);
-
-
-// handy stack-based class for temporarily disabling the caret
-
-class StCaretHider
-{
-public:
-               StCaretHider(nsICaret* aSelCon)
-               : mWasVisible(PR_FALSE), mCaret(aSelCon)
-               {
-                 if (mCaret)
-                 {
-                   mCaret->GetCaretVisible(&mWasVisible);
-                   if (mWasVisible)
-                     mCaret->SetCaretVisible(PR_FALSE);
-                 }
-               }
-               
-               ~StCaretHider()
-               {
-                 if (mCaret && mWasVisible)
-                   mCaret->SetCaretVisible(PR_TRUE);
-                 // nsCOMPtr releases mPresShell
-               }
-
-protected:
-
-    PRBool                  mWasVisible;
-    nsCOMPtr<nsICaret>  mCaret;
-};
-
-
-#endif  // nsICaret_h__
-

mozilla/layout/base/public/nsIChromeEventHandler.idl

@@ -1,48 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc.  Portions created by Netscape are
- * Copyright (C) 1999, Mozilla.  All Rights Reserved.
- * 
- * Contributor(s):
- *   Travis Bogard <travis@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "domstubs.idl"
-
-%{ C++
-#include "nsIPresContext.h"
-%}
-
-[ptr] native nsIPresContext(nsIPresContext);
-native nsEvent(nsEvent);
-[ptr] native nsEventPtr(nsEvent);
-native nsEventStatus(nsEventStatus);
-
-/**
- * The nsIChromeEventHandler
- */
-
-[scriptable, uuid(7BC08970-9E6C-11d3-AFB2-00A024FFC08C)]
-interface nsIChromeEventHandler : nsISupports
-{
-	/**
-	* Handle a chrome DOM event.
-	*/
-	[noscript] void handleChromeEvent(in nsIPresContext aPresContext, 
-		in nsEventPtr aEvent, out nsIDOMEvent aDOMEvent, in unsigned long aFlags,
-		inout nsEventStatus aStatus);
-};