Commit 36d49f44 authored by David Zbarsky's avatar David Zbarsky
Browse files

Bug 682611 - Part 1: Merge nsIDOMRange and nsIDOMNSRange; r=Ms2ger r=smaug

parent 3b93d37f

accessible/src/html/nsHyperTextAccessible.cpp

+2 −4
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include "nsIDOMCharacterData.h"

#include "nsIDOMDocument.h"

#include "nsIDOMRange.h"

#include "nsIDOMNSRange.h"

#include "nsIDOMXULDocument.h"

#include "nsIEditingSession.h"

#include "nsIEditor.h"
@@ -2355,11 +2354,10 @@ nsHyperTextAccessible::GetSpellTextAttribute(nsIDOMNode *aNode, 


  for (PRInt32 index = 0; index < rangeCount; index++) {

    nsCOMPtr<nsIDOMRange> range = ranges[index];

    nsCOMPtr<nsIDOMNSRange> nsrange(do_QueryInterface(range));

    NS_ENSURE_STATE(nsrange);

    NS_ENSURE_STATE(range);



    PRInt16 result;

    nsresult rv = nsrange->ComparePoint(aNode, aNodeOffset, &result);

    nsresult rv = range->ComparePoint(aNode, aNodeOffset, &result);

    NS_ENSURE_SUCCESS(rv, rv);

    // ComparePoint checks boundary points, but we need to check that

    // text at aNodeOffset is inside the range.

content/base/src/nsRange.cpp

+3 −5
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ DOMCI_DATA(Range, nsRange) 
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsRange)

  NS_INTERFACE_MAP_ENTRY(nsIDOMRange)

  NS_INTERFACE_MAP_ENTRY(nsIRange)

  NS_INTERFACE_MAP_ENTRY(nsIDOMNSRange)

  NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)

  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRange)

  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Range)
@@ -665,9 +664,9 @@ nsRange::ParentChainChanged(nsIContent *aContent) 
  DoSetRange(mStartParent, mStartOffset, mEndParent, mEndOffset, newRoot);

}



/********************************************************

 * Utilities for comparing points: API from nsIDOMNSRange

 ********************************************************/

/******************************************************

 * Utilities for comparing points: API from nsIDOMRange

 ******************************************************/

NS_IMETHODIMP

nsRange::IsPointInRange(nsIDOMNode* aParent, PRInt32 aOffset, bool* aResult)

{
@@ -2377,7 +2376,6 @@ nsRange::Detach() 
  return NS_OK;

}



// nsIDOMNSRange interface

NS_IMETHODIMP    

nsRange::CreateContextualFragment(const nsAString& aFragment,

                                  nsIDOMDocumentFragment** aReturn)

content/base/src/nsRange.h

+0 −5
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "nsIRange.h"

#include "nsIDOMRange.h"

#include "nsIRangeUtils.h"

#include "nsIDOMNSRange.h"

#include "nsCOMPtr.h"

#include "nsIDOMDocumentFragment.h"

#include "nsIContent.h"
@@ -73,7 +72,6 @@ public: 
// -------------------------------------------------------------------------------



class nsRange : public nsIRange,

                public nsIDOMNSRange,

                public nsStubMutationObserver

{

public:
@@ -86,9 +84,6 @@ public: 
  // nsIDOMRange interface

  NS_DECL_NSIDOMRANGE

  

  // nsIDOMNSRange interface

  NS_DECL_NSIDOMNSRANGE

  

  // nsIRange interface

  virtual nsINode* GetCommonAncestor() const;

  virtual void Reset();

content/base/test/test_bug451376.html

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=451376 
                       aInRangeNode, aInRangeOffset,

                       aAfterRangeNode, aAfterRangeOffset)

    {

      var range = document.createRange().

        QueryInterface(Components.interfaces.nsIDOMNSRange);

      var range = document.createRange();



      range.setStart(aStartNode, aStartOffset);

      range.setEnd(aEndNode, aEndOffset);

content/test/unit/test_range.js

+0 −1
Original line number Diff line number Diff line
@@ -503,7 +503,6 @@ function run_miscellaneous_tests() { 


  /*

  // XXX ajvincent if rv == WRONG_DOCUMENT_ERR, return false?

  do_check_true(baseRange instanceof C_i.nsIDOMNSRange);

  do_check_false(baseRange.isPointInRange(startContainer, startOffset));

  do_check_false(baseRange.isPointInRange(startContainer, startOffset + 1));

  do_check_false(baseRange.isPointInRange(endContainer, endOffset));