diff options
author | ager@google.com <ager@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 09:11:22 +0000 |
---|---|---|
committer | ager@google.com <ager@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 09:11:22 +0000 |
commit | c569262be98c6356d978b30ff953c62cdb34b786 (patch) | |
tree | c0676a8c88ae866660fde5a30e3663faabcd93c8 /webkit/port | |
parent | 50db8131849c456c71cadf455438bb51b5e55b82 (diff) | |
download | chromium_src-c569262be98c6356d978b30ff953c62cdb34b786.zip chromium_src-c569262be98c6356d978b30ff953c62cdb34b786.tar.gz chromium_src-c569262be98c6356d978b30ff953c62cdb34b786.tar.bz2 |
IDL file merge.
- Use short license header for idl files created by us.
- Unfork XSLTProcessor.idl.
- Merge in minor changes to idl files.
- Remove forked version of layout test that has been fixed upstream
(and which we pass after Node.idl merge).
Review URL: http://codereview.chromium.org/7113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r-- | webkit/port/dom/EventTargetNode.idl | 31 | ||||
-rw-r--r-- | webkit/port/dom/Node.idl | 6 | ||||
-rw-r--r-- | webkit/port/html/HTMLDocument.idl | 11 | ||||
-rw-r--r-- | webkit/port/html/HTMLSelectionInputElement.idl | 31 | ||||
-rw-r--r-- | webkit/port/html/UndetectableHTMLCollection.idl | 31 | ||||
-rw-r--r-- | webkit/port/page/Location.idl | 31 | ||||
-rw-r--r-- | webkit/port/page/Navigator.h | 5 | ||||
-rw-r--r-- | webkit/port/page/Navigator.idl | 33 | ||||
-rw-r--r-- | webkit/port/page/inspector/InspectorController.idl | 31 | ||||
-rw-r--r-- | webkit/port/xml/XSLTProcessor.idl | 43 |
10 files changed, 31 insertions, 222 deletions
diff --git a/webkit/port/dom/EventTargetNode.idl b/webkit/port/dom/EventTargetNode.idl index c179db8..acc8486 100644 --- a/webkit/port/dom/EventTargetNode.idl +++ b/webkit/port/dom/EventTargetNode.idl @@ -1,31 +1,6 @@ -// 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. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in the +// LICENSE file. module events { diff --git a/webkit/port/dom/Node.idl b/webkit/port/dom/Node.idl index f3b6e32..0bf4184 100644 --- a/webkit/port/dom/Node.idl +++ b/webkit/port/dom/Node.idl @@ -25,6 +25,7 @@ module core { GenerateConstructor, GenerateNativeConverter, GenerateToJS, + InlineGetOwnPropertySlot, ObjCCustomInternalImpl, InterfaceUUID=84BA0D7A-7E3E-4a7b-B6FB-7653E8FB54ED, ImplementationUUID=81B47FDB-94B0-40fd-8E0C-FB2A6E53CC04 @@ -100,7 +101,6 @@ module core { boolean isDefaultNamespace(in [ConvertNullToNullString] DOMString namespaceURI); [ConvertNullStringTo=Null] DOMString lookupNamespaceURI(in [ConvertNullToNullString] DOMString prefix); -#if 0 // DocumentPosition const unsigned short DOCUMENT_POSITION_DISCONNECTED = 0x01; const unsigned short DOCUMENT_POSITION_PRECEDING = 0x02; @@ -109,9 +109,9 @@ module core { const unsigned short DOCUMENT_POSITION_CONTAINED_BY = 0x10; const unsigned short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20; - unsigned short compareDocumentPosition(in Node other) - raises(DOMException); + unsigned short compareDocumentPosition(in Node other); +#if 0 DOMObject getFeature(in DOMString feature, in DOMString version); DOMUserData setUserData(in DOMString key, diff --git a/webkit/port/html/HTMLDocument.idl b/webkit/port/html/HTMLDocument.idl index 074bc61..6ad1c8f 100644 --- a/webkit/port/html/HTMLDocument.idl +++ b/webkit/port/html/HTMLDocument.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> * * This library is free software; you can redistribute it and/or @@ -31,18 +31,15 @@ module html { [Custom] void write(in DOMString text); [Custom] void writeln(in DOMString text); - // Extensions - Element getElementById(in DOMString elementId); - readonly attribute HTMLCollection embeds; readonly attribute HTMLCollection plugins; readonly attribute HTMLCollection scripts; -#if defined(V8_BINDING) - // FIXME: These should eventually be available (if they are wanted) for all languages. + // Extensions +#if defined(LANGUAGE_JAVASCRIPT) + // FIXME: This should eventually be available (if they are wanted) for all languages. readonly attribute HTMLCollection all; - #endif void clear(); diff --git a/webkit/port/html/HTMLSelectionInputElement.idl b/webkit/port/html/HTMLSelectionInputElement.idl index a7c3899..ba6e611 100644 --- a/webkit/port/html/HTMLSelectionInputElement.idl +++ b/webkit/port/html/HTMLSelectionInputElement.idl @@ -1,31 +1,6 @@ -// 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. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in the +// LICENSE file. module html { diff --git a/webkit/port/html/UndetectableHTMLCollection.idl b/webkit/port/html/UndetectableHTMLCollection.idl index d29ac07..bcb2aee 100644 --- a/webkit/port/html/UndetectableHTMLCollection.idl +++ b/webkit/port/html/UndetectableHTMLCollection.idl @@ -1,31 +1,6 @@ -// 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. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in the +// LICENSE file. module html { diff --git a/webkit/port/page/Location.idl b/webkit/port/page/Location.idl index c9e6b5a..473522a 100644 --- a/webkit/port/page/Location.idl +++ b/webkit/port/page/Location.idl @@ -1,31 +1,6 @@ -// 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. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in the +// LICENSE file. module core { interface [CheckDomainSecurity] Location { diff --git a/webkit/port/page/Navigator.h b/webkit/port/page/Navigator.h index 40e3a9b..b757cec 100644 --- a/webkit/port/page/Navigator.h +++ b/webkit/port/page/Navigator.h @@ -10,6 +10,7 @@ #include "Frame.h" #include "FrameLoader.h" #include "Document.h" +#include "NetworkStateNotifier.h" #include "Settings.h" #include "PluginInfoStore.h" #include <wtf/RefCounted.h> @@ -246,6 +247,10 @@ class Navigator : public RefCounted<Navigator> { return m_frame->settings()->isJavaEnabled(); } + bool onLine() const { + return networkStateNotifier().onLine(); + } + Frame* frame() { return m_frame; } void disconnectFrame() { m_frame = NULL; } diff --git a/webkit/port/page/Navigator.idl b/webkit/port/page/Navigator.idl index a760e63..6ed8243 100644 --- a/webkit/port/page/Navigator.idl +++ b/webkit/port/page/Navigator.idl @@ -1,31 +1,6 @@ -// 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. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in the +// LICENSE file. module core { #if defined(V8_BINDING) @@ -46,7 +21,7 @@ interface Navigator { // readonly attribute DOMString securityPolicy; readonly attribute DOMString userAgent; readonly attribute boolean cookieEnabled; -// readonly attribute boolean onLine; + readonly attribute boolean onLine; // readonly attribute DOMString buildID; boolean javaEnabled(); diff --git a/webkit/port/page/inspector/InspectorController.idl b/webkit/port/page/inspector/InspectorController.idl index 16e295e..690ade2 100644 --- a/webkit/port/page/inspector/InspectorController.idl +++ b/webkit/port/page/inspector/InspectorController.idl @@ -1,31 +1,6 @@ -// 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. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in the +// LICENSE file. /* if ENABLE(DATABASE), there should be a databaseTableNames method. */ diff --git a/webkit/port/xml/XSLTProcessor.idl b/webkit/port/xml/XSLTProcessor.idl deleted file mode 100644 index 787c3b1..0000000 --- a/webkit/port/xml/XSLTProcessor.idl +++ /dev/null @@ -1,43 +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 XSLTProcessor { - [Custom] void importStylesheet(in Node node); - [Custom] DocumentFragment transformToFragment(in Node source, in Document owner); - [Custom] Document transformToDocument(in Node source); - [Custom] void setParameter(in DOMString namespaceURI, in DOMString localName, in DOMString value); - [Custom] DOMString getParameter(in DOMString namespaceURI, in DOMString localName); - [Custom] void removeParameter(in DOMString namespaceURI, in DOMString localName); - void clearParameters(); - void reset(); -}; - -} |