Build the new (yet unused) style system as part of libscript, to avoid bitrot. #831

SimonSapin · 2013-08-30T23:03:50Z

I started this in a separate repository, and imported it with git-subtree into servo/src/components/script/style after some Rust minor upgrades.

I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.


        Initial pass at a stylesheet and selector parser

@namespace


        Parse @namespace rules.


        Mostly complete, untested selector parser.


        Stop the madness and use cssparser as an external lib / crate.

See servo/rust-cssparser@bb35329 and rust-lang/rust#7899


        Add selector specificity.


        Makefile: rebuild when rust-cssparser changes.


        Parse :nth-child() using an+b parsing from rust-cssparser.


        Add a license (MPL2) and readme.


        Factor out parsing of various types of rules.


        Add @media and media type parsing (no Media Queries yet.)


        Add a recursive style rule iterator for stylesheets.


        Use a borrowed "device" for Media Queries matching.


        Update to rustc 0.8-pre (ecfc9a8 2013-08-12 04:29:11 -0700)


        Parse all longhand properties that Servo seems to support.


        Logic fixes in CSS longhand properties parsing.


        Add parsing of supported shorthand properties.


        Remove the peekable() overhead in font-family parsing.

@charset


        Only allow one @charset rule.


        Upgrade to rustc 0.8-pre (0a677bc 2013-08-14 10:35:12 -0700)


        Add PropertyDeclaration, refactor property parsing to use a Mako temp…

…late.


        Add "inherited" markers on longhand properties.


        Simplify properties template a bit.


        Add computed values.


        Revert early resolving of currentColor.


        Add initial values.

metajack · 2013-08-30T23:10:28Z

I reviewed the rust upgrade and servo changes at the end. I'll come back and look over this code later in more detail.


        auto merge of #831 : SimonSapin/servo/newnewcss, r=metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.


        auto merge of #831 : SimonSapin/servo/newnewcss, r=jdm,metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.

jdm · 2013-08-31T15:52:24Z

Looks like you need to upgrade the OS X submodules too.

SimonSapin · 2013-08-31T21:05:50Z

@jdm I don’t have a OS X system at hand. Can I still build these modules in order to upgrade them?

SimonSapin · 2013-08-31T21:07:20Z

More generally, how can we deal with rust upgrades as we start to have more platform-specific code? (OS X, Linux, Android, …)

jdm · 2013-08-31T22:04:54Z

You could remove the os cfg directives temporarily, fix the build errors, wait for the inevitable link errors and then reapply the cfgs.


        Upgrade to rustc 0.8-pre (0ac3e02 2013-08-30 05:45:45 -0700)


        Add 'src/components/script/style/' from commit 'dd8b17886099b3a9ac59f…

…6a4e9eb948bb485b520' git-subtree-dir: src/components/script/style git-subtree-mainline: 0c726b4 git-subtree-split: dd8b178


        Build the new (yet unused) style system as part of libscript, to avoi…

…d bitrot.

SimonSapin · 2013-09-02T16:43:14Z

Updated PR: rebase onto servo master, and updated the OS X specific submodules to fix the Rust upgrade. This depends on those PRs being merged:
servo/core-foundation-rs#18
servo/core-graphics-rs#9
servo/core-text-rs#11
servo/io-surface-rs#7

metajack · 2013-09-03T20:19:30Z

r+

bors-servo · 2013-09-03T20:56:14Z

saw approval from metajack
at SimonSapin@91593b5

bors-servo · 2013-09-03T20:56:17Z

merging SimonSapin/servo/newnewcss = 91593b5 into auto

bors-servo · 2013-09-03T20:56:19Z

SimonSapin/servo/newnewcss = 91593b5 merged ok, testing candidate = b64bcf6

bors-servo · 2013-09-03T21:08:13Z

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/266


        auto merge of #831 : SimonSapin/servo/newnewcss, r=metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.


        Trigger a rust rebuild

I previously changed this to the same date as another commit, so the changed "disappeared" when I rebased.

metajack · 2013-09-03T21:19:51Z

r+

metajack · 2013-09-03T22:05:19Z

@bors: retry

metajack · 2013-09-04T15:25:37Z

@bors: retry

bors-servo · 2013-09-03T21:41:06Z

saw approval from metajack
at SimonSapin@496072c

bors-servo · 2013-09-03T21:41:09Z

merging SimonSapin/servo/newnewcss = 496072c into auto

bors-servo · 2013-09-03T21:41:11Z

SimonSapin/servo/newnewcss = 496072c merged ok, testing candidate = c15a291

bors-servo · 2013-09-03T21:49:39Z

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/313

bors-servo · 2013-09-03T22:12:02Z

saw approval from metajack
at SimonSapin@496072c

bors-servo · 2013-09-03T22:22:48Z

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/314

bors-servo · 2013-09-04T15:51:52Z

saw approval from metajack
at SimonSapin@496072c

bors-servo · 2013-09-04T15:51:55Z

merging SimonSapin/servo/newnewcss = 496072c into auto

bors-servo · 2013-09-04T15:51:56Z

SimonSapin/servo/newnewcss = 496072c merged ok, testing candidate = 9fb1f5d

bors-servo · 2013-09-04T16:36:51Z

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/278


        auto merge of #831 : SimonSapin/servo/newnewcss, r=metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.


        auto merge of #831 : SimonSapin/servo/newnewcss, r=metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.

SimonSapin · 2013-09-04T15:24:12Z

