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

weinig at apple.com weinig at apple.com
Wed Dec 22 11:11:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4b55ecb412d913d8d0896710a04609eefecff57f
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 20:22:36 2010 +0000

    Fix the chromium mac build.
    
    * src/WebPopupMenuImpl.cpp:
    (WebKit::WebPopupMenuImpl::setCursor):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63349 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b0ff7c5..32c5abc 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-14  Sam Weinig  <sam at webkit.org>
 
+        Fix the chromium mac build.
+
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::setCursor):
+
+2010-07-14  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Darin Adler.
 
         Patch for https://bugs.webkit.org/show_bug.cgi?id=42232
diff --git a/WebKit/chromium/src/WebPopupMenuImpl.cpp b/WebKit/chromium/src/WebPopupMenuImpl.cpp
index 886cb3e..75d6cc1 100644
--- a/WebKit/chromium/src/WebPopupMenuImpl.cpp
+++ b/WebKit/chromium/src/WebPopupMenuImpl.cpp
@@ -318,7 +318,7 @@ void WebPopupMenuImpl::scrollbarsModeDidChange() const
     // Nothing to be done since we have no concept of different scrollbar modes.
 }
 
-void WebPopupMenuImpl::setCursor(const Cursor&)
+void WebPopupMenuImpl::setCursor(const WebCore::Cursor&)
 {
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list