WebIDL HTMLConstructor support #17224

cbrewster · 2017-06-08T05:10:09Z

spec: https://html.spec.whatwg.org/multipage/#htmlconstructor

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #17194 (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because _____

This change is

highfive · 2017-06-08T05:10:13Z

Heads up! This PR modifies the following files:

@fitzgen: components/script/dom/webidls/HTMLElement.webidl, components/script/dom/webidls/HTMLDataListElement.webidl, components/script/dom/webidls/HTMLBaseElement.webidl, components/script/dom/webidls/HTMLSpanElement.webidl, components/script/dom/bindings/codegen/parser/tests/test_constructor.py and 67 more
@KiChjang: components/script/dom/webidls/HTMLElement.webidl, components/script/dom/webidls/HTMLDataListElement.webidl, components/script/dom/webidls/HTMLBaseElement.webidl, components/script/dom/webidls/HTMLSpanElement.webidl, components/script/dom/bindings/codegen/parser/tests/test_constructor.py and 67 more

highfive · 2017-06-08T05:10:14Z

Warning

These commits modify unsafe code. Please review it carefully!

cbrewster · 2017-06-08T05:11:21Z

This is getting close to done. I am new to a lot of the jsapi stuff and codegen, so any feedback there would be very helpful!

cc @jdm

cbrewster · 2017-06-08T16:04:49Z

components/script/dom/bindings/interface.rs

