Changeset 76254 in webkit

Timestamp:

Jan 20, 2011 9:10:34 AM (13 years ago)

Author:

Adam Roben

Message:

Teach WebView::scrollBackingStore about compositing mode

Test:

compositing/scroll-painted-composited-content.html

Fixes <​http://webkit.org/b/52720> REGRESSION (r75987): Assertion failure in
WebView::scrollBackingStore when scrolling page with composited content

Reviewed by Anders Carlsson.

Source/WebKit/win:

• WebView.cpp:

(WebView::scrollBackingStore): Do something sensible (though naive) when in compositing
mode, rather than incorrectly asserting that this function is never called in that case. For
now we just repaint the entire scrolled region; someday hopefully we can avoid having to
repaint the areas that have just been moved.

LayoutTests:

Add a test that scrolls composited content that has already been painted

• compositing/scroll-painted-composited-content.html: Added.
• compositing/scroll-painted-composited-content-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/scroll-painted-composited-content-expected.txt (added)
• LayoutTests/compositing/scroll-painted-composited-content.html (added)
• Source/WebKit/win/ChangeLog (modified) (1 diff)
• Source/WebKit/win/WebView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-19  Adam Roben  <aroben@apple.com>
+
+        Add a test that scrolls composited content that has already been painted
+
+        Test for <http://webkit.org/b/52720> REGRESSION (r75987): Assertion failure in
+        WebView::scrollBackingStore when scrolling page with composited content
+
+        Reviewed by Anders Carlsson.
+
+        * compositing/scroll-painted-composited-content.html: Added.
+        * compositing/scroll-painted-composited-content-expected.txt: Added.
+
 2011-01-20  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-01-19  Adam Roben  <aroben@apple.com>
+
+        Teach WebView::scrollBackingStore about compositing mode
+
+        Test:
+            compositing/scroll-painted-composited-content.html
+
+        Fixes <http://webkit.org/b/52720> REGRESSION (r75987): Assertion failure in
+        WebView::scrollBackingStore when scrolling page with composited content
+
+        Reviewed by Anders Carlsson.
+
+        * WebView.cpp:
+        (WebView::scrollBackingStore): Do something sensible (though naive) when in compositing
+        mode, rather than incorrectly asserting that this function is never called in that case. For
+        now we just repaint the entire scrolled region; someday hopefully we can avoid having to
+        repaint the areas that have just been moved.
+
 2011-01-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/win/WebView.cpp

@@ -820 +820 @@
 {
 #if USE(ACCELERATED_COMPOSITING)
-    ASSERT(!isAcceleratedCompositing());
+    if (isAcceleratedCompositing()) {
+        // FIXME: We should be doing something smarter here, like moving tiles around and painting
+        // any newly-exposed tiles. <http://webkit.org/b/52714>
+        m_backingLayer->setNeedsDisplayInRect(scrollViewRect);
+        return;
+    }
 #endif