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

[joepeck at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9ac581d59b9f14aa44e0efac8b4dc34cb178d8f3
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 21:22:35 2010 +0000

    2010-08-06  Yongjun Zhang  <yongjun_zhang at apple.com>
    
            Reviewed by Eric Seidel.
    
            add "const" to WebChromeClient::webView().
            https://bugs.webkit.org/show_bug.cgi?id=43631
    
            Change WebChromeClient::webView() to be const because ChromeClient::didReceiveViewportArguments
            is const method now, and calling webView() inside port-specific didReceiveViewportArguments
            implementation fails compiling if webView() is not const.
    
            * WebCoreSupport/WebChromeClient.h:
            (WebChromeClient::webView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 3aa976c..e08d188 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-06  Yongjun Zhang  <yongjun_zhang at apple.com>
+
+        Reviewed by Eric Seidel.
+
+        add "const" to WebChromeClient::webView().
+        https://bugs.webkit.org/show_bug.cgi?id=43631
+
+        Change WebChromeClient::webView() to be const because ChromeClient::didReceiveViewportArguments
+        is const method now, and calling webView() inside port-specific didReceiveViewportArguments
+        implementation fails compiling if webView() is not const.
+
+        * WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient::webView):
+
 2010-08-06  Jessie Berlin  <jberlin at apple.com>
 
         Roll out http://trac.webkit.org/changeset/64801, which broke the Safari Windows Build.
diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.h b/WebKit/mac/WebCoreSupport/WebChromeClient.h
index 50c159c..763335d 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.h
@@ -36,7 +36,7 @@
 class WebChromeClient : public WebCore::ChromeClient {
 public:
     WebChromeClient(WebView *webView);
-    WebView *webView() { return m_webView; }
+    WebView *webView() const { return m_webView; }
     
     virtual void chromeDestroyed();
     

-- 
WebKit Debian packaging