Changeset 55159 in webkit

Timestamp:

Feb 23, 2010 9:54:37 AM (14 years ago)

Author:

mitz@apple.com

Message:

WebKit/mac: <rdar://problem/7611158> Incomplete repaint of YouTube timeline thumb while scrolling
​https://bugs.webkit.org/show_bug.cgi?id=34381

Reviewed by Simon Fraser.

Test: fast/repaint/repaint-during-scroll.html

NSClipView offsets any rects marked as needing display during scrolling
by the scroll offset. Compensate for this when -setNeedsDisplay: is called
during scrolling.

• WebView/WebHTMLView.mm:

(-[WebHTMLView _frameOrBoundsChanged]): Set inScrollPositionChanged to YES
around to call to FrameView::scrollPositionChanged().
(-[WebHTMLView setNeedsDisplayInRect:]): When called beneath
scrollPositionChanged(), adjust the rect by the inverse of the scroll offset.

LayoutTests: Rubber-stamped by Simon Fraser.

<rdar://problem/7611158> Incomplete repaint of YouTube timeline thumb while scrolling
​https://bugs.webkit.org/show_bug.cgi?id=34381

• fast/repaint/repaint-during-scroll.html: Added.
• platform/mac/fast/repaint/repaint-during-scroll-expected.checksum: Added.
• platform/mac/fast/repaint/repaint-during-scroll-expected.png: Added.
• platform/mac/fast/repaint/repaint-during-scroll-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/repaint-during-scroll.html (added)
• LayoutTests/platform/mac/fast/repaint/repaint-during-scroll-expected.checksum (added)
• LayoutTests/platform/mac/fast/repaint/repaint-during-scroll-expected.png (added)
• LayoutTests/platform/mac/fast/repaint/repaint-during-scroll-expected.txt (added)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-23  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Simon Fraser.
+
+        <rdar://problem/7611158> Incomplete repaint of YouTube timeline thumb while scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=34381
+
+        * fast/repaint/repaint-during-scroll.html: Added.
+        * platform/mac/fast/repaint/repaint-during-scroll-expected.checksum: Added.
+        * platform/mac/fast/repaint/repaint-during-scroll-expected.png: Added.
+        * platform/mac/fast/repaint/repaint-during-scroll-expected.txt: Added.
+
 2010-02-23  Brady Eidson  <beidson@apple.com>
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-02-23  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7611158> Incomplete repaint of YouTube timeline thumb while scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=34381
+
+        Test: fast/repaint/repaint-during-scroll.html
+
+        NSClipView offsets any rects marked as needing display during scrolling
+        by the scroll offset. Compensate for this when -setNeedsDisplay: is called
+        during scrolling.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _frameOrBoundsChanged]): Set inScrollPositionChanged to YES
+        around to call to FrameView::scrollPositionChanged().
+        (-[WebHTMLView setNeedsDisplayInRect:]): When called beneath
+        scrollPositionChanged(), adjust the rect by the inverse of the scroll offset.
+
 2010-02-23  Steve Block  <steveblock@google.com>
 

trunk/WebKit/mac/WebView/WebHTMLView.mm

@@ -430 +430 @@
 
     NSPoint lastScrollPosition;
+#ifndef BUILDING_ON_TIGER
+    BOOL inScrollPositionChanged;
+#endif
 
     WebPluginController *pluginController;
@@ -1172 +1175 @@
     if (!NSEqualPoints(_private->lastScrollPosition, origin)) {
         if (Frame* coreFrame = core([self _frame])) {
-            if (FrameView* coreView = coreFrame->view())
+            if (FrameView* coreView = coreFrame->view()) {
+#ifndef BUILDING_ON_TIGER
+                _private->inScrollPositionChanged = YES;
+#endif
                 coreView->scrollPositionChanged();
+#ifndef BUILDING_ON_TIGER
+                _private->inScrollPositionChanged = NO;
+#endif
+            }
         }
     
@@ -3138 +3148 @@
 }
 
+#if !LOG_DISABLED
 - (void)setNeedsDisplay:(BOOL)flag
 {
@@ -3143 +3154 @@
     [super setNeedsDisplay:flag];
 }
+#endif
+
+#ifndef BUILDING_ON_TIGER
+- (void)setNeedsDisplayInRect:(NSRect)invalidRect
+{
+    if (_private->inScrollPositionChanged) {
+        // When scrolling, the dirty regions are adjusted for the scroll only
+        // after NSViewBoundsDidChangeNotification is sent. Translate the invalid
+        // rect to pre-scrolled coordinates in order to get the right dirty region
+        // after adjustment. See <rdar://problem/7678927>.
+        NSPoint origin = [[self superview] bounds].origin;
+        invalidRect.origin.x -= _private->lastScrollPosition.x - origin.x;
+        invalidRect.origin.y -= _private->lastScrollPosition.y - origin.y;
+    }
+    [super setNeedsDisplayInRect:invalidRect];
+}
+#endif
 
 - (void)setNeedsLayout: (BOOL)flag