From 5af96e2c7b73ebc627c6894727826a7576d31758 Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 3 Jun 2010 14:33:32 +0100
Subject: Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
---
 WebKit/chromium/src/WebSettingsImpl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WebKit/chromium/src/WebSettingsImpl.h')

diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 0a90091..70bd792 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -86,6 +86,8 @@ public:
     virtual void setExperimentalWebGLEnabled(bool);
     virtual void setShowDebugBorders(bool);
     virtual void setEditingBehavior(EditingBehavior);
+    virtual void setAcceleratedCompositingEnabled(bool);
+    virtual void setHTML5ParserEnabled(bool);
 
 private:
     WebCore::Settings* m_settings;
-- 
cgit v1.1