Back out bug 114169 (changeset 8110e3bae4bf) and change the test (changeset 8f53fcb8bde5) to todos, to see if it was repsonsible for the regression in bug 458065.
☠☠ backed out by 115934f340f0 ☠ ☠
authorL. David Baron <dbaron@dbaron.org>
Wed, 01 Oct 2008 10:36:54 -0700
changeset 20061 6f3797124c84
parent 20060 0b9cf724d537
child 20062 74d507e4ca41
child 20069 115934f340f0
push id2612
push userdbaron@mozilla.com
push dateWed, 01 Oct 2008 17:37:41 +0000
treeherdermozilla-central@6f3797124c84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs114169, 458065
milestone1.9.1b1pre
Back out bug 114169 (changeset 8110e3bae4bf) and change the test (changeset 8f53fcb8bde5) to todos, to see if it was repsonsible for the regression in bug 458065.
layout/base/nsPresShell.cpp
layout/base/tests/test_bug114649.html
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -2576,19 +2576,17 @@ PresShell::ResizeReflow(nscoord aWidth, 
   return NS_OK; //XXX this needs to be real. MMP
 }
 
 #define RESIZE_EVENT_DELAY 200
 
 void
 PresShell::CreateResizeEventTimer ()
 {
-  // if we already have a timer set, ignore this call
-  if (mResizeEventTimer)
-    return;
+  KillResizeEventTimer();
 
   if (mIsDocumentGone)
     return;
 
   mResizeEventTimer = do_CreateInstance("@mozilla.org/timer;1");
   if (mResizeEventTimer) {
     mResizeEventTimer->InitWithFuncCallback(sResizeEventCallback, this, RESIZE_EVENT_DELAY, 
                                             nsITimer::TYPE_ONE_SHOT);
@@ -2614,19 +2612,16 @@ PresShell::sResizeEventCallback(nsITimer
 }
 
 void
 PresShell::FireResizeEvent()
 {
   if (mIsDocumentGone)
     return;
 
-  // allow a new timer to be set
-  mResizeEventTimer = nsnull;
-
   //Send resize event from here.
   nsEvent event(PR_TRUE, NS_RESIZE_EVENT);
   nsEventStatus status = nsEventStatus_eIgnore;
 
   nsPIDOMWindow *window = mDocument->GetWindow();
   if (window) {
     nsEventDispatcher::Dispatch(window, mPresContext, &event, nsnull, &status);
   }
--- a/layout/base/tests/test_bug114649.html
+++ b/layout/base/tests/test_bug114649.html
@@ -50,18 +50,18 @@ function do_a_resize()
 
 function handle_child_resize()
 {
     gGotEventsAt.push(gCurrentWidth);
 }
 
 function check_for_resize_events()
 {
-	ok(gGotEventsAt.length >= 2, "got continuous events");
-	isnot(gGotEventsAt[0], 400, "got continuous events");
+	todo(gGotEventsAt.length >= 2, "got continuous events");
+	todo_isnot(gGotEventsAt[0], 400, "got continuous events");
 	is(gGotEventsAt[gGotEventsAt.length - 1], 400, "got last event");
 	SimpleTest.finish();
 }
 
 </script>
 </pre>
 </body>
 </html>