From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/html/HTMLElement.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/html/HTMLElement.h') diff --git a/Source/WebCore/html/HTMLElement.h b/Source/WebCore/html/HTMLElement.h index 73517df..077b1c3 100644 --- a/Source/WebCore/html/HTMLElement.h +++ b/Source/WebCore/html/HTMLElement.h @@ -56,9 +56,8 @@ public: void insertAdjacentText(const String& where, const String& text, ExceptionCode&); virtual bool supportsFocus() const; - - virtual bool isContentEditable() const; - virtual bool isContentRichlyEditable() const; + + bool isContentEditable() const; String contentEditable() const; void setContentEditable(const String&, ExceptionCode&); -- cgit v1.1