Rollup of changes #515

pcwalton · 2013-06-12T02:22:44Z

Changes authored by me have not yet been reviewed; the other changes have.

metajack · 2013-06-12T02:36:40Z

This will need to update rust-css in order to pass make check. Please also pull the new rust-netsurfcss while you're at it.

With that and an answer to the above question, this will be r+.


        Add link following and refactor the profiler.


        Implement scrolling and better zooming


        Update rust-layers for GL_LINEAR zooming


        Provide an interface to the engine for the script task


        handle relative url's when clicking


        Refactor flow tree construction and actually use display property.


        Implement horizontal scrolling and pinch-to-zoom


        Send status messages to the compositor


        Spin the event loop every 50 ms to allow Rust channels to be processed.

This is the nail in the coffin for GLUT; we need to fix this.


        Resolve relative URLs that begin with '//'


        Added a command-line argument for rendering tiles at higher resolutions


        Fix URL relativization so that links on Wikipedia work


        Add a cheesy progress indicator


        Add a spinner for layout


        Update submodules


        Fix merge fallout


        Make script and style display:none


        Fix merge fallout which was disabling all CSS classes.


        test: Add a box model smoketest


        Compute percent widths/margins properly and fix numerous small visual…

… layout bugs.


        Fix padding


        Vertical margins now contribute to content height.


        Stop sorting after every profiler datum comes in.

jdm · 2013-06-13T18:49:40Z

This can probably go away now?

jdm · 2013-06-13T18:52:55Z

Merge conflict.

jdm · 2013-06-13T18:53:50Z

This commit doesn't match the commit message at all.


        Fix submodules and test_slam_layout

metajack · 2013-06-14T00:21:31Z

r+

bors-servo · 2013-06-14T00:24:22Z

saw approval from metajack
at pcwalton@2ec3412

bors-servo · 2013-06-14T00:24:25Z

merging pcwalton/servo/master = 2ec3412 into auto

bors-servo · 2013-06-14T00:24:26Z

pcwalton/servo/master = 2ec3412 merged ok, testing candidate = b2496c7

bors-servo · 2013-06-14T00:36:22Z

some tests failed:
http://buildbot-master-servo-01.srv.servo.releng.use1.mozilla.com:8001/builders/linux/builds/60


        auto merge of #515 : pcwalton/servo/master, r=metajack

@metajack

Changes authored by me have not yet been reviewed; the other changes have. r? @metajack


        Update rust-glut

metajack · 2013-06-14T00:44:03Z

r+

bors-servo · 2013-06-14T00:45:22Z

saw approval from metajack
at pcwalton@c35abb2

bors-servo · 2013-06-14T00:45:25Z

merging pcwalton/servo/master = c35abb2 into auto

bors-servo · 2013-06-14T00:45:26Z

pcwalton/servo/master = c35abb2 merged ok, testing candidate = 96731e9

bors-servo · 2013-06-14T01:06:22Z

all tests pass:
http://buildbot-master-servo-01.srv.servo.releng.use1.mozilla.com:8001/builders/linux/builds/61
http://buildbot-master-servo-01.srv.servo.releng.use1.mozilla.com:8001/builders/mac/builds/15

bors-servo · 2013-06-14T01:09:26Z

fast-forwarding master to auto = 96731e9


        auto merge of #515 : pcwalton/servo/master, r=metajack

@metajack

Changes authored by me have not yet been reviewed; the other changes have. r? @metajack


        Merge pull request servo#515 from w3c/opera/dnd

Move Opera's DND tests into place.


        Auto merge of #26382 - servo:dependabot/cargo/cbindgen-0.14.2, r=jdm

