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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a8969aab0014cb28dd7dfab684340f1a3703de7c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 19:41:02 2010 +0000

    2010-12-10  Joone Hur  <joone at kldp.org>
    
            Reviewed by Martin Robinson.
    
            [GTK] DRT needs layoutTestController.setCacheModel
            https://bugs.webkit.org/show_bug.cgi?id=50705
    
            webkit_set_cache_mode() is called to set the cache model.
    
            * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
            (LayoutTestController::setCacheModel): Set the cache model.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5c0c3e6..5bb5f3e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-10  Joone Hur  <joone at kldp.org>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] DRT needs layoutTestController.setCacheModel
+        https://bugs.webkit.org/show_bug.cgi?id=50705
+        
+        webkit_set_cache_mode() is called to set the cache model.
+        
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setCacheModel): Set the cache model. 
+
 2010-12-10  Tony Chang  <tony at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 487a02e..7380d75 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -563,9 +563,12 @@ bool LayoutTestController::isCommandEnabled(JSStringRef name)
     return result;
 }
 
-void LayoutTestController::setCacheModel(int)
+void LayoutTestController::setCacheModel(int cacheModel)
 {
-    // FIXME: implement
+    if (!cacheModel) // WebCacheModelDocumentViewer
+        webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); 
+    else 
+        webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER); 
 }
 
 void LayoutTestController::setPersistentUserStyleSheetLocation(JSStringRef jsURL)

-- 
WebKit Debian packaging