Diff
Modified: trunk/Source/WebCore/ChangeLog (204107 => 204108)
--- trunk/Source/WebCore/ChangeLog 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/ChangeLog 2016-08-04 00:00:13 UTC (rev 204108)
@@ -1,3 +1,33 @@
+2016-08-03 Anders Carlsson <[email protected]>
+
+ Remove some unneeded #ifs now that the Objective-C bindings are frozen
+ https://bugs.webkit.org/show_bug.cgi?id=160532
+
+ Reviewed by Tim Horton.
+
+ * DerivedSources.make:
+ * Modules/mediasession/HTMLMediaElementMediaSession.idl:
+ * Modules/mediastream/HTMLMediaElementMediaStream.idl:
+ * WebCore.xcodeproj/project.pbxproj:
+ * animation/DocumentAnimation.idl:
+ * dom/ChildNode.idl:
+ * dom/Document.idl:
+ * dom/Element.idl:
+ * dom/Event.idl:
+ * dom/ParentNode.idl:
+ * fileapi/Blob.idl:
+ * fileapi/FileError.idl:
+ * html/DOMSettableTokenList.h: Removed.
+ * html/DOMSettableTokenList.idl: Removed.
+ * html/HTMLCanvasElement.idl:
+ * html/HTMLEmbedElement.idl:
+ * html/HTMLFrameElement.idl:
+ * html/HTMLIFrameElement.idl:
+ * html/HTMLMediaElement.idl:
+ * html/HTMLObjectElement.idl:
+ * html/HTMLOptionsCollection.idl:
+ * html/HTMLVideoElement.idl:
+
2016-08-03 Myles C. Maxfield <[email protected]>
[iOS] SF-Heavy is not accessible from web content
Modified: trunk/Source/WebCore/DerivedSources.make (204107 => 204108)
--- trunk/Source/WebCore/DerivedSources.make 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/DerivedSources.make 2016-08-04 00:00:13 UTC (rev 204108)
@@ -353,7 +353,6 @@
$(WebCore)/fileapi/FileReader.idl \
$(WebCore)/fileapi/FileReaderSync.idl \
$(WebCore)/html/DOMFormData.idl \
- $(WebCore)/html/DOMSettableTokenList.idl \
$(WebCore)/html/DOMTokenList.idl \
$(WebCore)/html/DOMURL.idl \
$(WebCore)/html/HTMLAllCollection.idl \
Modified: trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.idl (204107 => 204108)
--- trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -26,11 +26,9 @@
[
Conditional=VIDEO&MEDIA_SESSION,
] partial interface HTMLMediaElement {
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
attribute DOMString kind;
-#endif
-#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
attribute MediaSession? session;
#endif
};
Modified: trunk/Source/WebCore/Modules/mediastream/HTMLMediaElementMediaStream.idl (204107 => 204108)
--- trunk/Source/WebCore/Modules/mediastream/HTMLMediaElementMediaStream.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/Modules/mediastream/HTMLMediaElementMediaStream.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -27,7 +27,7 @@
Conditional=VIDEO&MEDIA_STREAM,
] partial interface HTMLMediaElement
{
-#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
[SetterCallWith=ScriptExecutionContext] attribute MediaStream? srcObject;
#endif
};
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204107 => 204108)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-04 00:00:13 UTC (rev 204108)
@@ -1954,7 +1954,6 @@
4A9CC81816BB9AC600EC645A /* CSSDefaultStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */; };
4A9CC82016BF9BB400EC645A /* InspectorCSSOMWrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */; };
4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */; };
- 4ACBC0C412713CCA0094F9B2 /* DOMSettableTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */; };
4AD01008127E642A0015035F /* HTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD01005127E642A0015035F /* HTMLOutputElement.cpp */; };
4AD01009127E642A0015035F /* HTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD01006127E642A0015035F /* HTMLOutputElement.h */; };
4AD0173C127E82860015035F /* JSHTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD0173A127E82860015035F /* JSHTMLOutputElement.cpp */; };
@@ -9274,8 +9273,6 @@
4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSDefaultStyleSheets.h; sourceTree = "<group>"; };
4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCSSOMWrappers.cpp; sourceTree = "<group>"; };
4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCSSOMWrappers.h; sourceTree = "<group>"; };
- 4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSettableTokenList.h; sourceTree = "<group>"; };
- 4ACBC0C212713CCA0094F9B2 /* DOMSettableTokenList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMSettableTokenList.idl; sourceTree = "<group>"; };
4AD01005127E642A0015035F /* HTMLOutputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOutputElement.cpp; sourceTree = "<group>"; };
4AD01006127E642A0015035F /* HTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLOutputElement.h; sourceTree = "<group>"; };
4AD01007127E642A0015035F /* HTMLOutputElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLOutputElement.idl; sourceTree = "<group>"; };
@@ -18755,8 +18752,6 @@
2ED609BA1145B07100C8684E /* DOMFormData.cpp */,
2ED609BB1145B07100C8684E /* DOMFormData.h */,
2E0888C3114883A900AF4265 /* DOMFormData.idl */,
- 4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */,
- 4ACBC0C212713CCA0094F9B2 /* DOMSettableTokenList.idl */,
76FC2B0812370DA0006A991A /* DOMTokenList.cpp */,
76FC2B0912370DA0006A991A /* DOMTokenList.h */,
76FC2B0A12370DA0006A991A /* DOMTokenList.idl */,
@@ -25469,7 +25464,6 @@
855D358A0AD707310019AAC7 /* DOMRGBColor.h in Headers */,
BCD0FC4F0DBD720B00B2F630 /* DOMRGBColorInternal.h in Headers */,
BC5A86850C33676000EEA649 /* DOMSelection.h in Headers */,
- 4ACBC0C412713CCA0094F9B2 /* DOMSettableTokenList.h in Headers */,
C544274B11A57E7A0063A749 /* DOMStringList.h in Headers */,
BC64640A11D7F304006455B0 /* DOMStringMap.h in Headers */,
850657000AAB4763002D15C0 /* DOMStyleSheet.h in Headers */,
Modified: trunk/Source/WebCore/animation/DocumentAnimation.idl (204107 => 204108)
--- trunk/Source/WebCore/animation/DocumentAnimation.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/animation/DocumentAnimation.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -30,7 +30,5 @@
EnabledAtRuntime=WebAnimations,
Conditional=WEB_ANIMATIONS
] partial interface Document {
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
readonly attribute DocumentTimeline timeline;
-#endif
};
Modified: trunk/Source/WebCore/dom/ChildNode.idl (204107 => 204108)
--- trunk/Source/WebCore/dom/ChildNode.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/dom/ChildNode.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -22,10 +22,8 @@
[
NoInterfaceObject,
] interface ChildNode {
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[Unscopeable, RaisesException, Custom] void before((Node or DOMString)... nodes);
[Unscopeable, RaisesException, Custom] void after((Node or DOMString)... nodes);
[Unscopeable, RaisesException, Custom] void replaceWith((Node or DOMString)... nodes);
-#endif
[Unscopeable, RaisesException] void remove();
};
Modified: trunk/Source/WebCore/dom/Document.idl (204107 => 204108)
--- trunk/Source/WebCore/dom/Document.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/dom/Document.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -228,9 +228,7 @@
#endif
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
CanvasRenderingContext getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
-#endif
// HTML 5
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
Modified: trunk/Source/WebCore/dom/Element.idl (204107 => 204108)
--- trunk/Source/WebCore/dom/Element.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/dom/Element.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -47,11 +47,8 @@
HTMLCollection getElementsByTagName(DOMString name);
#endif
-#if !defined(LANGUAGE_OBJECTIVE_C)
- // For ObjC this is defined on Node for legacy support.
readonly attribute NamedNodeMap attributes;
boolean hasAttributes();
-#endif
// DOM Level 2 Core
Modified: trunk/Source/WebCore/dom/Event.idl (204107 => 204108)
--- trunk/Source/WebCore/dom/Event.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/dom/Event.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -32,7 +32,6 @@
const unsigned short AT_TARGET = 2;
const unsigned short BUBBLING_PHASE = 3;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
// Reverse-engineered from Netscape
const unsigned short MOUSEDOWN = 1;
const unsigned short MOUSEUP = 2;
@@ -50,7 +49,6 @@
const unsigned short BLUR = 8192;
const unsigned short SELECT = 16384;
const unsigned short CHANGE = 32768;
-#endif
readonly attribute DOMString type;
readonly attribute EventTarget target;
Modified: trunk/Source/WebCore/dom/ParentNode.idl (204107 => 204108)
--- trunk/Source/WebCore/dom/ParentNode.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/dom/ParentNode.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -33,10 +33,8 @@
readonly attribute Element lastElementChild;
readonly attribute unsigned long childElementCount;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[Unscopeable, RaisesException, Custom] void prepend((Node or DOMString)... nodes);
[Unscopeable, RaisesException, Custom] void append((Node or DOMString)... nodes);
-#endif
// [Unscopeable] Element? query(DOMString relativeSelectors);
// [NewObject, Unscopeable] Elements queryAll(DOMString relativeSelectors);
Modified: trunk/Source/WebCore/fileapi/Blob.idl (204107 => 204108)
--- trunk/Source/WebCore/fileapi/Blob.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/fileapi/Blob.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -38,8 +38,6 @@
readonly attribute unsigned long long size;
readonly attribute DOMString type;
-#if !defined(LANGUAGE_OBJECTIVE_C)
Blob slice(optional long long start = 0, optional long long end = 0x7FFFFFFFFFFFFFFF, optional DOMString? contentType = null);
-#endif
};
Modified: trunk/Source/WebCore/fileapi/FileError.idl (204107 => 204108)
--- trunk/Source/WebCore/fileapi/FileError.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/fileapi/FileError.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -31,8 +31,6 @@
[
ImplementationLacksVTable
] interface FileError {
-#if !defined(LANGUAGE_OBJECTIVE_C)
- // FIXME: Some of constant names are already defined in DOMException.h for Objective-C binding and we cannot have the same names here (they are translated into a enum in the same namespace).
const unsigned short NOT_FOUND_ERR = 1;
const unsigned short SECURITY_ERR = 2;
const unsigned short ABORT_ERR = 3;
@@ -45,6 +43,6 @@
const unsigned short QUOTA_EXCEEDED_ERR = 10;
const unsigned short TYPE_MISMATCH_ERR = 11;
const unsigned short PATH_EXISTS_ERR = 12;
-#endif
+
readonly attribute unsigned short code;
};
Deleted: trunk/Source/WebCore/html/DOMSettableTokenList.h (204107 => 204108)
--- trunk/Source/WebCore/html/DOMSettableTokenList.h 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/DOMSettableTokenList.h 2016-08-04 00:00:13 UTC (rev 204108)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2013, 2015 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#ifndef DOMSettableTokenList_h
-#define DOMSettableTokenList_h
-
-#include "DOMTokenList.h"
-#include "SpaceSplitString.h"
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-// Only used by ObjC bindings.
-class DOMSettableTokenList : public DOMTokenList {
- WTF_MAKE_FAST_ALLOCATED;
-};
-
-} // namespace WebCore
-
-#endif // DOMSettableTokenList_h
Deleted: trunk/Source/WebCore/html/DOMSettableTokenList.idl (204107 => 204108)
--- trunk/Source/WebCore/html/DOMSettableTokenList.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/DOMSettableTokenList.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
-
-[
- NoInterfaceObject,
- JSGenerateToJSObject,
- SkipVTableValidation,
-] interface DOMSettableTokenList : DOMTokenList {
- attribute DOMString value;
-
- getter DOMString? (unsigned long index);
-};
-
-#endif
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLCanvasElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -39,11 +39,8 @@
[Custom, RaisesException] DOMString toDataURL(optional DOMString? type);
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
// The custom binding is needed to handle context creation attributes.
[Custom] any getContext(DOMString contextId, any... arguments);
[Custom] boolean probablySupportsContext(DOMString contextId, any... arguments);
-#endif
-
};
Modified: trunk/Source/WebCore/html/HTMLEmbedElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLEmbedElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -38,8 +38,6 @@
[Reflect] attribute long width;
#endif
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[CheckSecurityForNode, RaisesException] SVGDocument getSVGDocument();
-#endif
};
Modified: trunk/Source/WebCore/html/HTMLFrameElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLFrameElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLFrameElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -37,9 +37,7 @@
// Extensions
readonly attribute DOMWindow contentWindow;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[CheckSecurityForNode, RaisesException] SVGDocument getSVGDocument();
-#endif
// FIXME: No other browser has this attribute.
[CustomSetter] attribute DOMString location;
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLIFrameElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -44,8 +44,6 @@
// Extensions
readonly attribute DOMWindow contentWindow;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[CheckSecurityForNode, RaisesException] SVGDocument getSVGDocument();
-#endif
};
Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -95,13 +95,11 @@
readonly attribute boolean webkitHasClosedCaptions;
attribute boolean webkitClosedCaptionsVisible;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
// The number of bytes consumed by the media decoder.
[Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitAudioDecodedByteCount;
[Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitVideoDecodedByteCount;
-#endif
-#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
[Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitGenerateKeyRequest(DOMString? keySystem, optional Uint8Array? initData = null);
[Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitAddKey(DOMString? keySystem, Uint8Array key, optional Uint8Array? initData = null, optional DOMString sessionId);
[Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitCancelKeyRequest(DOMString? keySystem, optional DOMString sessionId);
@@ -117,16 +115,12 @@
[Reflect] attribute DOMString mediaGroup;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[CustomSetter] attribute MediaController controller;
-#endif
-#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
[Conditional=MEDIA_SOURCE] VideoPlaybackQuality getVideoPlaybackQuality();
#endif
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[Conditional=WIRELESS_PLAYBACK_TARGET] void webkitShowPlaybackTargetPicker();
[Conditional=WIRELESS_PLAYBACK_TARGET] readonly attribute boolean webkitCurrentPlaybackTargetIsWireless;
-#endif
};
Modified: trunk/Source/WebCore/html/HTMLObjectElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLObjectElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLObjectElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -49,9 +49,7 @@
// Introduced in DOM Level 2:
[CheckSecurityForNode] readonly attribute Document contentDocument;
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[CheckSecurityForNode, RaisesException] SVGDocument getSVGDocument();
-#endif
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -33,7 +33,7 @@
getter HTMLOptionElement? namedItem(DOMString name);
#endif
-#if (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C) && (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT)
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
// FIXME: Should be:
// void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
[RaisesException] void add(HTMLElement element);
Modified: trunk/Source/WebCore/html/HTMLVideoElement.idl (204107 => 204108)
--- trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-08-03 23:50:19 UTC (rev 204107)
+++ trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-08-04 00:00:13 UTC (rev 204108)
@@ -44,7 +44,6 @@
[RaisesException] void webkitEnterFullScreen();
void webkitExitFullScreen();
-#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[Conditional=WIRELESS_PLAYBACK_TARGET] attribute boolean webkitWirelessVideoPlaybackDisabled;
// The number of frames that have been decoded and made available for playback.
@@ -52,10 +51,9 @@
// The number of decoded frames that have been dropped by the player for performance reasons during playback.
[Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitDroppedFrameCount;
-#endif
// Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
-#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
+#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
[Conditional=VIDEO_PRESENTATION_MODE] boolean webkitSupportsPresentationMode(VideoPresentationMode mode);
[Conditional=VIDEO_PRESENTATION_MODE] readonly attribute VideoPresentationMode webkitPresentationMode;
[Conditional=VIDEO_PRESENTATION_MODE] void webkitSetPresentationMode(VideoPresentationMode mode);
