diff --git a/mozilla/accessible/src/base/Makefile.in b/mozilla/accessible/src/base/Makefile.in
index c218366af3b..203c7a2f76b 100644
--- a/mozilla/accessible/src/base/Makefile.in
+++ b/mozilla/accessible/src/base/Makefile.in
@@ -48,6 +48,7 @@ REQUIRES = \
   widget \
   xpcom \
   xuldoc \
+  webBrowser_core \
   $(NULL)
 
 CPPSRCS = \
diff --git a/mozilla/accessible/src/base/makefile.win b/mozilla/accessible/src/base/makefile.win
index cd908313d52..da44d8f35ce 100755
--- a/mozilla/accessible/src/base/makefile.win
+++ b/mozilla/accessible/src/base/makefile.win
@@ -41,6 +41,7 @@ REQUIRES = \
   webshell \
   widget \
   xpcom \
+  webBrowser_core \
   $(NULL)
 
 
diff --git a/mozilla/accessible/src/html/Makefile.in b/mozilla/accessible/src/html/Makefile.in
index 93ac269589b..ae9d3430b65 100644
--- a/mozilla/accessible/src/html/Makefile.in
+++ b/mozilla/accessible/src/html/Makefile.in
@@ -47,6 +47,7 @@ REQUIRES = \
   webshell \
   widget \
   xpcom \
+  webBrowser_core \
   $(NULL)
 
 CPPSRCS = \
diff --git a/mozilla/accessible/src/html/makefile.win b/mozilla/accessible/src/html/makefile.win
index 21885b7bfc5..a5dfc728d9a 100755
--- a/mozilla/accessible/src/html/makefile.win
+++ b/mozilla/accessible/src/html/makefile.win
@@ -41,6 +41,7 @@ REQUIRES = \
   webshell \
   widget \
   xpcom \
+  webBrowser_core \
   $(NULL)
 
 CPP_OBJS = \
diff --git a/mozilla/accessible/src/xul/Makefile.in b/mozilla/accessible/src/xul/Makefile.in
index 30b23335b41..d94afc7a9fb 100644
--- a/mozilla/accessible/src/xul/Makefile.in
+++ b/mozilla/accessible/src/xul/Makefile.in
@@ -47,6 +47,7 @@ REQUIRES = \
   webshell \
   widget \
   xpcom \
+  webBrowser_core \
   $(NULL)
 
 CPPSRCS = \
diff --git a/mozilla/accessible/src/xul/makefile.win b/mozilla/accessible/src/xul/makefile.win
index 4ec253f5371..e2164538666 100755
--- a/mozilla/accessible/src/xul/makefile.win
+++ b/mozilla/accessible/src/xul/makefile.win
@@ -41,6 +41,7 @@ REQUIRES = \
   webshell \
   widget \
   xpcom \
+  webBrowser_core \
   $(NULL)
 
 CPP_OBJS = \
diff --git a/mozilla/content/base/public/nsISelectionController.idl b/mozilla/content/base/public/nsISelectionController.idl
index 26f88a9ac69..7494fe209eb 100644
--- a/mozilla/content/base/public/nsISelectionController.idl
+++ b/mozilla/content/base/public/nsISelectionController.idl
@@ -1,44 +1,30 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- 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/
+ * 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.
+ * 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 the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
+ * 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):
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * Sammy Ford
+ */
 
 
 #include "nsISupports.idl"
 #include "nsISelection.idl"
+#include "nsISelectionDisplay.idl"
 
 %{C++
 
@@ -48,10 +34,10 @@ typedef short SelectionRegion;
 %}
 
 interface nsIDOMNode;
-
+interface nsISelectionDisplay;
 
 [scriptable, uuid(D2D1D179-85A7-11d3-9932-00108301233C)]
-interface nsISelectionController : nsISupports
+interface nsISelectionController : nsISelectionDisplay
 {
    const short SELECTION_NONE=0;
    const short SELECTION_NORMAL=1;
@@ -82,18 +68,6 @@ interface nsISelectionController : nsISupports
    */
     short   getDisplaySelection();
 
-   /**
-   * SetDisplayNonTextSelection used to set whether you want to see HRULES/IMAGES with border.
-   * also used to tell if the presshell is an editor right now. this should change
-   */
-    void setDisplayNonTextSelection(in boolean toggle);
-
-   /**
-   * GetDisplayNonTextSelection used to get whether you want to see HRULES/IMAGES with border.
-   * also used to tell if the presshell is an editor right now. this should change
-   */
-    boolean getDisplayNonTextSelection();
-
    /**
    * GetSelection will return the selection that the presentation
    *  shell may implement.
diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in
index 39c1e39e632..926ed45e3bd 100644
--- a/mozilla/content/base/src/Makefile.in
+++ b/mozilla/content/base/src/Makefile.in
@@ -54,6 +54,7 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  imglib2 \
 		  gfx2 \
+                  webBrowser_core \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/content/base/src/makefile.win b/mozilla/content/base/src/makefile.win
index 5195c7ab921..12a0797c5d2 100644
--- a/mozilla/content/base/src/makefile.win
+++ b/mozilla/content/base/src/makefile.win
@@ -55,6 +55,7 @@ REQUIRES	= xpcom \
 		  intl \
 		  imglib2 \
 		  gfx2 \
+		  webBrowser_core\
 		  $(NULL)
 
 CPP_OBJS=					\