Bump cbindgen from 0.14.1 to 0.14.2 Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.14.1 to 0.14.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p> <blockquote> <h2>0.14.2</h2> <pre><code> * Fixed minimal dependency versions. ([#507](eqrion/cbindgen#507)) * Add an option to write pragma once. ([#511](eqrion/cbindgen#511)) * Fix submodule scanning for implicit Rust 2018 modules. ([#512](eqrion/cbindgen#512)) * Fix dependency parsing / scanning to handle target-specific versions. ([#513](eqrion/cbindgen#513)) * Use heck for case conversion. ([#514](eqrion/cbindgen#514)) * Add support for verbatim content after includes. ([#416](eqrion/cbindgen#416)) * Allow to add attributes to most generated functions. ([#515](eqrion/cbindgen#515)) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eqrion/cbindgen/commit/b6b88f8c3024288287368b377e4d928ddcd2b9e2"><code>b6b88f8</code></a> Release v0.14.2</li> <li><a href="https://github.com/eqrion/cbindgen/commit/a05a223704e206679068cf84da09a7b49ea202a4"><code>a05a223</code></a> tests: Add tests for attribute annotations.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/5ee5b3ee8884b256decf6e4d91563799a986d758"><code>5ee5b3e</code></a> ir: Allow per-method annotations for all the auto-generated struct and enum m...</li> <li><a href="https://github.com/eqrion/cbindgen/commit/be8e6ec876972b28519803e041ae12b4c63948fc"><code>be8e6ec</code></a> enum: Allow to store annotations for empty variants.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/1a824c04f21f22d1488609cedf8d0c7b13bb83eb"><code>1a824c0</code></a> Add support for verbatim content after includes</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d0d67165561c6249d39148bc1b63d62d713fdd1a"><code>d0d6716</code></a> ir: Minor cleanup to the cfg code.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/8139fbf3c7db6e0635161ecc5631d865ac4e3d4e"><code>8139fbf</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/418">#418</a>: Use heck for case conversion</li> <li><a href="https://github.com/eqrion/cbindgen/commit/4beb526516fa6e1de38cebc3f02b1d095f8947d1"><code>4beb526</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/254">#254</a> (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/512">#512</a>)</li> <li><a href="https://github.com/eqrion/cbindgen/commit/ca1c0b27b66edc372d7c190e8d22e41125a985a4"><code>ca1c0b2</code></a> Run cargo-fmt</li> <li><a href="https://github.com/eqrion/cbindgen/commit/1df5129d1a227d5f1dbf66b6d8fe66eba44ae880"><code>1df5129</code></a> Fix 2015 edition module path resolution</li> <li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.14.1...v0.14.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>


        Auto merge of #26382 - servo:dependabot/cargo/cbindgen-0.14.2, r=jdm

Bump cbindgen from 0.14.1 to 0.14.2 Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.14.1 to 0.14.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p> <blockquote> <h2>0.14.2</h2> <pre><code> * Fixed minimal dependency versions. ([#507](eqrion/cbindgen#507)) * Add an option to write pragma once. ([#511](eqrion/cbindgen#511)) * Fix submodule scanning for implicit Rust 2018 modules. ([#512](eqrion/cbindgen#512)) * Fix dependency parsing / scanning to handle target-specific versions. ([#513](eqrion/cbindgen#513)) * Use heck for case conversion. ([#514](eqrion/cbindgen#514)) * Add support for verbatim content after includes. ([#416](eqrion/cbindgen#416)) * Allow to add attributes to most generated functions. ([#515](eqrion/cbindgen#515)) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eqrion/cbindgen/commit/b6b88f8c3024288287368b377e4d928ddcd2b9e2"><code>b6b88f8</code></a> Release v0.14.2</li> <li><a href="https://github.com/eqrion/cbindgen/commit/a05a223704e206679068cf84da09a7b49ea202a4"><code>a05a223</code></a> tests: Add tests for attribute annotations.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/5ee5b3ee8884b256decf6e4d91563799a986d758"><code>5ee5b3e</code></a> ir: Allow per-method annotations for all the auto-generated struct and enum m...</li> <li><a href="https://github.com/eqrion/cbindgen/commit/be8e6ec876972b28519803e041ae12b4c63948fc"><code>be8e6ec</code></a> enum: Allow to store annotations for empty variants.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/1a824c04f21f22d1488609cedf8d0c7b13bb83eb"><code>1a824c0</code></a> Add support for verbatim content after includes</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d0d67165561c6249d39148bc1b63d62d713fdd1a"><code>d0d6716</code></a> ir: Minor cleanup to the cfg code.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/8139fbf3c7db6e0635161ecc5631d865ac4e3d4e"><code>8139fbf</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/418">#418</a>: Use heck for case conversion</li> <li><a href="https://github.com/eqrion/cbindgen/commit/4beb526516fa6e1de38cebc3f02b1d095f8947d1"><code>4beb526</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/254">#254</a> (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/512">#512</a>)</li> <li><a href="https://github.com/eqrion/cbindgen/commit/ca1c0b27b66edc372d7c190e8d22e41125a985a4"><code>ca1c0b2</code></a> Run cargo-fmt</li> <li><a href="https://github.com/eqrion/cbindgen/commit/1df5129d1a227d5f1dbf66b6d8fe66eba44ae880"><code>1df5129</code></a> Fix 2015 edition module path resolution</li> <li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.14.1...v0.14.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>

Tim Kuehn and others added 23 commits Jun 6, 2013

Add link following and refactor the profiler.

a53a7f6

Implement scrolling and better zooming

9085b88

Update rust-layers for GL_LINEAR zooming

abe6a06

Provide an interface to the engine for the script task

bf4df24

handle relative url's when clicking

ff1178f

Refactor flow tree construction and actually use display property.

0bbf2fc

Implement horizontal scrolling and pinch-to-zoom

1fbfd7d

Send status messages to the compositor

7b28462

Spin the event loop every 50 ms to allow Rust channels to be processed.

a9ed2d8

This is the nail in the coffin for GLUT; we need to fix this.

Resolve relative URLs that begin with '//'

e50cee9

Added a command-line argument for rendering tiles at higher resolutions

f3ad95f

Fix URL relativization so that links on Wikipedia work

1aa8d64

Add a cheesy progress indicator

96b9be6

Add a spinner for layout

204c5b6

Update submodules

aad5113

Fix merge fallout

162ba83

Make script and style display:none

aee2611

Fix merge fallout which was disabling all CSS classes.

e1b9e01

test: Add a box model smoketest

327e799

Compute percent widths/margins properly and fix numerous small visual…

b75b2de

… layout bugs.

Fix padding

4017839

Vertical margins now contribute to content height.

badf1b8

Stop sorting after every profiler datum comes in.

f3cdbaf

Fix submodules and test_slam_layout

Loading status checks…

2ec3412

bors-servo pushed a commit that referenced this pull request Jun 14, 2013

auto merge of #515 : pcwalton/servo/master, r=metajack

b2496c7

Changes authored by me have not yet been reviewed; the other changes have. r? @metajack

Update rust-glut

Loading status checks…

c35abb2

bors-servo pushed a commit that referenced this pull request Jun 14, 2013

auto merge of #515 : pcwalton/servo/master, r=metajack

96731e9

Changes authored by me have not yet been reviewed; the other changes have. r? @metajack

bors-servo merged commit c35abb2 into servo:master Jun 14, 2013
1 check passed

1 check passed

default all tests passed

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

Merge pull request servo#515 from w3c/opera/dnd

c6eca07

Move Opera's DND tests into place.

servo / servo

Rollup of changes #515

Rollup of changes #515

pcwalton commented Jun 12, 2013

metajack commented Jun 12, 2013

This comment has been minimized.

jdm commented on `src/components/main/layout/model.rs` in `b75b2de` Jun 13, 2013

This comment has been minimized.

jdm commented on `src/test/html/test_slam_layout.js` in `a53a7f6` Jun 13, 2013

This comment has been minimized.

jdm commented on `0bbf2fc` Jun 13, 2013

This comment has been minimized.

metajack commented on `2ec3412` Jun 14, 2013

This comment has been minimized.

bors-servo commented on `2ec3412` Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

metajack commented on `c35abb2` Jun 14, 2013

This comment has been minimized.

bors-servo commented on `c35abb2` Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

servo / servo

Join GitHub today

Rollup of changes #515

Rollup of changes #515

Conversation

pcwalton commented Jun 12, 2013

metajack commented Jun 12, 2013

This comment has been minimized.

jdm commented on src/components/main/layout/model.rs in b75b2de Jun 13, 2013

This comment has been minimized.

jdm commented on src/test/html/test_slam_layout.js in a53a7f6 Jun 13, 2013

This comment has been minimized.

jdm commented on 0bbf2fc Jun 13, 2013

This comment has been minimized.

metajack commented on 2ec3412 Jun 14, 2013

This comment has been minimized.

bors-servo commented on 2ec3412 Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

metajack commented on c35abb2 Jun 14, 2013

This comment has been minimized.

bors-servo commented on c35abb2 Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

This comment has been minimized.

bors-servo replied Jun 14, 2013

jdm commented on `src/components/main/layout/model.rs` in `b75b2de` Jun 13, 2013

jdm commented on `src/test/html/test_slam_layout.js` in `a53a7f6` Jun 13, 2013

jdm commented on `0bbf2fc` Jun 13, 2013

metajack commented on `2ec3412` Jun 14, 2013

bors-servo commented on `2ec3412` Jun 14, 2013

metajack commented on `c35abb2` Jun 14, 2013

bors-servo commented on `c35abb2` Jun 14, 2013