Skip to content

Commit 01d4e4c

Browse files
committed
Backed out 2 changesets (bug 1442931) for build bustages at ..\dom\bindings\mozwebidlcodegen\test\test_mozwebidlcodegen.py::TestWebIDLCodegenManager::test_copy_input on a CLOSED TREE
Backed out changeset 9f46e7d52b9b (bug 1442931) Backed out changeset 608e21fcd167 (bug 1442931) --HG-- rename : dom/chrome-webidl/ChannelWrapper.webidl => dom/webidl/ChannelWrapper.webidl rename : dom/chrome-webidl/ChromeUtils.webidl => dom/webidl/ChromeUtils.webidl rename : dom/chrome-webidl/DominatorTree.webidl => dom/webidl/DominatorTree.webidl rename : dom/chrome-webidl/HeapSnapshot.webidl => dom/webidl/HeapSnapshot.webidl rename : dom/chrome-webidl/InspectorUtils.webidl => dom/webidl/InspectorUtils.webidl rename : dom/chrome-webidl/MatchGlob.webidl => dom/webidl/MatchGlob.webidl rename : dom/chrome-webidl/MatchPattern.webidl => dom/webidl/MatchPattern.webidl rename : dom/chrome-webidl/MozStorageAsyncStatementParams.webidl => dom/webidl/MozStorageAsyncStatementParams.webidl rename : dom/chrome-webidl/MozStorageStatementParams.webidl => dom/webidl/MozStorageStatementParams.webidl rename : dom/chrome-webidl/MozStorageStatementRow.webidl => dom/webidl/MozStorageStatementRow.webidl rename : dom/chrome-webidl/PrecompiledScript.webidl => dom/webidl/PrecompiledScript.webidl rename : dom/chrome-webidl/PromiseDebugging.webidl => dom/webidl/PromiseDebugging.webidl rename : dom/chrome-webidl/StructuredCloneHolder.webidl => dom/webidl/StructuredCloneHolder.webidl rename : dom/chrome-webidl/WebExtensionContentScript.webidl => dom/webidl/WebExtensionContentScript.webidl rename : dom/chrome-webidl/WebExtensionPolicy.webidl => dom/webidl/WebExtensionPolicy.webidl
1 parent 5f62077 commit 01d4e4c

21 files changed

+24
-93
lines changed

dom/bindings/Configuration.py

+1-21
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,19 @@ def __init__(self):
1818
pass
1919

2020

21-
def isChildPath(path, basePath):
22-
path = os.path.normpath(path)
23-
return os.path.commonprefix((path, basePath)) == basePath
24-
25-
2621
class Configuration(DescriptorProvider):
2722
"""
2823
Represents global configuration state based on IDL parse data and
2924
the configuration file.
3025
"""
31-
def __init__(self, filename, webRoots, parseData, generatedEvents=[]):
26+
def __init__(self, filename, parseData, generatedEvents=[]):
3227
DescriptorProvider.__init__(self)
3328

3429
# Read the configuration file.
3530
glbl = {}
3631
execfile(filename, glbl)
3732
config = glbl['DOMInterfaces']
3833

39-
webRoots = tuple(map(os.path.normpath, webRoots))
40-
def isInWebIDLRoot(path):
41-
return any(isChildPath(path, root) for root in webRoots)
42-
4334
# Build descriptors for all the interfaces we have in the parse data.
4435
# This allows callers to specify a subset of interfaces by filtering
4536
# |parseData|.
@@ -103,17 +94,6 @@ def isInWebIDLRoot(path):
10394
"%s\n"
10495
"%s" %
10596
(partialIface.location, iface.location))
106-
if not (iface.getExtendedAttribute("ChromeOnly") or
107-
not (iface.hasInterfaceObject() or
108-
iface.isNavigatorProperty()) or
109-
isInWebIDLRoot(iface.filename())):
110-
raise TypeError(
111-
"Interfaces which are exposed to the web may only be "
112-
"defined in a DOM WebIDL root %r. Consider marking "
113-
"the interface [ChromeOnly] if you do not want it "
114-
"exposed to the web.\n"
115-
"%s" %
116-
(webRoots, iface.location))
11797
self.interfaces[iface.identifier.name] = iface
11898
if iface.identifier.name not in config:
11999
# Completely skip consequential interfaces with no descriptor

dom/bindings/mozwebidlcodegen/__init__.py

+2-23
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class WebIDLCodegenManager(LoggingMixin):
150150
'PrototypeList.cpp',
151151
}
152152

