Skip to content

Update WR + gleam (nested clip stack, scroll locations).#14412

Merged
bors-servo merged 1 commit intoservo:masterfrom
glennw:update-wr-clip-2
Dec 15, 2016
Merged

Update WR + gleam (nested clip stack, scroll locations).#14412
bors-servo merged 1 commit intoservo:masterfrom
glennw:update-wr-clip-2

Conversation

@glennw
Copy link
Copy Markdown
Member

@glennw glennw commented Nov 29, 2016 •
edited by larsbergstrom
Loading

This change is Reviewable

@highfive
Copy link
Copy Markdown

highfive commented Nov 29, 2016

Heads up! This PR modifies the following files:

  • @emilio: components/layout/webrender_helpers.rs

@highfive
Copy link
Copy Markdown

highfive commented Nov 29, 2016

warning Warning warning

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

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Nov 29, 2016
@Manishearth
Copy link
Copy Markdown
Member

Manishearth commented Nov 29, 2016

@bors-servo r+

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Nov 29, 2016

📌 Commit 2809ef2 has been approved by Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Nov 30, 2016

⌛ Testing commit 2809ef2 with merge b61451f...

bors-servo pushed a commit that referenced this pull request Nov 30, 2016
Auto merge of #14412 - glennw:update-wr-clip-2, r=Manishearth
b61451f 
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Nov 30, 2016
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Nov 30, 2016

💔 Test failed - mac-rel-wpt2

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Nov 30, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Nov 30, 2016
@glennw
Copy link
Copy Markdown
Member Author

glennw commented Nov 30, 2016

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Nov 30, 2016

📌 Commit bd97855 has been approved by Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 1, 2016

⌛ Testing commit bd97855 with merge 8cfd8ea...

bors-servo pushed a commit that referenced this pull request Dec 1, 2016
Auto merge of #14412 - glennw:update-wr-clip-2, r=Manishearth
8cfd8ea 
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Dec 1, 2016
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 1, 2016

💔 Test failed - mac-rel-wpt2

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Dec 1, 2016
@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 1, 2016

@bors-servo retry

  • Test if the failure is a new intermittent on mac.

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 1, 2016

⌛ Testing commit bd97855 with merge 6d5f4a8...

bors-servo pushed a commit that referenced this pull request Dec 1, 2016
Auto merge of #14412 - glennw:update-wr-clip-2, r=Manishearth
6d5f4a8 
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Dec 1, 2016
@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 14, 2016

@bors-servo try

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 14, 2016

⌛ Trying commit 0f0264f with merge fc1d9ee...

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 14, 2016

💥 Test timed out

@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 14, 2016

@bors-servo try

  • Infra?

@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 14, 2016

@bors-servo retry

  • infra

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 14, 2016

⌛ Trying commit 0f0264f with merge 2682d31...

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 14, 2016

💔 Test failed - android

@kvark
Copy link
Copy Markdown
Member

kvark commented Dec 14, 2016

Hmm, interesting. So Android build fails to see the event marker functions (InsertEventMarkerEXT and others), but spots it complains about are inside the #[cfg(not(android))] gate:

#[inline]
#[cfg(not(android))]
pub fn insert_event_marker_ext(message: &str) {
    if ffi::InsertEventMarkerEXT::is_loaded() {
        unsafe {
            ffi::InsertEventMarkerEXT(message.len() as GLsizei, message.as_ptr() as *const _);
        }
    }
}

@kvark
Copy link
Copy Markdown
Member

kvark commented Dec 14, 2016

I'm on it - servo/gleam#100

@kvark kvark mentioned this pull request Dec 14, 2016
Merged
@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 14, 2016

@bors-servo try

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 14, 2016

⌛ Trying commit d1be883 with merge 970094e...

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 14, 2016

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

@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 15, 2016

Woohoo try passed! r? @pcwalton @larsbergstrom @metajack (or anyone) for the last 2 small commits?

@pcwalton
Copy link
Copy Markdown
Contributor

pcwalton commented Dec 15, 2016

@bors-servo: r+

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

📌 Commit d1be883 has been approved by pcwalton

@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 15, 2016

@bors-servo try- clean r=pcwalton

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

💡 This pull request was already approved, no need to approve it again.

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

📌 Commit d1be883 has been approved by pcwalton

@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 15, 2016

@bors-servo retry

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

🔒 Merge conflict

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

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

@glennw
Copy link
Copy Markdown
Member Author

glennw commented Dec 15, 2016

@bors-servo r=pcwalton

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

📌 Commit f517d03 has been approved by pcwalton

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

⌛ Testing commit f517d03 with merge bffac0f...

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Dec 15, 2016

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

@bors-servo bors-servo mentioned this pull request Dec 15, 2016
Merged
4 tasks
@kvark
Copy link
Copy Markdown
Member

kvark commented Dec 15, 2016

YES!

@frewsxcv frewsxcv mentioned this pull request Dec 15, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@pcwalton pcwalton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@glennw @highfive @Manishearth @bors-servo @kvark @pcwalton @KiChjang @gw3583