[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

weinig at apple.com weinig at apple.com
Sun Feb 20 23:35:06 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 2698b31f9e052a24267ff1118f6ccd3ed69e97a7
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 21:33:40 2011 +0000

    Fix windows build.
    
    * WebScrollBar.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 7776c1e..aab969d 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,5 +1,11 @@
 2011-01-21  Sam Weinig  <sam at webkit.org>
 
+        Fix windows build.
+
+        * WebScrollBar.h:
+
+2011-01-21  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         Part 2 of "Cleanup Scrollbar/ScrollbarClient relationship"
diff --git a/Source/WebKit/win/WebScrollBar.h b/Source/WebKit/win/WebScrollBar.h
index cad926e..ca44e8b 100644
--- a/Source/WebKit/win/WebScrollBar.h
+++ b/Source/WebKit/win/WebScrollBar.h
@@ -113,10 +113,10 @@ public:
 
 protected:
     // ScrollableArea
-    virtual int scrollSize(ScrollbarOrientation orientation) const;
-    virtual int scrollPosition(Scrollbar*) const;
-    virtual void setScrollOffset(const IntPoint&);
-    virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&);
+    virtual int scrollSize(WebCore::ScrollbarOrientation) const;
+    virtual int scrollPosition(WebCore::Scrollbar*) const;
+    virtual void setScrollOffset(const WebCore::IntPoint&);
+    virtual void invalidateScrollbarRect(WebCore::Scrollbar*, const WebCore::IntRect&);
 
     // FIXME: We should provide a way to set this value.
     virtual bool isActive() const { return true; }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list