Merge the chrome_webkit_merge_branch back on to trunk. This brings us

up to webkit@36102.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 67 deletions

diff --git a/webkit/port/xml/XMLHttpRequest.idl b/webkit/port/xml/XMLHttpRequest.idl
deleted file mode 100644
index cc4527c..0000000
--- a/webkit/port/xml/XMLHttpRequest.idl
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2008, Google Inc.
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-// 
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-module core {
-
-interface XMLHttpRequest {
-  		 attribute [CustomSetter] EventListener  	onreadystatechange;
-		 attribute [CustomSetter] EventListener        onload;
-	readonly attribute unsigned short 	readyState;
-	readonly attribute DOMString		responseText
-            getter raises(DOMExcecption);
-	readonly attribute Document 		responseXML
-            getter raises(DOMExcecption);
-	readonly attribute unsigned short 	status
-            getter raises(DOMExcecption);
-	readonly attribute DOMString		statusText
-            getter raises(DOMExcecption);
-
-	[Custom] void open(in DOMString method, in DOMString url, in boolean async, in DOMString users, in DOMString passwd);
-	[Custom] void send(in DOMString data);
-	void abort();
-        [Custom] void setRequestHeader(in DOMString header, in DOMString value)
-			raises (DOMException);
-        [ConvertNullStringTo=Null] DOMString getAllResponseHeaders()
-            raises(DOMException);
-        [Custom] DOMString getResponseHeader(in DOMString header)
-            raises(DOMException);
-      
-        [Custom] void overrideMimeType(in DOMString value); 
-
-        [Custom] void addEventListener(in DOMString type, 
-                                            in EventListener listener, 
-                                            in boolean useCapture);
-        [Custom] void removeEventListener(in DOMString type, 
-                                               in EventListener listener, 
-                                               in boolean useCapture);
-        boolean   dispatchEvent(in Event event)
-            raises(EventException);
-};
-
-}