1 files changed, 41 insertions, 6 deletions

diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index 5cfbd4f..6569e2e 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -185,6 +185,11 @@ void WebSettingsImpl::setUserStyleSheetLocation(const WebURL& location)
     m_settings->setUserStyleSheetLocation(location);
 }
 
+void WebSettingsImpl::setAuthorAndUserStylesEnabled(bool enabled)
+{
+    m_settings->setAuthorAndUserStylesEnabled(enabled);
+}
+
 void WebSettingsImpl::setUsesPageCache(bool usesPageCache)
 {
     m_settings->setUsesPageCache(usesPageCache);
@@ -195,6 +200,11 @@ void WebSettingsImpl::setDownloadableBinaryFontsEnabled(bool enabled)
     m_settings->setDownloadableBinaryFontsEnabled(enabled);
 }
 
+void WebSettingsImpl::setJavaScriptCanAccessClipboard(bool enabled)
+{
+    m_settings->setJavaScriptCanAccessClipboard(enabled);
+}
+
 void WebSettingsImpl::setXSSAuditorEnabled(bool enabled)
 {
     m_settings->setXSSAuditorEnabled(enabled);
@@ -226,14 +236,14 @@ void WebSettingsImpl::setShouldPaintCustomScrollbars(bool enabled)
     m_settings->setShouldPaintCustomScrollbars(enabled);
 }
 
-void WebSettingsImpl::setDatabasesEnabled(bool enabled)
+void WebSettingsImpl::setAllowUniversalAccessFromFileURLs(bool allow)
 {
-    m_settings->setDatabasesEnabled(enabled);
+    m_settings->setAllowUniversalAccessFromFileURLs(allow);
 }
 
-void WebSettingsImpl::setAllowUniversalAccessFromFileURLs(bool allow)
+void WebSettingsImpl::setAllowFileAccessFromFileURLs(bool allow)
 {
-    m_settings->setAllowUniversalAccessFromFileURLs(allow);
+    m_settings->setAllowFileAccessFromFileURLs(allow);
 }
 
 void WebSettingsImpl::setTextDirectionSubmenuInclusionBehaviorNeverIncluded()
@@ -254,9 +264,34 @@ void WebSettingsImpl::setExperimentalWebGLEnabled(bool enabled)
     m_settings->setWebGLEnabled(enabled);
 }
 
-void WebSettingsImpl::setGeolocationEnabled(bool enabled)
+void WebSettingsImpl::setShowDebugBorders(bool show)
+{
+    m_settings->setShowDebugBorders(show);
+}
+
+void WebSettingsImpl::setEditingBehavior(EditingBehavior behavior)
+{
+    m_settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(behavior));
+}
+
+void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled)
+{
+    m_settings->setAcceleratedCompositingEnabled(enabled);
+}
+
+void WebSettingsImpl::setAccelerated2dCanvasEnabled(bool enabled)
+{
+    m_settings->setAccelerated2dCanvasEnabled(enabled);
+}
+
+void WebSettingsImpl::setHTML5ParserEnabled(bool enabled)
+{
+    m_settings->setHTML5ParserEnabled(enabled);
+}
+
+void WebSettingsImpl::setMemoryInfoEnabled(bool enabled)
 {
-    m_settings->setGeolocationEnabled(enabled);
+    m_settings->setMemoryInfoEnabled(enabled);
 }
 
 } // namespace WebKit