From 8a65245fa97f1938e232d4c46766275922c12adb Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Wed, 16 Feb 2011 21:39:52 +0000
Subject: [PATCH] Bug 616812 Remove extraneous CRs r+a=dbaron

---
 content/html/content/src/nsTimeRanges.cpp |  2 +-
 layout/base/PaintTracker.cpp              | 14 +++---
 layout/base/PaintTracker.h                | 60 +++++++++++------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/content/html/content/src/nsTimeRanges.cpp b/content/html/content/src/nsTimeRanges.cpp
index c2171cd826cd..eca71560eda0 100644
--- a/content/html/content/src/nsTimeRanges.cpp
+++ b/content/html/content/src/nsTimeRanges.cpp
@@ -43,7 +43,7 @@
 NS_IMPL_ADDREF(nsTimeRanges)
 NS_IMPL_RELEASE(nsTimeRanges)
 
-DOMCI_DATA(TimeRanges, nsTimeRanges)
+DOMCI_DATA(TimeRanges, nsTimeRanges)
 
 NS_INTERFACE_MAP_BEGIN(nsTimeRanges)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
diff --git a/layout/base/PaintTracker.cpp b/layout/base/PaintTracker.cpp
index 04c7f39cdaf1..1c740ccf4940 100644
--- a/layout/base/PaintTracker.cpp
+++ b/layout/base/PaintTracker.cpp
@@ -1,7 +1,7 @@
-#include "mozilla/PaintTracker.h"
-
-namespace mozilla {
-
-int PaintTracker::gPaintTracker;
-
-} // namespace mozilla
+#include "mozilla/PaintTracker.h"
+
+namespace mozilla {
+
+int PaintTracker::gPaintTracker;
+
+} // namespace mozilla
diff --git a/layout/base/PaintTracker.h b/layout/base/PaintTracker.h
index 291643e29aed..445f5aefbd95 100644
--- a/layout/base/PaintTracker.h
+++ b/layout/base/PaintTracker.h
@@ -1,30 +1,30 @@
-#ifndef mozilla_PaintTracker_h
-#define mozilla_PaintTracker_h
-
-#include "nscore.h"
-#include "nsDebug.h"
-
-namespace mozilla {
-
-class NS_STACK_CLASS PaintTracker
-{
-public:
-  PaintTracker() {
-    ++gPaintTracker;
-  }
-  ~PaintTracker() {
-    NS_ASSERTION(gPaintTracker > 0, "Mismatched constructor/destructor");
-    --gPaintTracker;
-  }
-
-  static bool IsPainting() {
-    return !!gPaintTracker;
-  }
-
-private:
-  static int gPaintTracker;
-};
-
-} // namespace mozilla
-
-#endif // mozilla_PaintTracker_h
+#ifndef mozilla_PaintTracker_h
+#define mozilla_PaintTracker_h
+
+#include "nscore.h"
+#include "nsDebug.h"
+
+namespace mozilla {
+
+class NS_STACK_CLASS PaintTracker
+{
+public:
+  PaintTracker() {
+    ++gPaintTracker;
+  }
+  ~PaintTracker() {
+    NS_ASSERTION(gPaintTracker > 0, "Mismatched constructor/destructor");
+    --gPaintTracker;
+  }
+
+  static bool IsPainting() {
+    return !!gPaintTracker;
+  }
+
+private:
+  static int gPaintTracker;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_PaintTracker_h