From c9c32a64e4c04b2c0ce7932fb4f88a31d9a895a0 Mon Sep 17 00:00:00 2001
From: "attinasi%netscape.com" <attinasi%netscape.com>
Date: Fri, 28 Jul 2000 21:54:49 +0000
Subject: [PATCH] Fix for bug 36849: Script animation that changes location and
 clip simultaneously no longer will flicker. ApplyRenderingChangeToTree now
 always does a NO_SYNC update of the views where it used to sometimes do a
 SYNC update. b=36849 r=kmcclusk

---
 layout/base/nsCSSFrameConstructor.cpp           | 15 +--------------
 layout/html/style/src/nsCSSFrameConstructor.cpp | 15 +--------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index d52df9676192..61f130d15e09 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -9712,20 +9712,7 @@ ApplyRenderingChangeToTree(nsIPresContext* aPresContext,
   }
 
   if (viewManager) {
-    nsCOMPtr<nsIPresShell> presShell;
-    nsresult rv = aPresContext->GetShell(getter_AddRefs(presShell));
-    if (NS_SUCCEEDED(rv)) {
-      PRBool isReflowLocked = PR_FALSE;
-      presShell->IsReflowLocked(&isReflowLocked);
-      if (isReflowLocked) {
-        viewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
-      } else {
-        viewManager->EndUpdateViewBatch(NS_VMREFRESH_IMMEDIATE);
-      }
-    } else {
-      viewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
-    }
-//    viewManager->Composite();
+    viewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
     NS_RELEASE(viewManager);
   }
 }
diff --git a/layout/html/style/src/nsCSSFrameConstructor.cpp b/layout/html/style/src/nsCSSFrameConstructor.cpp
index d52df9676192..61f130d15e09 100644
--- a/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -9712,20 +9712,7 @@ ApplyRenderingChangeToTree(nsIPresContext* aPresContext,
   }
 
   if (viewManager) {
-    nsCOMPtr<nsIPresShell> presShell;
-    nsresult rv = aPresContext->GetShell(getter_AddRefs(presShell));
-    if (NS_SUCCEEDED(rv)) {
-      PRBool isReflowLocked = PR_FALSE;
-      presShell->IsReflowLocked(&isReflowLocked);
-      if (isReflowLocked) {
-        viewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
-      } else {
-        viewManager->EndUpdateViewBatch(NS_VMREFRESH_IMMEDIATE);
-      }
-    } else {
-      viewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
-    }
-//    viewManager->Composite();
+    viewManager->EndUpdateViewBatch(NS_VMREFRESH_NO_SYNC);
     NS_RELEASE(viewManager);
   }
 }