Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (270296 => 270297)
--- trunk/Source/WebCore/CMakeLists.txt 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-12-01 15:21:33 UTC (rev 270297)
@@ -890,6 +890,7 @@
dom/RequestAnimationFrameCallback.idl
dom/SecurityPolicyViolationEvent.idl
dom/ShadowRoot.idl
+ dom/ShadowRootInit.idl
dom/ShadowRootMode.idl
dom/Slotable.idl
dom/StaticRange.idl
Modified: trunk/Source/WebCore/ChangeLog (270296 => 270297)
--- trunk/Source/WebCore/ChangeLog 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/ChangeLog 2020-12-01 15:21:33 UTC (rev 270297)
@@ -1,3 +1,25 @@
+2020-12-01 Tetsuharu Ohzeki <[email protected]>
+
+ [WebIDL] Move ShadowRootInit to dedicated idl file from Element.idl
+ https://bugs.webkit.org/show_bug.cgi?id=219261
+
+ Reviewed by Don Olmstead.
+
+ * CMakeLists.txt:
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * Headers.cmake:
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Element.cpp:
+ * dom/Element.h:
+ * dom/Element.idl:
+ * dom/ShadowRootInit.h: Added.
+ * dom/ShadowRootInit.idl: Added.
+ This patch use the same license header used in bug 216336
+ because this patch does not change the code essentially at here.
+
2020-12-01 Youenn Fablet <[email protected]>
CSSStyleSheet.cssRules and rules should throw in case of opaque stylesheets
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (270296 => 270297)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-12-01 15:21:33 UTC (rev 270297)
@@ -806,6 +806,7 @@
$(PROJECT_DIR)/dom/RequestAnimationFrameCallback.idl
$(PROJECT_DIR)/dom/SecurityPolicyViolationEvent.idl
$(PROJECT_DIR)/dom/ShadowRoot.idl
+$(PROJECT_DIR)/dom/ShadowRootInit.idl
$(PROJECT_DIR)/dom/ShadowRootMode.idl
$(PROJECT_DIR)/dom/Slotable.idl
$(PROJECT_DIR)/dom/StaticRange.idl
Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (270296 => 270297)
--- trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-12-01 15:21:33 UTC (rev 270297)
@@ -2139,6 +2139,8 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSServiceWorkerWindowClient.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShadowRoot.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShadowRoot.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShadowRootInit.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShadowRootInit.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShadowRootMode.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShadowRootMode.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSShareData.cpp
Modified: trunk/Source/WebCore/DerivedSources.make (270296 => 270297)
--- trunk/Source/WebCore/DerivedSources.make 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/DerivedSources.make 2020-12-01 15:21:33 UTC (rev 270297)
@@ -761,6 +761,7 @@
$(WebCore)/dom/RequestAnimationFrameCallback.idl \
$(WebCore)/dom/SecurityPolicyViolationEvent.idl \
$(WebCore)/dom/ShadowRoot.idl \
+ $(WebCore)/dom/ShadowRootInit.idl \
$(WebCore)/dom/ShadowRootMode.idl \
$(WebCore)/dom/Slotable.idl \
$(WebCore)/dom/StaticRange.idl \
Modified: trunk/Source/WebCore/Headers.cmake (270296 => 270297)
--- trunk/Source/WebCore/Headers.cmake 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/Headers.cmake 2020-12-01 15:21:33 UTC (rev 270297)
@@ -491,6 +491,7 @@
dom/SecurityContext.h
dom/SecurityPolicyViolationEvent.h
dom/ShadowRoot.h
+ dom/ShadowRootInit.h
dom/ShadowRootMode.h
dom/SimpleRange.h
dom/SimulatedClickOptions.h
Modified: trunk/Source/WebCore/Sources.txt (270296 => 270297)
--- trunk/Source/WebCore/Sources.txt 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/Sources.txt 2020-12-01 15:21:33 UTC (rev 270297)
@@ -3551,6 +3551,7 @@
JSServiceWorkerUpdateViaCache.cpp
JSServiceWorkerWindowClient.cpp
JSShadowRoot.cpp
+JSShadowRootInit.cpp
JSShadowRootMode.cpp
JSShareData.cpp
JSSlotable.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (270296 => 270297)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-12-01 15:21:33 UTC (rev 270297)
@@ -66,6 +66,7 @@
01D3CF8514BD0A3000FE9970 /* WebGLContextObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 01D3CF7F14BD0A3000FE9970 /* WebGLContextObject.h */; };
01D3CF8714BD0A3000FE9970 /* WebGLSharedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 01D3CF8114BD0A3000FE9970 /* WebGLSharedObject.h */; };
0562F9611573F88F0031CA16 /* PlatformLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0562F9601573F88F0031CA16 /* PlatformLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 056A7AC8256C4F48002F9DDC /* ShadowRootInit.h in Headers */ = {isa = PBXBuildFile; fileRef = 054E3A33256C3BD90072C5B9 /* ShadowRootInit.h */; settings = {ATTRIBUTES = (Private, ); }; };
05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; };
06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
062287840B4DB322000C34DF /* FocusDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 062287830B4DB322000C34DF /* FocusDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5579,6 +5580,8 @@
01D3CF7F14BD0A3000FE9970 /* WebGLContextObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLContextObject.h; sourceTree = "<group>"; };
01D3CF8014BD0A3000FE9970 /* WebGLSharedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGLSharedObject.cpp; sourceTree = "<group>"; };
01D3CF8114BD0A3000FE9970 /* WebGLSharedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLSharedObject.h; sourceTree = "<group>"; };
+ 054E3A33256C3BD90072C5B9 /* ShadowRootInit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShadowRootInit.h; sourceTree = "<group>"; };
+ 054E3A35256C3BD90072C5B9 /* ShadowRootInit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ShadowRootInit.idl; sourceTree = "<group>"; };
0562F9601573F88F0031CA16 /* PlatformLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformLayer.h; sourceTree = "<group>"; };
05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimeStamp.h; sourceTree = "<group>"; };
06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuItem.h; sourceTree = "<group>"; };
@@ -30191,6 +30194,8 @@
A6D169611346B49B000EB770 /* ShadowRoot.cpp */,
A6D169631346B4C1000EB770 /* ShadowRoot.h */,
9B19B67E1B964E5200348745 /* ShadowRoot.idl */,
+ 054E3A33256C3BD90072C5B9 /* ShadowRootInit.h */,
+ 054E3A35256C3BD90072C5B9 /* ShadowRootInit.idl */,
46DFF4961DC2601300B80B48 /* ShadowRootMode.h */,
46DFF4971DC2601300B80B48 /* ShadowRootMode.idl */,
9316DDFA240C64B3009340AA /* SimpleRange.cpp */,
@@ -34434,6 +34439,7 @@
0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */,
BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
+ 056A7AC8256C4F48002F9DDC /* ShadowRootInit.h in Headers */,
46DFF4981DC2603100B80B48 /* ShadowRootMode.h in Headers */,
FD45A94F175D3F3E00C21EC8 /* Shape.h in Headers */,
FD45A95B175D41EE00C21EC8 /* ShapeInterval.h in Headers */,
Modified: trunk/Source/WebCore/dom/Element.cpp (270296 => 270297)
--- trunk/Source/WebCore/dom/Element.cpp 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/dom/Element.cpp 2020-12-01 15:21:33 UTC (rev 270297)
@@ -107,6 +107,7 @@
#include "ScrollLatchingController.h"
#include "SelectorQuery.h"
#include "Settings.h"
+#include "ShadowRootInit.h"
#include "SimulatedClick.h"
#include "SlotAssignment.h"
#include "StyleInvalidator.h"
Modified: trunk/Source/WebCore/dom/Element.h (270296 => 270297)
--- trunk/Source/WebCore/dom/Element.h 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/dom/Element.h 2020-12-01 15:21:33 UTC (rev 270297)
@@ -29,6 +29,7 @@
#include "ElementData.h"
#include "HTMLNames.h"
#include "ScrollTypes.h"
+#include "ShadowRootInit.h"
#include "ShadowRootMode.h"
#include "SimulatedClickOptions.h"
#include "StyleChange.h"
@@ -297,10 +298,6 @@
WEBCORE_EXPORT ShadowRoot* shadowRoot() const;
ShadowRoot* shadowRootForBindings(JSC::JSGlobalObject&) const;
- struct ShadowRootInit {
- ShadowRootMode mode;
- bool delegatesFocus { false };
- };
WEBCORE_EXPORT ExceptionOr<ShadowRoot&> attachShadow(const ShadowRootInit&);
RefPtr<ShadowRoot> userAgentShadowRoot() const;
Modified: trunk/Source/WebCore/dom/Element.idl (270296 => 270297)
--- trunk/Source/WebCore/dom/Element.idl 2020-12-01 14:58:10 UTC (rev 270296)
+++ trunk/Source/WebCore/dom/Element.idl 2020-12-01 15:21:33 UTC (rev 270297)
@@ -98,11 +98,6 @@
[NotEnumerable, Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventHandler onwebkitplaybacktargetavailabilitychanged;
};
-dictionary ShadowRootInit {
- required ShadowRootMode mode;
- boolean delegatesFocus = false;
-};
-
Element includes AccessibilityRole;
Element includes AriaAttributes;
Element includes Animatable;
Added: trunk/Source/WebCore/dom/ShadowRootInit.h (0 => 270297)
--- trunk/Source/WebCore/dom/ShadowRootInit.h (rev 0)
+++ trunk/Source/WebCore/dom/ShadowRootInit.h 2020-12-01 15:21:33 UTC (rev 270297)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+#pragma once
+
+#include "ShadowRootMode.h"
+
+namespace WebCore {
+
+struct ShadowRootInit {
+ ShadowRootMode mode;
+ bool delegatesFocus { false };
+};
+
+}
Added: trunk/Source/WebCore/dom/ShadowRootInit.idl (0 => 270297)
--- trunk/Source/WebCore/dom/ShadowRootInit.idl (rev 0)
+++ trunk/Source/WebCore/dom/ShadowRootInit.idl 2020-12-01 15:21:33 UTC (rev 270297)
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+dictionary ShadowRootInit {
+ required ShadowRootMode mode;
+ boolean delegatesFocus = false;
+};
