From 52bc26bf93f823fa8790a95adef727b44fa55bba Mon Sep 17 00:00:00 2001
From: Boris Zbarsky
Date: Sun, 2 Nov 2008 21:33:04 -0500
Subject: [PATCH] Adding test file too
---
content/html/content/test/test_bug388794.html | 97 +++++++++++++++++++
layout/base/nsDocumentViewer.cpp | 4 +
2 files changed, 101 insertions(+)
create mode 100644 content/html/content/test/test_bug388794.html
diff --git a/content/html/content/test/test_bug388794.html b/content/html/content/test/test_bug388794.html
new file mode 100644
index 000000000000..ca508d97be24
--- /dev/null
+++ b/content/html/content/test/test_bug388794.html
@@ -0,0 +1,97 @@
+
+
+
+
+ Test for Bug 388794
+
+
+
+
+
+
+
+Mozilla Bug 388794
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 246c56633c37..02332a1af63f 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2158,7 +2158,11 @@ DocumentViewerImpl::CreateStyleSet(nsIDocument* aDocument,
}
// Make sure to clone the quirk sheet so that it can be usefully
+<<<<<<< local
+ // enabled/disabled as we needed.
+=======
// enabled/disabled as needed.
+>>>>>>> other
nsCOMPtr quirkClone;
if (!nsLayoutStylesheetCache::UASheet() ||
!nsLayoutStylesheetCache::QuirkSheet() ||