Bug 612018 - "ASSERTION: frame must not be dirty" and non-blinking caret; r,a=roc

2010-11-16 13:55:25 -05:00 · 2010-11-16 13:55:25 -05:00 · 56a1fe1c73
--- a/dom/base/crashtests/612018-1.html
+++ b/dom/base/crashtests/612018-1.html
@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<script>
+
+function boom()
+{
+  var input = document.createElement("input");
+  document.body.appendChild(input);
+  input.focus();
+  document.body.appendChild(input);
+  input.focus();
+
+  document.documentElement.removeAttribute("class");
+}
+
+</script>
+</head>
+
+<body onload="setTimeout(boom, 0);"></body>
+</html>
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@ -24,3 +24,4 @@ load 502617.html
 asserts(1) load 504224.html # bug 564098
 load 603531.html
 load 601247.html
+load 612018-1.html
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@ -1358,7 +1358,7 @@ nsFocusManager::CheckIfFocusable(nsIContent* aContent, PRUint32 aFlags)

  // Make sure that our frames are up to date
  if (doc)
-    doc->FlushPendingNotifications(Flush_Frames);
+    doc->FlushPendingNotifications(Flush_Layout);

  nsIPresShell *shell = doc->GetShell();
  if (!shell)