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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 9d30d12c9f872ca023df79a7f86fae78e996e06a
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 20:52:04 2010 +0000

    2010-09-23  Tony Chang  <tony at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] add caretBrowsingEnabled to WebSettings and DRT
            https://bugs.webkit.org/show_bug.cgi?id=46388
    
            * public/WebSettings.h:
            * src/WebSettingsImpl.cpp:
            (WebKit::WebSettingsImpl::setCaretBrowsingEnabled):
            * src/WebSettingsImpl.h:
    2010-09-23  Tony Chang  <tony at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] add caretBrowsingEnabled to WebSettings and DRT
            https://bugs.webkit.org/show_bug.cgi?id=46388
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::overridePreference):
            * DumpRenderTree/chromium/WebPreferences.cpp:
            (WebPreferences::reset):
            (WebPreferences::applyTo):
            * DumpRenderTree/chromium/WebPreferences.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 718d118..f381d15 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-23  Tony Chang  <tony at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] add caretBrowsingEnabled to WebSettings and DRT
+        https://bugs.webkit.org/show_bug.cgi?id=46388
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setCaretBrowsingEnabled):
+        * src/WebSettingsImpl.h:
+
 2010-09-23  Eric Uhrhane  <ericu at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index ec98600..6a37e08 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -94,6 +94,7 @@ public:
     virtual void setAccelerated2dCanvasEnabled(bool) = 0;
     virtual void setMemoryInfoEnabled(bool) = 0;
     virtual void setHyperlinkAuditingEnabled(bool) = 0;
+    virtual void setCaretBrowsingEnabled(bool) = 0;
 
 protected:
     ~WebSettings() { }
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index 8af3864..9953b5c 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -294,4 +294,9 @@ void WebSettingsImpl::setHyperlinkAuditingEnabled(bool enabled)
     m_settings->setHyperlinkAuditingEnabled(enabled);
 }
 
+void WebSettingsImpl::setCaretBrowsingEnabled(bool enabled)
+{
+    m_settings->setCaretBrowsingEnabled(enabled);
+}
+
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 6f204f4..6d40b4f 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -90,6 +90,7 @@ public:
     virtual void setAccelerated2dCanvasEnabled(bool);
     virtual void setMemoryInfoEnabled(bool);
     virtual void setHyperlinkAuditingEnabled(bool);
+    virtual void setCaretBrowsingEnabled(bool);
 
 private:
     WebCore::Settings* m_settings;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 99fb6e5..48b5e14 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-23  Tony Chang  <tony at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] add caretBrowsingEnabled to WebSettings and DRT
+        https://bugs.webkit.org/show_bug.cgi?id=46388
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::overridePreference):
+        * DumpRenderTree/chromium/WebPreferences.cpp:
+        (WebPreferences::reset):
+        (WebPreferences::applyTo):
+        * DumpRenderTree/chromium/WebPreferences.h:
+
 2010-09-23  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index 2b3f0ba..318a3c2 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -1253,6 +1253,8 @@ void LayoutTestController::overridePreference(const CppArgumentList& arguments,
         prefs->experimentalWebGLEnabled = cppVariantToBool(value);
     else if (key == "WebKitHyperlinkAuditingEnabled")
         prefs->hyperlinkAuditingEnabled = cppVariantToBool(value);
+    else if (key == "WebKitEnableCaretBrowsing")
+        prefs->caretBrowsingEnabled = cppVariantToBool(value);
     else {
         string message("Invalid name for preference: ");
         message.append(key);
diff --git a/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp b/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp
index 5e4a97e..35247ef 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp
@@ -88,6 +88,7 @@ void WebPreferences::reset()
     userStyleSheetLocation = WebURL();
     usesPageCache = false;
     webSecurityEnabled = true;
+    caretBrowsingEnabled = false;
 
     // Allow those layout tests running as local files, i.e. under
     // LayoutTests/http/tests/local, to access http server.
@@ -145,6 +146,7 @@ void WebPreferences::applyTo(WebView* webView)
     // LayoutTests were written with Safari Mac in mind which does not allow
     // tabbing to links by default.
     webView->setTabsToLinks(tabsToLinks);
+    settings->setCaretBrowsingEnabled(caretBrowsingEnabled);
 
     // Fixed values.
     settings->setShouldPaintCustomScrollbars(true);
diff --git a/WebKitTools/DumpRenderTree/chromium/WebPreferences.h b/WebKitTools/DumpRenderTree/chromium/WebPreferences.h
index c496b12..c0ea70f 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebPreferences.h
+++ b/WebKitTools/DumpRenderTree/chromium/WebPreferences.h
@@ -76,6 +76,7 @@ struct WebPreferences {
     WebKit::WebSettings::EditingBehavior editingBehavior;
     bool tabsToLinks;
     bool hyperlinkAuditingEnabled;
+    bool caretBrowsingEnabled;
     bool accelerated2dCanvasEnabled;
 
     WebPreferences() { reset(); }

-- 
WebKit Debian packaging