+                return Err(Error::Type("Active function object is not HTMLElement".to_owned()));
+            }
+        } else {
+            // TODO: Step 5


I'm not quite sure how to do step 5. I think there are two potential options:

Get a list of local names from the callee. I am not even sure if this is possible.

Get a ConstructorObject from the definition's local name and compare it to the callee. But we don't generate GetConstructorObject for most of the HTML interfaces.

Given the commit that adds HTMLConstructor to the HTML interfaces, do we not generate GetConstructorObjects for them now?

We only generate GetConstructorObject for interfaces that are a namespace, callback, or have descendants.
Configuration.py#L397-L401

Gecko is much more liberal; we can follow their lead: https://dxr.mozilla.org/mozilla-central/source/dom/bindings/Codegen.py#12826-12828

Yeah, not generating GetConstructorObject for leaf interfaces was just me trimming a bit of unneeded codegen, but if it's not unneeded anymore, just make it generate the function again.

nox · 2017-06-09T10:18:17Z

Changes to WebIDL.py need to be versioned as standalone patch files in the repository. But in your case you don't need to do it, because the upstream parser in mozilla-central already supports [HTMLConstructor]. Will do a PR to update ours.

nox · 2017-06-09T12:00:38Z

#17254

bors-servo · 2017-06-12T15:39:09Z

☔ The latest upstream changes (presumably #17254) made this pull request unmergeable. Please resolve the merge conflicts.


        update rust-mozjs

jdm

Good start!

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/interface.rs

+    let registry = window.CustomElements();
+    let document = window.Document();
+
+    // Step 2 in codegen


// Step 2 is checked in the generated caller code

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/codegen/CodegenRust.py

+// Step 2 https://html.spec.whatwg.org/multipage/#htmlconstructor
+// The custom element definition cannot use an element interface as its constructor
+
+rooted!(in(cx) let new_target = UnwrapObject(args.new_target().to_object(), 1));


Add this from Gecko's implementation:

// The new_target might be a cross-compartment wrapper. Get the underlying object // so we can do the spec's object-identity checks.

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/codegen/CodegenRust.py

+    throw_dom_exception(cx, global.upcast::<GlobalScope>(), Error::Type("new.target is null".to_owned()));
+}
+
+{


Add this from Gecko:

// Step 2 of https://html.spec.whatwg.org/multipage/dom.html#htmlconstructor. // Enter the compartment of our underlying new_target object, so we end // up comparing to the constructor object for our interface from that global.

jdm · 2017-06-12T17:11:08Z

components/script/dom/create.rs

+                                 prefix: Option<Prefix>,
+                                 document: &Document,
+                                 creator: ElementCreator)
+                                 -> Root<Element> {


nit: indentation

jdm · 2017-06-12T17:11:08Z

components/script/dom/customelementregistry.rs

@@ -63,6 +63,12 @@ impl CustomElementRegistry {
        self.when_defined.borrow_mut().clear()
    }

+    pub fn lookup_definition_by_constructor(&self, constructor: HandleObject) -> Option<CustomElementDefinition> {


Let's return Option<&CustomElementDefinition>.

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/codegen/CodegenRust.py

+        // Step 7
+        rooted!(in(cx) let global_object = CurrentGlobalOrNull(cx));
+        GetProtoObject(cx, global_object.handle(), prototype.handle_mut());
+        if prototype.is_null() {


We assert that our prototypes are not null instead.

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/codegen/CodegenRust.py

+    }
+
+    if !proto_val.is_object() {
+        // Step 7


Please add the comment from https://dxr.mozilla.org/mozilla-central/source/dom/bindings/Codegen.py#1832-1839.

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/interface.rs

@@ -158,6 +167,26 @@ pub unsafe fn create_global_object(
    JS_FireOnNewGlobalObject(cx, rval.handle());
 }

+// https://html.spec.whatwg.org/multipage/dom.html#htmlconstructor
+pub fn create_html_element(window: &Window, call_args: CallArgs) -> Fallible<Root<HTMLElement>> {


jdm · 2017-06-12T17:11:08Z

components/script/dom/customelementregistry.rs

@@ -228,27 +233,42 @@ impl CustomElementRegistryMethods for CustomElementRegistry {
    }
 }

+#[derive(HeapSizeOf, JSTraceable, PartialEq, Clone)]
+pub enum ConstructionEntry {
+    Element(Root<HTMLElement>),


This should be JS<HTMLElement>, and the type should be marked #[must_root].

jdm · 2017-06-12T17:11:08Z

components/script/dom/bindings/interface.rs

+        Some(entry) => {
+            let result = match *entry {
+                ConstructionEntry::AlreadyConstructed => return Err(Error::InvalidState),
+                ConstructionEntry::Element(ref mut element) => {


No need for mut.

jdm · 2017-06-12T17:12:01Z

failures:

    size_of::size_div

    size_of::size_element

    size_of::size_htmlelement

    size_of::size_span


        Generate GetConstructorObject for all interfaces

jdm

r=me once the function is moved.

jdm · 2017-06-15T19:23:44Z

components/script/dom/bindings/utils.rs

+
+/// Returns the constructor object for the element associated with the given local name.
+/// This list should only include elements marked with the [HTMLConstructor] extended attribute.
+pub fn get_constructor_object_from_local_name(name: LocalName,


Let's move this to dom/bindings/interfaces.rs.


        Add HTMLConstructor attributes where needed


        Add function to get constructor objects by name


        Implement HTMLConstructor


        Implement step 5 of HTMLConstructor


        Test steps 4 and 5 of the HTMLConstructor


        Remove applet from list extendable interfaces

cbrewster · 2017-06-16T03:41:12Z

@bors-servo r=jdm

bors-servo · 2017-06-16T03:41:13Z

📌 Commit e4ff934 has been approved by jdm

bors-servo · 2017-06-16T04:47:18Z

⌛ Testing commit e4ff934 with merge c58bcc2...


        Auto merge of #17224 - cbrewster:html_constructor, r=jdm

WebIDL HTMLConstructor support  spec: https://html.spec.whatwg.org/multipage/#htmlconstructor ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17194 (github issue number if applicable).  - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17224)

bors-servo · 2017-06-16T05:50:50Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing c58bcc2 to master...


        Test steps 4 and 5 of the HTMLConstructor

Upstreamed from servo/servo#17224 [ci skip]

highfive assigned pcwalton Jun 8, 2017

highfive added the S-awaiting-review label Jun 8, 2017

jdm assigned jdm and unassigned pcwalton Jun 8, 2017

cbrewster reviewed Jun 8, 2017

View changes

cbrewster force-pushed the cbrewster:html_constructor branch 2 times, most recently from 5ca7cca to ccd5acf Jun 9, 2017

nox added S-blocked-on-external S-needs-squash labels Jun 9, 2017

highfive added the S-needs-rebase label Jun 12, 2017

update rust-mozjs

147dfcc

cbrewster removed the S-blocked-on-external label Jun 12, 2017

jdm requested changes Jun 12, 2017

View changes

jdm added S-fails-tidy and removed S-awaiting-review labels Jun 12, 2017

jdm added the S-needs-code-changes label Jun 12, 2017

cbrewster force-pushed the cbrewster:html_constructor branch from ccd5acf to 76878fd Jun 12, 2017

highfive added S-awaiting-review and removed S-needs-code-changes labels Jun 12, 2017

cbrewster force-pushed the cbrewster:html_constructor branch 2 times, most recently from 17d6364 to 5cfbc5f Jun 13, 2017

cbrewster removed S-fails-tidy S-needs-rebase labels Jun 13, 2017

cbrewster force-pushed the cbrewster:html_constructor branch from 5eac359 to 114ea9b Jun 13, 2017

cbrewster changed the title ~~[WIP] WebIDL HTMLConstructor support~~ WebIDL HTMLConstructor support Jun 13, 2017

Generate GetConstructorObject for all interfaces

0713257

cbrewster force-pushed the cbrewster:html_constructor branch 3 times, most recently from e6c2025 to 6c0b6c3 Jun 13, 2017

jdm approved these changes Jun 15, 2017

View changes

jdm added S-needs-code-changes and removed S-awaiting-review S-needs-squash labels Jun 15, 2017

cbrewster added 6 commits Jun 8, 2017

Add HTMLConstructor attributes where needed

d951dee

Add function to get constructor objects by name

d883f55

Implement HTMLConstructor

2333b39

Implement step 5 of HTMLConstructor

1f3fd77

Test steps 4 and 5 of the HTMLConstructor

81e28a2

Remove applet from list extendable interfaces

Loading status checks…

e4ff934

cbrewster force-pushed the cbrewster:html_constructor branch from 6c0b6c3 to e4ff934 Jun 16, 2017

highfive added S-awaiting-review and removed S-needs-code-changes labels Jun 16, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Jun 16, 2017

bors-servo merged commit e4ff934 into servo:master Jun 16, 2017
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Jun 16, 2017

jdm added a commit to web-platform-tests/wpt that referenced this pull request Jun 19, 2017

Test steps 4 and 5 of the HTMLConstructor

8ee4de2

Upstreamed from servo/servo#17224 [ci skip]

jdm mentioned this pull request Jun 19, 2017

Test steps 4 and 5 of the HTMLConstructor web-platform-tests/wpt#6284

Merged

servo / servo

WebIDL HTMLConstructor support #17224

WebIDL HTMLConstructor support #17224

cbrewster commented Jun 8, 2017 •

edited by larsbergstrom

highfive commented Jun 8, 2017

highfive commented Jun 8, 2017

cbrewster commented Jun 8, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

nox commented Jun 9, 2017

nox commented Jun 9, 2017

bors-servo commented Jun 12, 2017

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jdm commented Jun 12, 2017

jdm left a comment

This comment has been minimized.

cbrewster commented Jun 16, 2017

bors-servo commented Jun 16, 2017

bors-servo commented Jun 16, 2017

bors-servo commented Jun 16, 2017

servo / servo

Join GitHub today

WebIDL HTMLConstructor support #17224

WebIDL HTMLConstructor support #17224

Conversation

cbrewster commented Jun 8, 2017 • edited by larsbergstrom

highfive commented Jun 8, 2017

highfive commented Jun 8, 2017

cbrewster commented Jun 8, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

nox commented Jun 9, 2017

nox commented Jun 9, 2017

bors-servo commented Jun 12, 2017

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jdm commented Jun 12, 2017

jdm left a comment

This comment has been minimized.

cbrewster commented Jun 16, 2017

bors-servo commented Jun 16, 2017

bors-servo commented Jun 16, 2017

bors-servo commented Jun 16, 2017

cbrewster commented Jun 8, 2017 •

edited by larsbergstrom