Bug 609821 - Don't attempt to update the position of caret when we may have pending reflow operations; r=roc a=bsmedberg

2010-11-08 19:16:53 -05:00 · 2010-11-08 19:16:53 -05:00 · bc3d07f965
--- a/layout/base/crashtests/609821-1.xhtml
+++ b/layout/base/crashtests/609821-1.xhtml
@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script>
+<![CDATA[
+
+function boom()
+{
+  var td = document.getElementById("td");
+  td.contentEditable = "true";
+  td.focus();
+}
+
+]]>
+</script></head>
+
+<body onload="boom();"><td id="td"/></body>
+</html>
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@ -313,3 +313,4 @@ load 572582-1.xhtml
 load 579655.html
 load 580494-1.html
 load 580834-1.xhtml
+load 609821-1.xhtml
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@ -7615,7 +7615,6 @@ PresShell::WillDoReflow()
  // XXXbz that comment makes no sense
  if (mCaret) {
    mCaret->InvalidateOutsideCaret();
-    mCaret->UpdateCaretPosition();
  }

  mPresContext->FlushUserFontSet();