From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 22 Jul 2010 15:37:06 +0100
Subject: Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
---
 WebKit/chromium/src/WebSettingsImpl.h | 1 +
 1 file changed, 1 insertion(+)

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

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