Correctly gets and sets rel content attributes in linkelement #13311

cynicaldevil · 2016-09-18T20:42:41Z

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #12799 .

This change is

highfive · 2016-09-18T20:42:45Z

Heads up! This PR modifies the following files:

@KiChjang: components/script/dom/htmllinkelement.rs

highfive · 2016-09-18T20:42:46Z

Warning

These commits modify script code, but no tests are modified. Please consider adding a test!

KiChjang

We still need a WPT test for this. I believe in the original issue, @jdm has a test case which you can use.
We also still need to change the RelList function and remove the rel_list field on the link element.

KiChjang · 2016-09-18T20:51:56Z

components/script/dom/htmllinkelement.rs

@@ -357,10 +357,21 @@ impl HTMLLinkElementMethods for HTMLLinkElement {
    make_setter!(SetHref, "href");

    // https://html.spec.whatwg.org/multipage/#dom-link-rel
-    make_getter!(Rel, "rel");
+    fn Rel(&self) -> DOMString {
+        let atomVec: Vec<Atom> = self.upcast::<Element>().get_tokenlist_attribute(&atom!("rel"));


No need for type annotation here and atomVec should really be atom_vec.

KiChjang · 2016-09-18T20:51:56Z

components/script/dom/htmllinkelement.rs

+        for data in &atomVec {
+            let dataStr = String::from(data as &str);
+            string_concat = string_concat + " " + &dataStr;
+        }


Instead of doing this in imperative style, I think you can do something fancy with iterators:

DOMString::from(atom_vec.iter().map(|a| &*a).join(" "))

cynicaldevil · 2016-09-18T20:53:52Z

@KiChjang +1 on the test part, but don't you think the RelList thing is different from this issue? IMO it would be better to open a separate PR for that.

KiChjang · 2016-09-18T20:56:06Z

It is not. The issue is to fix the crash that happens when you use that test case, and your current PR doesn't actually fix it yet.

cynicaldevil · 2016-09-18T20:59:24Z

@KiChjang alright.

Ms2ger · 2016-09-19T07:23:02Z

I'm afraid everything @KiChjang said here was wrong. The rel_list field should remain as it is. The Rel function is unfortunately incorrect; it should just call get_string_attribute, so any existing whitespace in the string is returned as-is.

r? @Ms2ger

@bors-servo try


        Auto merge of #13311 - cynicaldevil:linkelement, r=<try>

Correctly gets and sets rel content attributes in linkelement  ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #12799 .   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13311)

bors-servo · 2016-09-19T07:23:06Z

⌛ Trying commit c7f7e2e with merge 01be8c4...

bors-servo · 2016-09-19T08:13:20Z

💔 Test failed - linux-rel

KiChjang · 2016-09-19T09:07:28Z

@Ms2ger I'm not sure what the point is to keep a rel_list field when the rel content attribute already contains a token list. Also, the spec does say that the relList IDL attribute should reflect the rel content attribute.

Ms2ger · 2016-09-19T15:50:36Z

@KiChjang you're confusing different types of objects... Please read the code more carefully.

cynicaldevil · 2016-09-21T17:11:03Z

@KiChjang @Ms2ger I'm not sure how I should proceed, should I amend the PR with the minor changes that @KiChjang suggested and then modify the tests so that they pass?

KiChjang · 2016-09-21T17:13:38Z

No, @msger is correct here, you need to use make_getter! on the Rel function, and then update the tests accordingly.

cynicaldevil · 2016-09-22T20:54:47Z

@KiChjang I pushed the changes onto PR branch.

bors-servo · 2016-09-22T22:06:34Z

💔 Test failed - linux-rel

highfive · 2016-09-22T22:06:36Z

  ▶ OK [expected CRASH] /fetch/nosniff/stylesheet.html

  ▶ OK [expected CRASH] /html/semantics/document-metadata/the-link-element/link-style-error-01.html

cynicaldevil · 2016-09-22T22:36:59Z

@KiChjang Is this a good thing? Because the report is telling that it expected a crash but my PR fixed it...?

KiChjang · 2016-09-22T22:41:23Z

Indeed, this is pretty good! Great work here!

jdm · 2016-09-22T23:34:21Z

They used to crash because of the panic that this PR fixes.

KiChjang · 2016-09-22T23:40:12Z

Next step is to change the test expectations and mark those tests as passing.

cynicaldevil · 2016-09-23T11:44:52Z

If I understood this right, I have to change the respective .ini files to expect a PASS instead of a CRASH. But these files are missing in this branch, while they are present in other branches. What am I missing?

Ms2ger · 2016-09-23T11:49:11Z

The expected crashes were only added in #12493; you'll need to rebase.

Also, you should be able to remove those files; "pass" is the default expectation.

cynicaldevil · 2016-09-23T11:56:40Z

Thanks, I've updated the PR now.

Ms2ger · 2016-09-23T12:00:13Z

Could you just squash the two commits? Should be good to go then.

cynicaldevil · 2016-09-23T12:10:11Z

@Ms2ger Done.

Ms2ger · 2016-09-23T12:32:26Z

Thanks!

@bors-servo r+

bors-servo · 2016-09-23T12:32:27Z

📌 Commit 9d378ce has been approved by Ms2ger

bors-servo · 2016-09-23T12:48:36Z

⌛ Testing commit 9d378ce with merge f243d98...


        Auto merge of #13311 - cynicaldevil:linkelement, r=Ms2ger

Correctly gets and sets rel content attributes in linkelement  ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #12799 .   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13311)

bors-servo · 2016-09-23T13:50:49Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev


        use .set_tokenlist_attribute to set rel content attribute in SetRel

Removed .ini files expecting crashes

highfive assigned pcwalton Sep 18, 2016

highfive added the S-awaiting-review label Sep 18, 2016

KiChjang requested changes Sep 18, 2016

View changes

KiChjang reviewed Sep 18, 2016

View changes

KiChjang added S-needs-code-changes and removed S-awaiting-review labels Sep 18, 2016

KiChjang assigned KiChjang and unassigned pcwalton Sep 18, 2016

highfive assigned Ms2ger and unassigned KiChjang Sep 19, 2016

highfive added the S-tests-failed label Sep 19, 2016

jdm mentioned this pull request Sep 21, 2016

Tokens not found #13343

Closed

cynicaldevil force-pushed the cynicaldevil:linkelement branch from c7f7e2e to 622c826 Sep 22, 2016

highfive added S-awaiting-review and removed S-tests-failed S-needs-code-changes labels Sep 22, 2016

highfive added the S-tests-failed label Sep 22, 2016

KiChjang added S-needs-code-changes and removed S-awaiting-review labels Sep 22, 2016

cynicaldevil force-pushed the cynicaldevil:linkelement branch from 622c826 to 9f2b9b9 Sep 23, 2016

highfive added S-awaiting-review and removed S-tests-failed S-needs-code-changes labels Sep 23, 2016

cynicaldevil force-pushed the cynicaldevil:linkelement branch from 9f2b9b9 to 9d378ce Sep 23, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Sep 23, 2016

bors-servo merged commit 9d378ce into servo:master Sep 23, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

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

homu Test successful
Details

highfive removed the S-awaiting-merge label Sep 23, 2016

use .set_tokenlist_attribute to set rel content attribute in SetRel

Loading status checks…

9d378ce

Removed .ini files expecting crashes

cynicaldevil deleted the cynicaldevil:linkelement branch Sep 24, 2016

servo / servo

Correctly gets and sets rel content attributes in linkelement #13311

Correctly gets and sets rel content attributes in linkelement #13311

cynicaldevil commented Sep 18, 2016 •

edited by larsbergstrom

highfive commented Sep 18, 2016

highfive commented Sep 18, 2016

KiChjang left a comment

This comment has been minimized.

This comment has been minimized.

cynicaldevil commented Sep 18, 2016

KiChjang commented Sep 18, 2016

cynicaldevil commented Sep 18, 2016

Ms2ger commented Sep 19, 2016

bors-servo commented Sep 19, 2016

bors-servo commented Sep 19, 2016

KiChjang commented Sep 19, 2016

Ms2ger commented Sep 19, 2016

cynicaldevil commented Sep 21, 2016 •

edited

KiChjang commented Sep 21, 2016

cynicaldevil commented Sep 22, 2016 •

edited

bors-servo commented Sep 22, 2016

highfive commented Sep 22, 2016

cynicaldevil commented Sep 22, 2016

KiChjang commented Sep 22, 2016

jdm commented Sep 22, 2016

KiChjang commented Sep 22, 2016

cynicaldevil commented Sep 23, 2016

Ms2ger commented Sep 23, 2016

cynicaldevil commented Sep 23, 2016

Ms2ger commented Sep 23, 2016

cynicaldevil commented Sep 23, 2016

Ms2ger commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

servo / servo

Join GitHub today

Correctly gets and sets rel content attributes in linkelement #13311

Correctly gets and sets rel content attributes in linkelement #13311

Conversation

cynicaldevil commented Sep 18, 2016 • edited by larsbergstrom

highfive commented Sep 18, 2016

highfive commented Sep 18, 2016

KiChjang left a comment

This comment has been minimized.

KiChjang Sep 18, 2016

This comment has been minimized.

KiChjang Sep 18, 2016

cynicaldevil commented Sep 18, 2016

KiChjang commented Sep 18, 2016

cynicaldevil commented Sep 18, 2016

Ms2ger commented Sep 19, 2016

bors-servo commented Sep 19, 2016

bors-servo commented Sep 19, 2016

KiChjang commented Sep 19, 2016

Ms2ger commented Sep 19, 2016

cynicaldevil commented Sep 21, 2016 • edited

KiChjang commented Sep 21, 2016

cynicaldevil commented Sep 22, 2016 • edited

bors-servo commented Sep 22, 2016

highfive commented Sep 22, 2016

cynicaldevil commented Sep 22, 2016

KiChjang commented Sep 22, 2016

jdm commented Sep 22, 2016

KiChjang commented Sep 22, 2016

cynicaldevil commented Sep 23, 2016

Ms2ger commented Sep 23, 2016

cynicaldevil commented Sep 23, 2016

Ms2ger commented Sep 23, 2016

cynicaldevil commented Sep 23, 2016

Ms2ger commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

bors-servo commented Sep 23, 2016

cynicaldevil commented Sep 18, 2016 •

edited by larsbergstrom

cynicaldevil commented Sep 21, 2016 •

edited

cynicaldevil commented Sep 22, 2016 •

edited