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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c22fb6edf0e495ec9ecacb2614a9ef1e808107f2
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 15:59:30 2010 +0000

    2010-12-06  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Build is broken after r73353
            https://bugs.webkit.org/show_bug.cgi?id=50568
    
            Fix the gtk-doc build by making all members of the cache model
            enum public. gtk-doc does not support making only some enum
            members private. We should also expose it so that users querying
            the cache model do not get mysterious, undocumented results.
    
            * webkit/webkitwebview.h: Fix gtk-doc for the cache model enum.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 27475b3..26646b6 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-06  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Build is broken after r73353
+        https://bugs.webkit.org/show_bug.cgi?id=50568
+
+        Fix the gtk-doc build by making all members of the cache model
+        enum public. gtk-doc does not support making only some enum
+        members private. We should also expose it so that users querying
+        the cache model do not get mysterious, undocumented results.
+
+        * webkit/webkitwebview.h: Fix gtk-doc for the cache model enum.
+
 2010-12-06  Derek Weitzel  <djw8605 at gmail.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/webkit/webkitwebview.h b/WebKit/gtk/webkit/webkitwebview.h
index 453bd1a..514d83c 100644
--- a/WebKit/gtk/webkit/webkitwebview.h
+++ b/WebKit/gtk/webkit/webkitwebview.h
@@ -52,18 +52,18 @@ typedef enum {
 
 /*  
  * WebKitCacheModel:
+ * @WEBKIT_CACHE_MODEL_DEFAULT: The default cache model. This is
+ *   WEBKIT_CACHE_MODEL_WEB_BROWSER.
  * @WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER: Disable the cache completely, which 
  *   substantially reduces memory usage. Useful for applications that only
  *   access local files.
  * @WEBKIT_CACHE_MODEL_WEB_BROWSER: Improve document load speed substantially
- *   by caching previously viewed content. This is the default setting.
+ *   by caching previously viewed content.
  * 
  * Enum values used for determining the webview cache model.
  */
 typedef enum {
-    /*< private >*/
     WEBKIT_CACHE_MODEL_DEFAULT,
-    /*< public >*/
     WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER,
     WEBKIT_CACHE_MODEL_WEB_BROWSER
 } WebKitCacheModel;

-- 
WebKit Debian packaging