--- a/src/3rdparty/webkit/WebCore/ChangeLog	Fri Apr 16 11:39:52 2010 +0300
+++ b/src/3rdparty/webkit/WebCore/ChangeLog	Mon Apr 19 10:15:19 2010 +0300
@@ -1,5 +1,20 @@
-<<<<<<< HEAD
-=======
+2009-11-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Allow a frame to go back to copy-on-scroll when it ceases being overlapped
+
+        The code was not testing slow-scrolling frames for overlappedness, thinking the answer
+        would not matter. That is not the case if the only reason for the slow-scrolling is
+        being overlapped.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::useSlowRepaintsIfNotOverlapped): Added. Returns whether there is any
+        reason besides being overlapped that the frame would need to fully repaint on scroll.
+        * page/FrameView.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::paint): Use useSlowRepaintsIfNotOverlapped().
+
 2010-04-09  David Leong  <david.leong@nokia.com>
 
         Reviewed by Simon Hausmann.
@@ -27,7 +42,6 @@
         * platform/text/StringHash.h:
         (WebCore::StringHash::equal):
 
->>>>>>> 8f75ee7... Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
 2010-03-25  yael aharon  <yael.aharon@nokia.com>
 
         Reviewed by Laszlo Gombos.