[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9506a2189013ad6153835cf0e7f9b75c443cb922
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 21:07:11 2010 +0000

    2010-07-21  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Anders Carlsson.
    
            Composited layers don't scroll in WebKit2
            https://bugs.webkit.org/show_bug.cgi?id=42771
    
            Prep work: FrameView::scrollPositionChanged() sounds like a generic "did scroll" bottleneck,
            but this is deceiving. It's only every called on one platform (Mac) when the NSScrollView gets
            scrolled, so rename it to FrameView::scrollPositionChangedViaPlatformWidget().
    
            * WebCore.exp.in:
            * page/FrameView.cpp:
            (WebCore::FrameView::scrollPositionChangedViaPlatformWidget):
            * page/FrameView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 522bac3..017148d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-21  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Composited layers don't scroll in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=42771
+
+        Prep work: FrameView::scrollPositionChanged() sounds like a generic "did scroll" bottleneck,
+        but this is deceiving. It's only every called on one platform (Mac) when the NSScrollView gets
+        scrolled, so rename it to FrameView::scrollPositionChangedViaPlatformWidget().
+
+        * WebCore.exp.in:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollPositionChangedViaPlatformWidget):
+        * page/FrameView.h:
+
 2010-07-21  Peter Beverloo  <peter at lvp-media.com>
 
         Reviewed by Eric Carlson.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index d3db7b2..cf66285 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -726,7 +726,7 @@ __ZN7WebCore9FrameView16setPaintBehaviorEj
 __ZN7WebCore9FrameView18updateControlTintsEv
 __ZN7WebCore9FrameView20enterCompositingModeEv
 __ZN7WebCore9FrameView21flushDeferredRepaintsEv
-__ZN7WebCore9FrameView21scrollPositionChangedEv
+__ZN7WebCore9FrameView38scrollPositionChangedViaPlatformWidgetEv
 __ZN7WebCore9FrameView22setBaseBackgroundColorENS_5ColorE
 __ZN7WebCore9FrameView23layoutIfNeededRecursiveEv
 __ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 09fdc37..9ff3e54 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -1102,7 +1102,7 @@ void FrameView::setScrollPosition(const IntPoint& scrollPoint)
     m_inProgrammaticScroll = wasInProgrammaticScroll;
 }
 
-void FrameView::scrollPositionChanged()
+void FrameView::scrollPositionChangedViaPlatformWidget()
 {
     frame()->eventHandler()->sendScrollEvent();
     repaintFixedElementsAfterScrolling();
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index b047db0..868a15f 100644
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -143,7 +143,7 @@ public:
     virtual IntRect windowResizerRect() const;
 
     void setScrollPosition(const IntPoint&);
-    void scrollPositionChanged();
+    void scrollPositionChangedViaPlatformWidget();
     virtual void repaintFixedElementsAfterScrolling();
 
     String mediaType() const;
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 5210f95..95c460b 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-21  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Composited layers don't scroll in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=42771
+
+        Prep work: FrameView::scrollPositionChanged() sounds like a generic "did scroll" bottleneck,
+        but this is deceiving. It's only every called on one platform (Mac) when the NSScrollView gets
+        scrolled, so rename it to FrameView::scrollPositionChangedViaPlatformWidget().
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _frameOrBoundsChanged]):
+
 2010-07-21  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index e40500c..08c8911 100644
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -1201,7 +1201,7 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
 #ifndef BUILDING_ON_TIGER
                 _private->inScrollPositionChanged = YES;
 #endif
-                coreView->scrollPositionChanged();
+                coreView->scrollPositionChangedViaPlatformWidget();
 #ifndef BUILDING_ON_TIGER
                 _private->inScrollPositionChanged = NO;
 #endif

-- 
WebKit Debian packaging