From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 16:25:10 +0100
Subject: Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
---
 Source/WebCore/html/HTMLElement.idl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/html/HTMLElement.idl')

diff --git a/Source/WebCore/html/HTMLElement.idl b/Source/WebCore/html/HTMLElement.idl
index 77423fc..cd400c4 100644
--- a/Source/WebCore/html/HTMLElement.idl
+++ b/Source/WebCore/html/HTMLElement.idl
@@ -59,7 +59,8 @@ module html {
 
         readonly attribute HTMLCollection children;
 
-                 attribute [ConvertNullToNullString] DOMString contentEditable;
+                 attribute [ConvertNullToNullString] DOMString contentEditable
+                     setter raises(DOMException);
         readonly attribute boolean isContentEditable;
 
                  attribute boolean spellcheck;
-- 
cgit v1.1