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

andersca at apple.com andersca at apple.com
Wed Dec 22 14:41:25 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b790546e5cd85fb55b20b9d9dbcac0e66459cca0
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 16 00:14:50 2010 +0000

    Fix build.
    
    * UIProcess/API/mac/FindIndicatorWindow.mm:
    (-[WebFindIndicatorWindowAnimation setCurrentProgress:]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 05f5cea..12d6776 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-15  Anders Carlsson  <andersca at apple.com>
+
+        Fix build.
+
+        * UIProcess/API/mac/FindIndicatorWindow.mm:
+        (-[WebFindIndicatorWindowAnimation setCurrentProgress:]):
+
 2010-10-15  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm b/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
index b18d7dc..693a791 100644
--- a/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
+++ b/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
@@ -84,7 +84,7 @@ using namespace WebCore;
 {
     if ((self = [super initWithDuration:fadeOutAnimationDuration animationCurve:NSAnimationEaseInOut])) {
         _findIndicatorWindow = findIndicatorWindow;
-        _animationCallback = animationCallback;
+        _animationProgressCallback = animationProgressCallback;
         _animationDidEndCallback = animationDidEndCallback;
         [self setDelegate:self];
         [self setAnimationBlockingMode:NSAnimationNonblocking];
@@ -94,7 +94,7 @@ using namespace WebCore;
 
 - (void)setCurrentProgress:(NSAnimationProgress)progress
 {
-    (_findIndicatorWindow->*_animationCallback)(progress);
+    (_findIndicatorWindow->*_animationProgressCallback)(progress);
 }
 
 - (void)animationDidEnd:(NSAnimation *)animation

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list