Backed out changeset ae5b84b96fd7 (bug 570341) due to test failures D…

…ONTBUILD. a=sheriff
leto · May 24, 2011 · 3c38967 · 3c38967
1 parent b829003
commit 3c38967
Show file tree

Hide file tree

Showing 37 changed files with 33 additions and 1,611 deletions.
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
@@ -110,7 +110,6 @@ class nsFrameLoader;
 class nsIBoxObject;
 class imgIRequest;
 class nsISHEntry;
-class nsDOMNavigationTiming;
 
 namespace mozilla {
 namespace css {
@@ -125,8 +124,8 @@ class Element;
 
 
 #define NS_IDOCUMENT_IID      \
-{ 0x2c6ad63f, 0xb7b9, 0x42f8, \
- { 0xbd, 0xde, 0x76, 0x0a, 0x83, 0xe3, 0xb0, 0x49 } }
+{ 0x26ef6218, 0xcd5e, 0x4953,  \
+ { 0xbb, 0x57, 0xb8, 0x50, 0x29, 0xa1, 0xae, 0x40 } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -1520,11 +1519,6 @@ class nsIDocument : public nsINode
 
   virtual nsresult GetStateObject(nsIVariant** aResult) = 0;
 
-  virtual nsDOMNavigationTiming* GetNavigationTiming() const = 0;
-
-  virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming) = 0;
-
-
 protected:
   ~nsIDocument()
   {

diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
@@ -211,7 +211,6 @@ INCLUDES	+= \
 		-I$(topsrcdir)/js/src/xpconnect/src \
 		-I$(topsrcdir)/caps/include \
 		-I$(topsrcdir)/netwerk/base/src \
-		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
@@ -183,7 +183,6 @@ static NS_DEFINE_CID(kDOMEventGroupCID, NS_DOMEVENTGROUP_CID);
 #include "mozAutoDocUpdate.h"
 #include "nsGlobalWindow.h"
 #include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
-#include "nsDOMNavigationTiming.h"
 
 #ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
@@ -4104,10 +4103,6 @@ nsDocument::DispatchContentLoadedEvents()
 
   // Unpin references to preloaded images
   mPreloadingImages.Clear();
-
-  if (mTiming) {
-    mTiming->NotifyDOMContentLoadedStart(nsIDocument::GetDocumentURI());
-  }
 
   // Fire a DOM event notifying listeners that this document has been
   // loaded (excluding images and other loads initiated by this
@@ -4116,10 +4111,6 @@ nsDocument::DispatchContentLoadedEvents()
                                        NS_LITERAL_STRING("DOMContentLoaded"),
                                        PR_TRUE, PR_TRUE);
 
-  if (mTiming) {
-    mTiming->NotifyDOMContentLoadedEnd(nsIDocument::GetDocumentURI());
-  }
-
   // If this document is a [i]frame, fire a DOMFrameContentLoaded
   // event on all parent documents notifying that the HTML (excluding
   // other external files such as images and stylesheets) in a frame
@@ -7704,26 +7695,6 @@ void
 nsDocument::SetReadyStateInternal(ReadyState rs)
 {
   mReadyState = rs;
-  if (mTiming) {
-    switch (rs) {
-      case READYSTATE_LOADING:
-        mTiming->NotifyDOMLoading(nsIDocument::GetDocumentURI());
-        break;
-      case READYSTATE_INTERACTIVE:
-        mTiming->NotifyDOMInteractive(nsIDocument::GetDocumentURI());
-        break;
-      case READYSTATE_COMPLETE:
-        mTiming->NotifyDOMComplete(nsIDocument::GetDocumentURI());
-        break;
-      default:
-        NS_WARNING("Unexpected ReadyState value");
-        break;
-    }
-  }
-  // At the time of loading start, we don't have timing object, record time.
-  if (READYSTATE_LOADING == rs) {
-    mLoadingTimeStamp = mozilla::TimeStamp::Now();
-  }
 
   nsRefPtr<nsPLDOMEvent> plevent =
     new nsPLDOMEvent(this, NS_LITERAL_STRING("readystatechange"), PR_FALSE, PR_FALSE); 
@@ -8192,22 +8163,6 @@ nsDocument::GetStateObject(nsIVariant** aState)
   return NS_OK;
 }
 
-nsDOMNavigationTiming*
-nsDocument::GetNavigationTiming() const
-{
-  return mTiming;
-}
-
-nsresult
-nsDocument::SetNavigationTiming(nsDOMNavigationTiming* aTiming)
-{
-  mTiming = aTiming;
-  if (!mLoadingTimeStamp.IsNull() && mTiming) {
-    mTiming->SetDOMLoadingTimeStamp(nsIDocument::GetDocumentURI(), mLoadingTimeStamp);
-  }
-  return NS_OK;
-}
-
 nsresult
 nsDocument::AddImage(imgIRequest* aImage)
 {
@@ -8428,3 +8383,4 @@ nsDocument::CreateTouchList(nsIVariant* aPoints,
   *aRetVal = retval.forget().get();
   return NS_OK;
 }
+
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
@@ -106,8 +106,6 @@
 #include "nsIDOMDOMImplementation.h"
 #include "nsIDOMTouchEvent.h"
 
-#include "TimeStamp.h"
-
 #define XML_DECLARATION_BITS_DECLARATION_EXISTS   (1 << 0)
 #define XML_DECLARATION_BITS_ENCODING_EXISTS      (1 << 1)
 #define XML_DECLARATION_BITS_STANDALONE_EXISTS    (1 << 2)
@@ -129,7 +127,6 @@ class nsChildContentList;
 class nsXMLEventsManager;
 class nsHTMLStyleSheet;
 class nsHTMLCSSStyleSheet;
-class nsDOMNavigationTiming;
 
 /**
  * Right now our identifier map entries contain information for 'name'
@@ -964,10 +961,6 @@ class nsDocument : public nsIDocument,
 
   virtual nsresult GetStateObject(nsIVariant** aResult);
 
-  virtual nsDOMNavigationTiming* GetNavigationTiming() const;
-
-  virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming);
-
 protected:
   friend class nsNodeUtils;
 
@@ -1102,9 +1095,6 @@ class nsDocument : public nsIDocument,
 
   nsClassHashtable<nsStringHashKey, nsRadioGroupStruct> mRadioGroups;
 
-  // Recorded time of change to 'loading' state.
-  mozilla::TimeStamp mLoadingTimeStamp;
-
   // True if the document has been detached from its content viewer.
   PRPackedBool mIsGoingAway:1;
   // True if the document is being destroyed.
@@ -1163,7 +1153,6 @@ class nsDocument : public nsIDocument,
   nsEventStates mDocumentState;
   nsEventStates mGotDocumentState;
 
-  nsRefPtr<nsDOMNavigationTiming> mTiming;
 private:
   friend class nsUnblockOnloadEvent;
 

diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
@@ -145,7 +145,6 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../../editor/libeditor/base \
 		-I$(srcdir)/../../../../editor/libeditor/text \
 		-I$(srcdir) \
-		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in
@@ -77,7 +77,6 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../../dom/base \
 		-I$(srcdir)/../../../../xpcom/io \
 		-I$(srcdir)/../../../../caps/include \
-		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in
@@ -63,7 +63,6 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
-		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in
@@ -88,7 +88,6 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../../layout/style \
 		-I$(srcdir)/../../../dom/base \
-		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in
@@ -69,7 +69,6 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../../../dom/base \
 		-I$(srcdir)/../../../../caps/include \
-		-I$(topsrcdir)/xpcom/ds \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in
@@ -73,7 +73,6 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../../html/content/src \
 	-I$(srcdir)/../../../events/src \
 	-I$(srcdir)/../../../xbl/src \
-	-I$(topsrcdir)/xpcom/ds \
 	$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in
@@ -75,7 +75,6 @@ LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../../xml/document/src \
 		  -I$(srcdir)/../../../xbl/src \
 		  -I$(srcdir)/../../../events/src \
-		  -I$(topsrcdir)/xpcom/ds \
 		  $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
@@ -118,8 +118,6 @@ include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../shistory/src \
-  -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/layout/base \
   -I$(topsrcdir)/js/src/xpconnect/src \
-  -I$(topsrcdir)/xpcom/ds \
   $(NULL)