153-
def __init__(self, config_path, webidl_root, inputs, exported_header_dir,
153+
def __init__(self, config_path, inputs, exported_header_dir,
154154
codegen_dir, state_path, cache_dir=None, make_deps_path=None,
155155
make_deps_target=None):
156156
"""Create an instance that manages WebIDLs in the build system.
@@ -176,7 +176,6 @@ def __init__(self, config_path, webidl_root, inputs, exported_header_dir,
176176
input_paths, exported_stems, generated_events_stems, example_interfaces = inputs
177177

178178
self._config_path = config_path
179-
self._webidl_root = webidl_root
180179
self._input_paths = set(input_paths)
181180
self._exported_stems = set(exported_stems)
182181
self._generated_events_stems = set(generated_events_stems)
@@ -333,26 +332,8 @@ def _parse_webidl(self):
333332
hashes[path] = hashlib.sha1(data).hexdigest()
334333
parser.parse(data, path)
335334

336-
# Only these directories may contain WebIDL files with interfaces
337-
# which are exposed to the web. WebIDL files in these roots may not
338-
# be changed without DOM peer review.
339-
#
340-
# Other directories may contain WebIDL files as long as they only
341-
# contain ChromeOnly interfaces. These are not subject to mandatory
342-
# DOM peer review.
343-
web_roots = (
344-
# The main WebIDL root.
345-
self._webidl_root,
346-
# The binding config root, which contains some test-only
347-
# interfaces.
348-
os.path.dirname(self._config_path),
349-
# The objdir sub-directory which contains generated WebIDL files.
350-
self._codegen_dir,
351-
)
352-
353335
self._parser_results = parser.finish()
354-
self._config = Configuration(self._config_path, web_roots,
355-
self._parser_results,
336+
self._config = Configuration(self._config_path, self._parser_results,
356337
self._generated_events_stems_as_array)
357338
self._input_hashes = hashes
358339

@@ -565,7 +546,6 @@ def create_build_system_manager(topsrcdir, topobjdir, dist_dir):
565546
"""Create a WebIDLCodegenManager for use by the build system."""
566547
src_dir = os.path.join(topsrcdir, 'dom', 'bindings')
567548
obj_dir = os.path.join(topobjdir, 'dom', 'bindings')
568-
webidl_root = os.path.join(topsrcdir, 'dom', 'webidl')
569549

570550
with open(os.path.join(obj_dir, 'file-lists.json'), 'rb') as fh:
571551
files = json.load(fh)
@@ -582,7 +562,6 @@ def create_build_system_manager(topsrcdir, topobjdir, dist_dir):
582562

583563
return WebIDLCodegenManager(
584564
os.path.join(src_dir, 'Bindings.conf'),
585-
webidl_root,
586565
inputs,
587566
os.path.join(dist_dir, 'include', 'mozilla', 'dom'),
588567
obj_dir,

dom/bindings/mozwebidlcodegen/test/test_mozwebidlcodegen.py

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ def _get_manager_args(self):
7171

7272
return dict(
7373
config_path=self._config_path,
74-
webidl_root='/',
7574
inputs=inputs,
7675
exported_header_dir=mozpath.join(tmp, 'exports'),
7776
codegen_dir=mozpath.join(tmp, 'codegen'),

dom/chrome-webidl/moz.build

-47
This file was deleted.

dom/moz.build

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ DIRS += [
4141
'browser-element',
4242
'cache',
4343
'canvas',
44-
'chrome-webidl',
4544
'clients',
4645
'commandhandler',
4746
'credentialmanagement',
File renamed without changes.
File renamed without changes.

dom/webidl/moz.build

+21
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ with Files("HTML*"):
139139
with Files("HashChangeEvent.webidl"):
140140
BUG_COMPONENT = ("Core", "DOM: Events")
141141

142+
with Files("HeapSnapshot.webidl"):
143+
BUG_COMPONENT = ("Firefox", "Developer Tools: Memory")
144+
142145
with Files("HiddenPluginEvent.webidl"):
143146
BUG_COMPONENT = ("Core", "Plug-ins")
144147

@@ -160,6 +163,9 @@ with Files("InputEvent.webidl"):
160163
with Files("InstallTrigger.webidl"):
161164
BUG_COMPONENT = ("Toolkit", "Add-ons Manager")
162165

166+
with Files("InspectorUtils.webidl"):
167+
BUG_COMPONENT = ("Firefox", "Developer Tools: Inspector")
168+
163169
with Files("KeyAlgorithm.webidl"):
164170
BUG_COMPONENT = ("Core", "DOM: Security")
165171

@@ -354,6 +360,7 @@ GENERATED_WEBIDL_FILES = [
354360
]
355361

356362
PREPROCESSED_WEBIDL_FILES = [
363+
'ChromeUtils.webidl',
357364
'Node.webidl',
358365
'Window.webidl',
359366
]
@@ -411,6 +418,7 @@ WEBIDL_FILES = [
411418
'CDATASection.webidl',
412419
'ChannelMergerNode.webidl',
413420
'ChannelSplitterNode.webidl',
421+
'ChannelWrapper.webidl',
414422
'CharacterData.webidl',
415423
'CheckerboardReportService.webidl',
416424
'ChildNode.webidl',
@@ -475,6 +483,7 @@ WEBIDL_FILES = [
475483
'DOMError.webidl',
476484
'DOMException.webidl',
477485
'DOMImplementation.webidl',
486+
'DominatorTree.webidl',
478487
'DOMMatrix.webidl',
479488
'DOMParser.webidl',
480489
'DOMPoint.webidl',
@@ -527,6 +536,7 @@ WEBIDL_FILES = [
527536
'GetUserMediaRequest.webidl',
528537
'Grid.webidl',
529538
'Headers.webidl',
539+
'HeapSnapshot.webidl',
530540
'History.webidl',
531541
'HTMLAllCollection.webidl',
532542
'HTMLAnchorElement.webidl',
@@ -625,6 +635,7 @@ WEBIDL_FILES = [
625635
'ImageData.webidl',
626636
'ImageDocument.webidl',
627637
'InputEvent.webidl',
638+
'InspectorUtils.webidl',
628639
'IntersectionObserver.webidl',
629640
'IntlUtils.webidl',
630641
'IterableIterator.webidl',
@@ -640,6 +651,8 @@ WEBIDL_FILES = [
640651
'ListBoxObject.webidl',
641652
'LocalMediaStream.webidl',
642653
'Location.webidl',
654+
'MatchGlob.webidl',
655+
'MatchPattern.webidl',
643656
'MediaDeviceInfo.webidl',
644657
'MediaDevices.webidl',
645658
'MediaElementAudioSourceNode.webidl',
@@ -680,6 +693,9 @@ WEBIDL_FILES = [
680693
'MimeTypeArray.webidl',
681694
'MouseEvent.webidl',
682695
'MouseScrollEvent.webidl',
696+
'MozStorageAsyncStatementParams.webidl',
697+
'MozStorageStatementParams.webidl',
698+
'MozStorageStatementRow.webidl',
683699
'MutationEvent.webidl',
684700
'MutationObserver.webidl',
685701
'NamedNodeMap.webidl',
@@ -726,6 +742,7 @@ WEBIDL_FILES = [
726742
'PopupBoxObject.webidl',
727743
'Position.webidl',
728744
'PositionError.webidl',
745+
'PrecompiledScript.webidl',
729746
'Presentation.webidl',
730747
'PresentationAvailability.webidl',
731748
'PresentationConnection.webidl',
@@ -735,6 +752,7 @@ WEBIDL_FILES = [
735752
'ProcessingInstruction.webidl',
736753
'ProfileTimelineMarker.webidl',
737754
'Promise.webidl',
755+
'PromiseDebugging.webidl',
738756
'PushEvent.webidl',
739757
'PushManager.webidl',
740758
'PushManager.webidl',
@@ -772,6 +790,7 @@ WEBIDL_FILES = [
772790
'StorageType.webidl',
773791
'StreamFilter.webidl',
774792
'StreamFilterDataEvent.webidl',
793+
'StructuredCloneHolder.webidl',
775794
'StyleSheet.webidl',
776795
'StyleSheetList.webidl',
777796
'SubtleCrypto.webidl',
@@ -926,6 +945,8 @@ WEBIDL_FILES = [
926945
'WaveShaperNode.webidl',
927946
'WebAuthentication.webidl',
928947
'WebComponents.webidl',
948+
'WebExtensionContentScript.webidl',
949+
'WebExtensionPolicy.webidl',
929950
'WebGL2RenderingContext.webidl',
930951
'WebGLRenderingContext.webidl',
931952
'WebKitCSSMatrix.webidl',

0 commit comments

Comments
 (0)