I tried a fresh clone/build of this branch, and it built fine. I could not reproduce the issue bors is having :(


        auto merge of #831 : SimonSapin/servo/newnewcss, r=metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.


        Add missing license header in src/components/script/style/mod.rs

metajack · 2013-09-04T17:00:18Z

r+

bors-servo · 2013-09-04T17:00:49Z

saw approval from metajack
at SimonSapin@1912b82

bors-servo · 2013-09-04T17:00:51Z

merging SimonSapin/servo/newnewcss = 1912b82 into auto

bors-servo · 2013-09-04T17:00:53Z

SimonSapin/servo/newnewcss = 1912b82 merged ok, testing candidate = df2906f

bors-servo · 2013-09-04T17:27:52Z

all tests pass:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/324
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/279

bors-servo · 2013-09-04T17:30:54Z

fast-forwarding master to auto = df2906f


        auto merge of #831 : SimonSapin/servo/newnewcss, r=metajack

I started this in a [separate repository](https://github.com/SimonSapin/servo-style), and imported it with [git-subtree](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) into `servo/src/components/script/style` after some Rust minor upgrades. I move this into the script crate because it’s gonna both need stuff there (the content tree, for selector matching) and be needed by stuff there (the HTML parser calls the CSS parser). As far as I know, we can not have circular dependencies between crates.


        Merge pull request servo#831 from yunxiaoxie/yunxiaoxie/not-finished1

Move and improve keypath tests for IndexedDB

SimonSapin added 25 commits Aug 8, 2013

Initial pass at a stylesheet and selector parser

10827f1

Parse @namespace rules.

9512d13

Mostly complete, untested selector parser.

3f6a557

Stop the madness and use cssparser as an external lib / crate.

af2f90f

See servo/rust-cssparser@bb35329 and rust-lang/rust#7899

Add selector specificity.

cc30205

Makefile: rebuild when rust-cssparser changes.

1195759

Parse :nth-child() using an+b parsing from rust-cssparser.

bde1fcc

Add a license (MPL2) and readme.

ff1f4e6

Factor out parsing of various types of rules.

9b22acf

Add @media and media type parsing (no Media Queries yet.)

5758c31

Add a recursive style rule iterator for stylesheets.

e1bde72

Use a borrowed "device" for Media Queries matching.

70c281f

Update to rustc 0.8-pre (ecfc9a8 2013-08-12 04:29:11 -0700)

c1b7e15

Parse all longhand properties that Servo seems to support.

9ea09f9

Logic fixes in CSS longhand properties parsing.

3343de5

Add parsing of supported shorthand properties.

4496835

Remove the peekable() overhead in font-family parsing.

be51f4f

Only allow one @charset rule.

b5860f4

Upgrade to rustc 0.8-pre (0a677bc 2013-08-14 10:35:12 -0700)

8fec261

Add PropertyDeclaration, refactor property parsing to use a Mako temp…

622bc57

…late.

Add "inherited" markers on longhand properties.

a931c8d

Simplify properties template a bit.

254c522

Add computed values.

e2ec549

Revert early resolving of currentColor.

bdca6d9

Add initial values.

dd8b178

SimonSapin mentioned this pull request Sep 2, 2013

Test file SimonSapin/servo-style#1

Closed

SimonSapin added 3 commits Aug 30, 2013

Upgrade to rustc 0.8-pre (0ac3e02 2013-08-30 05:45:45 -0700)

0c726b4

Add 'src/components/script/style/' from commit 'dd8b17886099b3a9ac59f…

71ca10a

…6a4e9eb948bb485b520' git-subtree-dir: src/components/script/style git-subtree-mainline: 0c726b4 git-subtree-split: dd8b178

Build the new (yet unused) style system as part of libscript, to avoi…

Loading status checks…

91593b5

…d bitrot.

Trigger a rust rebuild

Loading status checks…

496072c

I previously changed this to the same date as another commit, so the changed "disappeared" when I rebased.

Add missing license header in src/components/script/style/mod.rs

Loading status checks…

1912b82

bors-servo closed this Sep 4, 2013

ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014

Merge pull request servo#831 from yunxiaoxie/yunxiaoxie/not-finished1

9ce5fbd

Move and improve keypath tests for IndexedDB

servo / servo

Join GitHub today

Build the new (yet unused) style system as part of libscript, to avoid bitrot. #831

Build the new (yet unused) style system as part of libscript, to avoid bitrot. #831

Conversation

SimonSapin commented Aug 30, 2013

metajack commented Aug 30, 2013

jdm commented Aug 31, 2013

SimonSapin commented Aug 31, 2013

SimonSapin commented Aug 31, 2013

jdm commented Aug 31, 2013

SimonSapin commented Sep 2, 2013

This comment has been minimized.

metajack commented on 91593b5 Sep 3, 2013

This comment has been minimized.

bors-servo commented on 91593b5 Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

metajack commented on 496072c Sep 3, 2013

This comment has been minimized.

metajack replied Sep 3, 2013

This comment has been minimized.

metajack replied Sep 4, 2013

This comment has been minimized.

bors-servo commented on 496072c Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 3, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

SimonSapin commented Sep 4, 2013

This comment has been minimized.

metajack commented on 1912b82 Sep 4, 2013

This comment has been minimized.

bors-servo commented on 1912b82 Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

This comment has been minimized.

bors-servo replied Sep 4, 2013

metajack commented on `91593b5` Sep 3, 2013

bors-servo commented on `91593b5` Sep 3, 2013

metajack commented on `496072c` Sep 3, 2013

bors-servo commented on `496072c` Sep 3, 2013

metajack commented on `1912b82` Sep 4, 2013

bors-servo commented on `1912b82` Sep 4, 2013