commit_hash stringlengths 40 40 | author stringlengths 1 57 | date timestamp[s]date 2010-07-26 04:45:09 2026-04-14 18:21:10 | message stringlengths 8 1.39M | diff stringlengths 68 51.2k | files_changed int64 1 136 | insertions int64 0 2.35k | deletions int64 0 1.9k |
|---|---|---|---|---|---|---|---|
d0204963c0a56e5651720b32847bba0749d3e516 | Bobby Holley | 2016-10-11T17:03:29 | servo: Merge #13688 - stylo: Use AtomicRefCell for PerDocumentStyleData (from bholley:styleset_refcell); r=Manishearth
Gecko bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1309090
Source-Repo: https://github.com/servo/servo
Source-Revision: 3916d1d61305bd27338cac4a9e9f9c110182582b | diff --git a/style/gecko/data.rs b/style/gecko/data.rs
index 53aa82d35..e9d6dbf86 100644
--- a/style/gecko/data.rs
+++ b/style/gecko/data.rs
@@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use animation::Animation;
+use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
use co... | 2 | 25 | 12 |
a5930410ff9e55df03c6ec7cd108e581c63c32b8 | Ms2ger | 2016-10-11T16:10:39 | servo: Merge #13677 - Use the fetch stack for HTMLMediaElement (from servo:media-fetch); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 51bcf516c831f60a6fc05d970df5fad99730558e | diff --git a/script/dom/htmlmediaelement.rs b/script/dom/htmlmediaelement.rs
index 31140185c..826d879ab 100644
--- a/script/dom/htmlmediaelement.rs
+++ b/script/dom/htmlmediaelement.rs
@@ -15,18 +15,22 @@ use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorMethods;
use dom::bindings::inheritance::Castab... | 1 | 45 | 13 |
e2f1eb43a4ec84d020da2ca21ee4554e7d4b7476 | Corey Farwell | 2016-10-11T09:04:20 | servo: Merge #13680 - Migrate user agent string to `Cow<'static, str>` (from frewsxcv:user-agent-cow); r=nox
In most scenarios, where the user of Servo will not override the default
user agent, the user agent can be a `&'static str`. But since we allow
for customization, we currently use a `String` to represent the us... | diff --git a/net/fetch/methods.rs b/net/fetch/methods.rs
index 525364725..e1e66b37f 100644
--- a/net/fetch/methods.rs
+++ b/net/fetch/methods.rs
@@ -29,6 +29,7 @@ use net_traits::request::{Type, Origin, Window};
use net_traits::response::{HttpsState, TerminationReason};
use net_traits::response::{Response, ResponseBo... | 5 | 23 | 20 |
d04059a9f5db9c9f13845f1c7f3ddb66476e3edf | Patrick Walton | 2016-10-11T06:11:24 | servo: Merge #13685 - layout: Don't use the existing block position as the float ceiling when placing block formatting contexts in the sequential fallback (from pcwalton:block-formatting-context-fallback-placement); r=notriddle
The existing block position isn't yet computed at that time, so it
contains junk data. It j... | diff --git a/layout/block.rs b/layout/block.rs
index e28e85d13..75dcc9afd 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1494,11 +1494,9 @@ impl BlockFlow {
debug_assert!(!self.is_flex());
// Compute the available space for us, based on the actual floats.
- let rect = self.base.floats... | 1 | 3 | 5 |
f46f33f90780bd2447cba3f161ed1e15f17431bb | Bobby Holley | 2016-10-11T04:22:05 | servo: Merge #13656 - Refactor style logic to avoid direct access to the node data during the cascade (from bholley:existing_style); r=emilio
The new restyle architecture doesn't store these things in consistent places, so we need a more abstract API.
Source-Repo: https://github.com/servo/servo
Source-Revision: abcc4... | diff --git a/layout/query.rs b/layout/query.rs
index c92af1558..822377ef8 100644
--- a/layout/query.rs
+++ b/layout/query.rs
@@ -627,7 +627,7 @@ pub fn process_node_scroll_area_request< N: LayoutNode>(requested_node: N, layou
fn ensure_node_data_initialized<N: LayoutNode>(node: &N) {
let mut cur = Some(node.clone... | 8 | 189 | 154 |
8afc1b67ca633e4ce6969764d63094bf46b465f1 | Corey Farwell | 2016-10-10T23:53:21 | servo: Merge #13679 - Cleanup logic, remove unnecessary allocations in Request API (from frewsxcv:remove-str-alloc); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: a618b245ce4b9b7850e1afc28a19cf2ed98bc69c | diff --git a/script/dom/request.rs b/script/dom/request.rs
index efeafd5e2..4cad8753e 100644
--- a/script/dom/request.rs
+++ b/script/dom/request.rs
@@ -35,6 +35,7 @@ use net_traits::request::Referrer as NetTraitsRequestReferrer;
use net_traits::request::Request as NetTraitsRequest;
use net_traits::request::RequestMo... | 1 | 12 | 26 |
afc1e20d76d702e903743a259e0152e83f92f7dc | Corey Farwell | 2016-10-10T21:29:25 | servo: Merge #13678 - Remove unused trait method (from frewsxcv:unused-trait-method); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: f43a14ea687166da92bf23bdd61b546a74288d04 | diff --git a/net_traits/request.rs b/net_traits/request.rs
index 4380baf3a..10b202cd4 100644
--- a/net_traits/request.rs
+++ b/net_traits/request.rs
@@ -276,10 +276,6 @@ impl Request {
self.url_list.borrow().last().unwrap().clone()
}
- pub fn current_url_string(&self) -> String {
- self.url_li... | 1 | 0 | 4 |
acd28bc1cb927bc208fcbe363cbf3ad51e7b6cd7 | Alan Jeffrey | 2016-10-10T19:58:14 | servo: Merge #13627 - Pipeline always stores frame (from asajeffrey:pipeline-always-stores-frame-id); r=ConnorGBrewster
<!-- Please describe your changes on the following line: -->
This change makes the pipeline always store the frame id, not just optionally. This is the first part of a long slog to use FrameIds rath... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index 2c0b5c227..35d57bbf0 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -551,6 +551,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
/// Helper function for creating a pipeline
fn n... | 2 | 49 | 38 |
480d6791c1ca81adb96e00825a3fd2592a4567af | Simon Sapin | 2016-10-10T16:39:06 | servo: Merge #13676 - Remove usage of deprecated `SipHasher` (from servo:no-siphasher); r=pcwalton
<!-- Please describe your changes on the following line: -->
<s>Hashing in `SimpleHashCache` is not randomized anymore. Does this matter?</s>
r? @pcwalton
---
<!-- Thank you for contributing to Servo! Please replace e... | diff --git a/style/cache.rs b/style/cache.rs
index 9fb3f5b27..b4bac9899 100644
--- a/style/cache.rs
+++ b/style/cache.rs
@@ -4,9 +4,8 @@
//! Two simple cache data structures.
-use rand;
-use rand::Rng;
-use std::hash::{Hash, Hasher, SipHasher};
+use std::collections::hash_map::RandomState;
+use std::hash::{Hash, H... | 1 | 5 | 9 |
0c183a527f3ad6a9429e51728ed5d20ac5408d56 | Manish Goregaokar | 2016-10-10T14:37:29 | servo: Merge #13674 - Implement column-count in stylo (from Manishearth:column_count); r=emilio
Unblocks column-fill easy property
r? @emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: aef6054dc64043860e90ca962b60c51c683789f2 | diff --git a/style/properties/gecko.mako.rs b/style/properties/gecko.mako.rs
index 3c61bba45..add67265f 100644
--- a/style/properties/gecko.mako.rs
+++ b/style/properties/gecko.mako.rs
@@ -468,8 +468,6 @@ impl Debug for ${style_struct.gecko_struct_name} {
# transition
"transition... | 1 | 12 | 3 |
5ca4a970a299fa68c8317fda4e4622d2287939a2 | Manish Goregaokar | 2016-10-10T13:11:32 | servo: Merge #13673 - Don't pref-gate properties in geckolib mode (from Manishearth:no-prefs-geckolib); r=emilio
This led to me wasting a lot of time trying to figure out why my column-count implementation in gecko didn't work.
We might eventually want to hook into the Gecko prefs, but the mechanism would probably be... | diff --git a/style/properties/longhand/box.mako.rs b/style/properties/longhand/box.mako.rs
index becbe5ee3..896b5fa09 100644
--- a/style/properties/longhand/box.mako.rs
+++ b/style/properties/longhand/box.mako.rs
@@ -60,7 +60,7 @@
match_ignore_ascii_case! { try!(input.expect_ident()),
% for value ... | 3 | 5 | 4 |
e578a9efc2b6bfe3fe219c5c17effb6e7c8777b7 | Emilio Cobos Álvarez | 2016-10-10T09:06:23 | servo: Merge #13671 - stylo: Fix GeckoNode::is_element implementation (from emilio:flag-madness); r=Manishearth
<!-- Please describe your changes on the following line: -->
r? @Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 48f75bf2f68914a11eed83cbd23776f7e0b9c2bd | diff --git a/style/gecko/wrapper.rs b/style/gecko/wrapper.rs
index 407ff4694..f33bc88bd 100644
--- a/style/gecko/wrapper.rs
+++ b/style/gecko/wrapper.rs
@@ -187,7 +187,7 @@ impl BitOr for GeckoRestyleDamage {
impl<'ln> NodeInfo for GeckoNode<'ln> {
fn is_element(&self) -> bool {
use gecko_bindings::struc... | 1 | 1 | 1 |
03c922767d488b775b8a130522547be109ee2951 | Shubheksha Jalan | 2016-10-10T02:15:28 | servo: Merge #13663 - changed set_value() to set() in gecko.mako.rs (from shubheksha:fix/13657); r=Manishearth
<!-- Please describe your changes on the following line: -->
Changed `set_value()` to `set()` in gecko.mako.rs
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step i... | diff --git a/style/properties/gecko.mako.rs b/style/properties/gecko.mako.rs
index 2c8803aad..3c61bba45 100644
--- a/style/properties/gecko.mako.rs
+++ b/style/properties/gecko.mako.rs
@@ -1612,7 +1612,7 @@ fn static_assert() {
pub fn set_letter_spacing(&mut self, v: longhands::letter_spacing::computed_value::T)... | 1 | 2 | 6 |
70d7c29289bced2d6a79dbec7360dc7c72a4b71f | Corey Farwell | 2016-10-09T23:45:03 | servo: Merge #13660 - Simplify logic for writing to stderr (from frewsxcv:stderr); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: b7ed99bf704553039e0b33485476424b14f73528 | diff --git a/util/opts.rs b/util/opts.rs
index 8cc67c1d2..11f42fbf8 100644
--- a/util/opts.rs
+++ b/util/opts.rs
@@ -435,9 +435,7 @@ pub enum OutputOptions {
}
fn args_fail(msg: &str) -> ! {
- let mut stderr = io::stderr();
- stderr.write_all(msg.as_bytes()).unwrap();
- stderr.write_all(b"\n").unwrap();
+ ... | 1 | 1 | 3 |
526080a9a4df02b1449c156dfaf4bb35ea72123e | Brian Birtles | 2016-10-09T13:53:28 | servo: Merge #13553 - Support creating StyleAnimationValue objects from Servo (from birtles:animvalues); r=Manishearth
These are the servo-side changes for [bug 1302949](https://bugzilla.mozilla.org/show_bug.cgi?id=1302949#c59). @Manishearth has already reviewed them there.
---
- [X] `./mach build -d` does not report... | diff --git a/style/gecko/wrapper.rs b/style/gecko/wrapper.rs
index f2a753288..407ff4694 100644
--- a/style/gecko/wrapper.rs
+++ b/style/gecko/wrapper.rs
@@ -70,6 +70,16 @@ pub struct GeckoDeclarationBlock {
pub immutable: AtomicBool,
}
+impl PartialEq for GeckoDeclarationBlock {
+ fn eq(&self, other: &GeckoD... | 2 | 38 | 0 |
16eeb9036f599a58bf862761f382c03329eaed6d | Manish Goregaokar | 2016-10-09T12:52:51 | servo: Merge #13651 - impl GeckoStyleCoordConvertible for Au (from Manishearth:au-togeckostyle); r=emilio
r? @heycam
Source-Repo: https://github.com/servo/servo
Source-Revision: 5955f4a754beabb331bfe0d6ec2a9fa2e3898e69 | diff --git a/style/gecko/values.rs b/style/gecko/values.rs
index 79cfcbb0b..5260adbb1 100644
--- a/style/gecko/values.rs
+++ b/style/gecko/values.rs
@@ -51,6 +51,19 @@ impl GeckoStyleCoordConvertible for LengthOrPercentage {
}
}
+impl GeckoStyleCoordConvertible for Au {
+ fn to_gecko_style_coord<T: CoordData... | 2 | 14 | 1 |
a362d3d2a1634050e639157a947d00bcbefa62ab | Manish Goregaokar | 2016-10-09T08:56:34 | servo: Merge #13620 - Test that Servo_* functions have the right signatures (from Manishearth:type-assert); r=emilio
Fixes #12992
Needs #13617
Not very happy with this solution (and perhaps it should be done in pure Rust, though that can be split out as another easy bug).
But it works. The bindings changes are from... | diff --git a/style/gecko_bindings/bindings.rs b/style/gecko_bindings/bindings.rs
index 97194ec36..3781bbe81 100644
--- a/style/gecko_bindings/bindings.rs
+++ b/style/gecko_bindings/bindings.rs
@@ -178,9 +178,6 @@ extern "C" {
pub fn Gecko_ClearPODTArray(aArray: *mut ::std::os::raw::c_void,
... | 2 | 45 | 29 |
1b6db01aa1fad439627c1b03b20c04e9a64272da | Bobby Holley | 2016-10-09T06:37:42 | servo: Merge #13655 - Move children_to_process to layout (from bholley:children_to_process); r=<try>
We don't need this for Gecko, and it's hard to implement in that case because
there's nowhere obvious to put it (we don't plan to create TSDs for non-dirty
nodes, and non-dirty nodes can have dirty children which requi... | diff --git a/layout/construct.rs b/layout/construct.rs
index ae77f4d77..9722cc852 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -1418,7 +1418,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
let result = {
let mut style = node.style(self.style_context());
... | 8 | 74 | 44 |
acd1322b631423bb4bda0b7ec04579ad001be249 | Corey Farwell | 2016-10-08T20:40:47 | servo: Merge #13411 - Migrate mime_classifier top-level string to enum (from frewsxcv:mime); r=jdm
I made this branch months ago and forgot about it. Instead of just throwing the changes away, I rebased off origin/master and opened this pull request. If these changes aren't desired, no feelings hurt, just close this. ... | diff --git a/net/mime_classifier.rs b/net/mime_classifier.rs
index 96a064276..02c6f3ca8 100644
--- a/net/mime_classifier.rs
+++ b/net/mime_classifier.rs
@@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+use hyper::m... | 2 | 88 | 84 |
cb027d0320b162ee50136273b1f5228413f23b2f | Corey Farwell | 2016-10-08T19:55:24 | servo: Merge #13652 - Fix capitalization for enum variants (from frewsxcv:variant-naming); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3768ea2cc735a90e22d716d94100305382d17f1b | diff --git a/net/mime_classifier.rs b/net/mime_classifier.rs
index 73dc8232f..96a064276 100644
--- a/net/mime_classifier.rs
+++ b/net/mime_classifier.rs
@@ -24,8 +24,8 @@ pub enum MediaType {
}
pub enum ApacheBugFlag {
- ON,
- OFF
+ On,
+ Off
}
impl ApacheBugFlag {
@@ -35,17 +35,17 @@ impl ApacheBug... | 2 | 14 | 14 |
40aeb3fb587bc4a96859ae1e70bee16719d9f7db | Glenn Watson | 2016-10-08T00:07:24 | servo: Merge #13633 - Send touch events to root pipeline, and allow forwarding to iframes (from glennw:forward-touch-events); r=mbrubeck
Instead of letting the compositor try to find the correct scroll
layer for a touch event, switch touch events to work the same way
that mouse events do.
Touch events are now dispatc... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index c62f923d0..ddf9b0691 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -37,7 +37,7 @@ use script_traits::{AnimationState, AnimationTickType, ConstellationControlMsg};
use script_traits::{ConstellationMsg, LayoutControlMsg,... | 5 | 118 | 71 |
b1274b5361c2e499916a95baa72707f37a49b81e | Ravi Shankar | 2016-10-07T21:30:29 | servo: Merge #13636 - Add 'image-rendering' support and some cleanup (from Wafflespeanut:properties); r=Manishearth
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate... | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index e671a1234..51a1bf279 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -222,8 +222,8 @@ impl<'a> PaintContext<'a> {
// conforming implementation of `crisp-edges`, but it is not the best we could do.
// Something like Scale2x ... | 5 | 57 | 39 |
ee9c2510ac06038fc5b1182afa797031fbf21c00 | Alan Jeffrey | 2016-10-07T19:54:31 | servo: Merge #13498 - IFrame elements now manage FrameIds rather than the constellation (from asajeffrey:script-iframe-stores-frameid); r=glennw
<!-- Please describe your changes on the following line: -->
This PR stores the FrameId as well as the PipelineId in an html iframe. The iframes are now responsible for crea... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index fa10a76bb..364401af8 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -139,14 +139,11 @@ pub struct Constellation<Message, LTF, STF> {
font_cache_thread: FontCacheThread,
/// ID of the root ... | 5 | 162 | 167 |
fc710643d1b08fcf22b195c693f24c8617f71e52 | Simon Sapin | 2016-10-07T15:15:53 | servo: Merge #13634 - Blind attempt to fix #13626 (from servo:bind-attempt-at-windows-fix); r=Ms2ger
<!-- Please describe your changes on the following line: -->
The error message was:
```
error: unknown character escape: d
--> C:\projects\servo\target\debug\build\style-9b556a6c7bb4f044\out/properties.rs:44:55
... | diff --git a/style/properties/properties.mako.rs b/style/properties/properties.mako.rs
index bcc7a6e34..49fa22055 100644
--- a/style/properties/properties.mako.rs
+++ b/style/properties/properties.mako.rs
@@ -44,7 +44,7 @@ pub use self::declaration_block::*;
import os.path
%>
-#[path="${os.path.join(os.path.dir... | 1 | 1 | 1 |
2de9f502619687174b633c25ed515ba4c8a8ab41 | Glenn Watson | 2016-10-07T02:03:06 | servo: Merge #13628 - Update webrender (new gpu profiler support) (from glennw:update-wr-profiler); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: ae665db02fcc4066344f7ddcfab0d53768e16657 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 7b2fa3b14..8d0dd5b5f 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2697,7 +2697,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50"
+source ... | 1 | 2 | 2 |
b7a3f8b0cd24bb93a21fd7226668c9a889d43489 | Lars Bergstrom | 2016-10-06T23:00:00 | servo: Merge #13623 - Update glutin to pick up Windows CreateWindowExW fix (from larsbergstrom:update_glutin); r=glennw
r? @glennw or @emilio or whomever
Source-Repo: https://github.com/servo/servo
Source-Revision: e5aebfcf73956b190da3b405db9d14022ecf1da6 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 2431f2e64..7b2fa3b14 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -908,7 +908,7 @@ dependencies = [
"osmesa-sys 0.1.2 (git+https://github.com/daggerbot/osmesa-rs)",
"script_traits 0.0.1",
"servo-egl 0.2.1 (registry+https://github.com/rust-lang/crat... | 1 | 4 | 4 |
0f8fa87012a0e61512f1dcc0a7776e7f0e9054e2 | Glenn Watson | 2016-10-06T19:21:15 | servo: Merge #13610 - Allow simulate_mouse_click to work with webrender (from glennw:sim-mouse-wr); r=mbrubeck
Instead of dispatching to a specific layer, call the dispatch
functions for mouse (move) events that handle whether webrender
is enabled or not.
Source-Repo: https://github.com/servo/servo
Source-Revision: 1... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 905d416f9..c62f923d0 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -1415,6 +1415,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
return
}
+ self.dispatch_mouse_window_event_class(... | 1 | 14 | 11 |
c9e1e991ce1c066f4086c41e288947ae5ed25f4f | Ms2ger | 2016-10-06T17:34:01 | servo: Merge #13597 - Provide the fetched data to fetch() consumers (from servo:fetch); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bd05aa2c3c3a2513b58dd019d888545fd95712fc | diff --git a/script/body.rs b/script/body.rs
index 36a18134c..276d6425d 100644
--- a/script/body.rs
+++ b/script/body.rs
@@ -24,6 +24,7 @@ use std::rc::Rc;
use std::str;
use url::form_urlencoded;
+#[derive(Copy, Clone, JSTraceable, HeapSizeOf)]
pub enum BodyType {
Blob,
FormData,
@@ -47,14 +48,32 @@ pub ... | 4 | 70 | 25 |
54e7569f3dd20c39d7c52799bd8a81daa0b2c0ff | Alan Jeffrey | 2016-10-05T18:19:37 | servo: Merge #13580 - Removed the session history from BrowsingContext (from asajeffrey:script-browsingcontext-without-session-history); r=ConnorGBrewster.
<!-- Please describe your changes on the following line: -->
The session history is stored in the constellation and accessed via the `History` object, so `Browsin... | diff --git a/script/dom/browsingcontext.rs b/script/dom/browsingcontext.rs
index 361792799..9f867157f 100644
--- a/script/dom/browsingcontext.rs
+++ b/script/dom/browsingcontext.rs
@@ -3,12 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::cell::DOMRefCell;
-use dom::binding... | 2 | 20 | 62 |
8ea36a6a5e05c12e78fa991f80525fb6c71e4ba0 | Stephen Lester | 2016-10-05T17:04:03 | servo: Merge #13600 - Invert conditional and return early for AddEventListener/RemoveEventL… (from slester:13586); r=jdm
<!-- Please describe your changes on the following line: -->
Cleans up code as described in #13586 by returning early instead of nesting everything in an `if` statement.
---
<!-- Thank you for cont... | diff --git a/script/dom/eventtarget.rs b/script/dom/eventtarget.rs
index 1d3efd59b..9bdaac202 100644
--- a/script/dom/eventtarget.rs
+++ b/script/dom/eventtarget.rs
@@ -515,21 +515,23 @@ impl EventTargetMethods for EventTarget {
ty: DOMString,
listener: Option<Rc<EventL... | 1 | 30 | 26 |
d552ae912cace4a33e7a1da04db7dbea8a59fa87 | Glenn Watson | 2016-10-05T08:41:13 | servo: Merge #13592 - Update webrender (text run + transforms fix) (from glennw:update-wr-text-runs); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 8a3af9d1b9fe55a802d6463f6e4a5dbf39a1ecff | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index e6c73ef7b..2431f2e64 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2697,7 +2697,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#dfa4246ebe40c78882cdd3e69e776b1e09a2f58e"
+source ... | 1 | 2 | 2 |
4b868f0ed9c17d0f107f6743c6b00c0539d3ffcc | Shubheksha Jalan | 2016-10-05T07:47:30 | servo: Merge #13585 - Removed duplicate #![feature(plugin)] (from shubheksha:fix/13581); r=jdm
<!-- Please describe your changes on the following line: -->
Removed duplicate ` #![feature(plugin)]` from two files.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complet... | diff --git a/compositing/lib.rs b/compositing/lib.rs
index 3888b03e6..8ce9a6370 100644
--- a/compositing/lib.rs
+++ b/compositing/lib.rs
@@ -5,7 +5,6 @@
#![feature(box_syntax)]
#![feature(custom_derive)]
#![feature(plugin)]
-#![feature(plugin)]
#![plugin(plugins)]
#![deny(unsafe_code)]
diff --git a/constellation... | 2 | 0 | 2 |
c209334cc6f86fd10bc06463dbb5bbc25761a444 | Ms2ger | 2016-10-05T06:53:20 | servo: Merge #13577 - Squash some build warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c2727b18b0a42ed88f3a8bb5a5535a8206314f8f | diff --git a/script/body.rs b/script/body.rs
index 814a62c30..36a18134c 100644
--- a/script/body.rs
+++ b/script/body.rs
@@ -25,7 +25,6 @@ use std::str;
use url::form_urlencoded;
pub enum BodyType {
- ArrayBuffer,
Blob,
FormData,
Json,
@@ -92,7 +91,6 @@ fn run_package_data_algorithm<T: BodyOperati... | 2 | 2 | 4 |
844a01001df501dae4b0a48a55eb9eaf7d338d33 | Manish Goregaokar | 2016-10-05T04:34:03 | servo: Merge #13556 - Add to_css_single_value for serializing a single PropertyDeclarationBlock (from Manishearth:serialize-one); r=emilio
Add to_css_single_value for serializing a single PropertyDeclarationBlock
(fixes #13423)
r? @birtles
This needs to take the name of the property in question as input so that it ... | diff --git a/style/properties/properties.mako.rs b/style/properties/properties.mako.rs
index 2a6804644..46db65c68 100644
--- a/style/properties/properties.mako.rs
+++ b/style/properties/properties.mako.rs
@@ -317,6 +317,42 @@ impl PropertyDeclarationBlock {
}
}
+impl PropertyDeclarationBlock {
+ // Take a de... | 1 | 46 | 0 |
b7f8d275de8380a688bc92b59b6f98685b1f6fd6 | Ms2ger | 2016-10-05T03:40:16 | servo: Merge #13579 - Remove some documentation that is no longer correct (from servo:old-doc); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: c12ca6fdd5403041c2414c6dcd1ccb8ce2f5043e | diff --git a/net_traits/lib.rs b/net_traits/lib.rs
index 7f4a3abd1..bc920ccd2 100644
--- a/net_traits/lib.rs
+++ b/net_traits/lib.rs
@@ -463,9 +463,6 @@ pub enum CoreResourceMsg {
Exit(IpcSender<()>),
}
-/// Initialized but unsent request. Encapsulates everything necessary to instruct
-/// the resource thread t... | 1 | 0 | 3 |
d4dbdea5f7974947349998ee44d5c68aa9a853d5 | Patrick Walton | 2016-10-05T02:03:55 | servo: Merge #13490 - layout: Place inline absolute hypothetical boxes properly during block fragment position assignment (from pcwalton:inline-absolute-hypothetical-metrics); r=notriddle
r? @notriddle
Closes #13471.
Source-Repo: https://github.com/servo/servo
Source-Revision: 1c62520142a250da5dd6ac027ce531a255096ac... | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 698ed5177..a6f3e92f1 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -2044,7 +2044,7 @@ impl Fragment {
/// Calculates block-size above baseline, depth below baseline, and ascent for this fragment
/// when used in an inline formatting cont... | 2 | 120 | 63 |
3734f3f0e4861074a3f03911884a6c5603280579 | Glenn Watson | 2016-10-05T01:06:29 | servo: Merge #13567 - Minimal Win32 font platform implementation (from glennw:win-fonts); r=larsbergstrom
This uses a (very simple) Win32 API call to enumerate font
families available, and load them as byte buffers.
The font rasterization itself is done by freetype.
This gets Servo + WR + Windows working, but should... | diff --git a/gfx/Cargo.toml b/gfx/Cargo.toml
index 129e0d99b..ba387d19b 100644
--- a/gfx/Cargo.toml
+++ b/gfx/Cargo.toml
@@ -58,9 +58,15 @@ core-foundation = "0.2"
core-graphics = "0.4"
core-text = "2.0"
-[target.'cfg(any(target_os = "linux", target_os = "android", all(target_os = "windows", target_env = "gnu")))'.... | 6 | 193 | 13 |
6013327d9fcd6065ffcab50fca6de47d8d67bb22 | Ms2ger | 2016-10-04T23:12:18 | servo: Merge #13575 - Use the fetch stack for stylesheets (from servo:fetch-link); r=jdm
Fixes #13462.
Source-Repo: https://github.com/servo/servo
Source-Revision: 710bd7e1dc8f314399d937e968f160f94143e500 | diff --git a/script/dom/htmllinkelement.rs b/script/dom/htmllinkelement.rs
index 74e21ac96..b02aa0ad6 100644
--- a/script/dom/htmllinkelement.rs
+++ b/script/dom/htmllinkelement.rs
@@ -12,6 +12,7 @@ use dom::bindings::codegen::Bindings::HTMLLinkElementBinding::HTMLLinkElementMet
use dom::bindings::inheritance::Castabl... | 1 | 34 | 13 |
4416a6dda4a62c01ec01eeb1454935db5d64e3cc | Anthony Ramine | 2016-10-04T22:19:11 | servo: Merge #13572 - Clean up some global things (from nox:cleanup-global); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 136c9a89b9a923052f967ffb6186f46dafefa22f | diff --git a/script/dom/bindings/global.rs b/script/dom/bindings/global.rs
index 5d679cce2..e0341ceeb 100644
--- a/script/dom/bindings/global.rs
+++ b/script/dom/bindings/global.rs
@@ -125,12 +125,7 @@ impl<'a> GlobalRef<'a> {
/// Get the `ResourceThreads` for this global scope.
pub fn resource_threads(&self)... | 5 | 8 | 19 |
af54244b02e5d5b0b6eb061c66298b5171b4c529 | Alan Jeffrey | 2016-10-04T21:01:40 | servo: Merge #13472 - Don't log in the middle of mutating a reentrant lock (from asajeffrey:util-remutex-dont-log-while-mutating-lock); r=jdm
<!-- Please describe your changes on the following line: -->
Moved assertion that we are the lock owner to after the lock release. The problem is that Servo uses a reentrant lo... | diff --git a/util/remutex.rs b/util/remutex.rs
index 02dcd884b..a574de9cf 100644
--- a/util/remutex.rs
+++ b/util/remutex.rs
@@ -12,7 +12,6 @@
use core::nonzero::NonZero;
use std::cell::{Cell, UnsafeCell};
-use std::mem;
use std::ops::Deref;
use std::sync::{LockResult, Mutex, MutexGuard, PoisonError, TryLockError... | 1 | 26 | 9 |
93c8cd513a87c56ec2854274cfb74cc5c0d0fb53 | Emilio Cobos Álvarez | 2016-10-04T19:01:49 | servo: Merge #13387 - Honor SERVO_ENABLE_DEBUG_ASSERTIONS on the build machines (from emilio:debug-assertions); r=aneeshusa,jdm,pcwalton
<!-- Please describe your changes on the following line: -->
As part of #13127.
cc @aneeshusa
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when... | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 9bd69518d..698ed5177 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1155,8 +1155,14 @@ impl Fragment {
match self.inline_context {
None => style_border_width,
Some(ref inline_fragment_context) => {
+ ... | 5 | 46 | 16 |
82a1a0ce54597fa17e446322841501e41f89109f | Ravi Shankar | 2016-10-04T16:11:53 | servo: Merge #13570 - Add support for 'font-stretch' in geckolib (from Wafflespeanut:font_stretch); r=Manishearth
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate d... | diff --git a/style/properties/gecko.mako.rs b/style/properties/gecko.mako.rs
index 99f6c0cdd..acc3ee86f 100644
--- a/style/properties/gecko.mako.rs
+++ b/style/properties/gecko.mako.rs
@@ -447,7 +447,7 @@ impl Debug for ${style_struct.gecko_struct_name} {
# These are currently being shuffled to a different style s... | 1 | 20 | 2 |
2db590413f03185255ea2e6ecf2144ca6e6b7cd0 | Mathieu Hordesseaux | 2016-10-04T14:46:11 | servo: Merge #13485 - Make readystatechange fire more often (fixes #13481) (from mathieuh:xhr-event); r=jdm
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -... | diff --git a/script/dom/xmlhttprequest.rs b/script/dom/xmlhttprequest.rs
index 4643921bc..caebbddd0 100644
--- a/script/dom/xmlhttprequest.rs
+++ b/script/dom/xmlhttprequest.rs
@@ -973,9 +973,16 @@ impl XMLHttpRequest {
*self.response.borrow_mut() = partial_response;
if !self.sync.get(... | 1 | 9 | 2 |
85bdbce2fb6d34491725719a2eac82d2506de687 | Ms2ger | 2016-10-04T13:05:44 | servo: Merge #13571 - Simplify fetching code (from servo:simplify-fetching); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: b80769dbf5e8f0c59db353b8e0ee7e4d77813294 | diff --git a/gfx/font_cache_thread.rs b/gfx/font_cache_thread.rs
index 26fcd6b98..c3fcf7dfc 100644
--- a/gfx/font_cache_thread.rs
+++ b/gfx/font_cache_thread.rs
@@ -7,7 +7,7 @@ use fontsan;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
use mime::{TopLevel, SubLevel};
-use net... | 5 | 48 | 114 |
f878ca3cef819509a43af32e8fd3799ce4ce65a8 | Ms2ger | 2016-10-04T11:28:47 | servo: Merge #13568 - Remove duplicated definition of 'doc' (from servo:script-doc); r=emilio
The same line exists higher up in the function.
Source-Repo: https://github.com/servo/servo
Source-Revision: bebe490b635732ab66031222e076d812f605367c | diff --git a/script/dom/htmlscriptelement.rs b/script/dom/htmlscriptelement.rs
index ed550309a..8e17326f1 100644
--- a/script/dom/htmlscriptelement.rs
+++ b/script/dom/htmlscriptelement.rs
@@ -259,8 +259,6 @@ fn fetch_a_classic_script(script: &HTMLScriptElement,
status: Ok(())
}));
- let doc = docume... | 1 | 0 | 2 |
3b4e92f4e21ad6d8d125d65929fbf0b7470e4c20 | Lars Bergstrom | 2016-10-03T19:15:02 | servo: Merge #13560 - Pick up the updated signpost library for all Cargo.lock files (from larsbergstrom:update_signpost); r=Ms2ger
<!-- Please describe your changes on the following line: -->
r? @nox
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replac... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 21d118f74..8005ff316 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2281,7 +2281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "signpost"
version = "0.1.0"
-source = "git+https://github.com/pcwalton/signpost.g... | 1 | 1 | 1 |
d0f4db665870d0e99414dabffdd6a654aa271094 | Nazım Can Altınova | 2016-10-02T19:33:43 | servo: Merge #13541 - Fix origin/clip parsing behavior in mask and background shorthands (from canaltinova:origin-clip); r=Manishearth
<!-- Please describe your changes on the following line: -->
We have tests for mask shorthand parsing, but we don't have tests for background parsing. Should I add some for it?
Also de... | diff --git a/style/properties/shorthand/background.mako.rs b/style/properties/shorthand/background.mako.rs
index f507af9ec..2537a71c2 100644
--- a/style/properties/shorthand/background.mako.rs
+++ b/style/properties/shorthand/background.mako.rs
@@ -11,6 +11,20 @@
use properties::longhands::{background_color, backg... | 2 | 37 | 16 |
9616b21d7cea3e7f5cdf98095afa29c07dfe19fd | Ms2ger | 2016-10-02T18:02:14 | servo: Merge #13525 - Ignore stylesheet links with an empty href (from servo:empty-href); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 3eb6fc48188bb3b8d469aac1bfa3b67114007758 | diff --git a/script/dom/htmllinkelement.rs b/script/dom/htmllinkelement.rs
index 773f16304..7c6cabd34 100644
--- a/script/dom/htmllinkelement.rs
+++ b/script/dom/htmllinkelement.rs
@@ -197,62 +197,69 @@ impl VirtualMethods for HTMLLinkElement {
impl HTMLLinkElement {
+ /// https://html.spec.whatwg.org/multipage... | 1 | 54 | 47 |
b32fa7c9a11e151322bc661a83ebb7e0f1689254 | Emilio Cobos Álvarez | 2016-10-02T15:59:25 | servo: Merge #13440 - stylo: Remove a bunch of unneeded ool-calls (from emilio:no-ool); r=bholley
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test... | diff --git a/style/gecko/wrapper.rs b/style/gecko/wrapper.rs
index e2db71fec..864e8fc8d 100644
--- a/style/gecko/wrapper.rs
+++ b/style/gecko/wrapper.rs
@@ -17,21 +17,17 @@ use gecko_bindings::bindings;
use gecko_bindings::bindings::{Gecko_CalcStyleDifference, Gecko_StoreStyleDifference};
use gecko_bindings::bindings... | 3 | 101 | 54 |
25b6b4b7b9c404bf4714e766372c5b530409c8f0 | Tom Huibregtse | 2016-10-02T02:00:08 | servo: Merge #13544 - Rename hyper import and update as HttpMethod (from thuibr:hyper); r=KiChjang
The same expanded hyper::method::Method method was used throughout the file, causing unneeded repetition. Import this method as HttpMethod and replace all references in the file.
---
<!-- Thank you for contributing to S... | diff --git a/script/dom/request.rs b/script/dom/request.rs
index fc9779789..ba15f565c 100644
--- a/script/dom/request.rs
+++ b/script/dom/request.rs
@@ -24,7 +24,7 @@ use dom::bindings::str::{ByteString, DOMString, USVString};
use dom::headers::{Guard, Headers};
use dom::promise::Promise;
use dom::xmlhttprequest::Ex... | 1 | 15 | 15 |
c22343f3ba096def0f13adbba0a45f8708c5a136 | Wellington Cordeiro | 2016-10-01T17:05:13 | servo: Merge #13531 - Remove ignore-heap-size comment to enable memory measurement on HashSet (from wldcordeiro:measure-hashset-mem); r=jdm
Remove the ignore-heap-size comment to enable the memory measurement.
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x]... | diff --git a/devtools_traits/lib.rs b/devtools_traits/lib.rs
index 4edf19d6f..b77118211 100644
--- a/devtools_traits/lib.rs
+++ b/devtools_traits/lib.rs
@@ -145,7 +145,7 @@ pub struct TimelineMarker {
pub end_stack: Option<Vec<()>>,
}
-#[derive(PartialEq, Eq, Hash, Clone, Deserialize, Serialize)]
+#[derive(Part... | 2 | 1 | 2 |
7248adfc8a8b0ba27a88c18397b8477a3d4968cf | Jan Zerebecki | 2016-10-01T10:19:05 | servo: Merge #13467 - Remove same-origin-data-url flag from fetch implementation (from JanZerebecki:rm-same-origin-data-url); r=KiChjang
<!-- Please describe your changes on the following line: -->
The spec removed it. Check the scheme instead, data is always same origin now,
except for workers.
Closes #13362
---
<!... | diff --git a/net/fetch/methods.rs b/net/fetch/methods.rs
index a97ee2e99..525364725 100644
--- a/net/fetch/methods.rs
+++ b/net/fetch/methods.rs
@@ -194,8 +194,8 @@ fn main_fetch(request: Rc<Request>, cache: &mut CORSCache, cors_flag: bool,
};
if (same_origin && !cors_flag ) ||
- ... | 6 | 18 | 32 |
9185e6662e23625a919597886c045233174af13e | Patrick Walton | 2016-10-01T09:18:56 | servo: Merge #13519 - profile: Integrate the time profiler with the macOS signpost infrastructure (from pcwalton:signpost); r=larsbergstrom
With this change, if you supply the `-Z signpost` flag, Instruments.app
can display Servo events overlaid with callstack data. Even better, you
can get call stack profiling for in... | diff --git a/profile_traits/Cargo.toml b/profile_traits/Cargo.toml
index f4b3687fc..150760b2a 100644
--- a/profile_traits/Cargo.toml
+++ b/profile_traits/Cargo.toml
@@ -19,4 +19,7 @@ energy-monitor = {version = "0.2.0", optional = true}
plugins = {path = "../plugins"}
serde = "0.8"
serde_macros = "0.8"
+signpost = {... | 5 | 81 | 45 |
b259b821b035eb7fef89cd1e231c0ac9b109ae53 | Alan Jeffrey | 2016-10-01T02:57:36 | servo: Merge #13517 - Moved pub_domains to net_traits and did a spring clean (from asajeffrey:net-traits-pub-domain); r=mbrubeck
<!-- Please describe your changes on the following line: -->
Moved the `pub_domains` module from `net` into `net_traits`, so it can be used by crates which don't depend on `net` (in particu... | diff --git a/net/cookie.rs b/net/cookie.rs
index 558d8e49a..28972d958 100644
--- a/net/cookie.rs
+++ b/net/cookie.rs
@@ -7,7 +7,7 @@
use cookie_rs;
use net_traits::CookieSource;
-use pub_domains::is_pub_domain;
+use net_traits::pub_domains::is_pub_domain;
use std::borrow::ToOwned;
use std::net::{Ipv4Addr, Ipv6Add... | 5 | 142 | 75 |
084cd52c50041c34856ec3e7a7ddfcdca48585a1 | Keith Yeung | 2016-09-30T14:38:26 | servo: Merge #13473 - Support letter-spacing in stylo (from KiChjang:gecko-letter-spacing); r=Manishearth,Wafflespeanut
Fixes #12823.
r? @Manishearth
**This needs to be tested!**
Source-Repo: https://github.com/servo/servo
Source-Revision: f67e5e4004506cf8d91a52d73d46113ab412e451 | diff --git a/style/properties/gecko.mako.rs b/style/properties/gecko.mako.rs
index e08959eb5..bd5d2647f 100644
--- a/style/properties/gecko.mako.rs
+++ b/style/properties/gecko.mako.rs
@@ -1459,7 +1459,7 @@ fn static_assert() {
<%self:impl_trait style_struct_name="InheritedText"
- skip_longhands="... | 2 | 11 | 2 |
cc3cbef882f59042e8f5bfd8a8957ff9b6e9e716 | Guillaume Gomez | 2016-09-30T12:45:55 | servo: Merge #13444 - Update mp3-metadata version (from GuillaumeGomez:mp3-metadata-version); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: f99f278848fc60d24e91b37ff98ca64f2df24e0a | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 1f45d9709..0c9c2bb48 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -107,7 +107,7 @@ name = "audio-video-metadata"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mp3-metadata 0.2.1 (registry+https:... | 1 | 3 | 3 |
30bb53de3cf697f5accdd07fab249a6c43c3f63f | Ms2ger | 2016-09-30T06:21:08 | servo: Merge #13461 - Pass the correct attribute to handle_stylesheet_url (from servo:media); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 7fe688b8e932d60c1b588b1dd80e939d80be2706 | diff --git a/script/dom/htmllinkelement.rs b/script/dom/htmllinkelement.rs
index 1c84fbba7..773f16304 100644
--- a/script/dom/htmllinkelement.rs
+++ b/script/dom/htmllinkelement.rs
@@ -154,7 +154,9 @@ impl VirtualMethods for HTMLLinkElement {
},
&atom!("media") => {
if string_... | 1 | 3 | 1 |
9bbac9101804ff08fdeff002360ec48442272b38 | Ravi Shankar | 2016-09-30T05:25:08 | servo: Merge #13450 - Make use of Servo's border-spacing in Stylo (from Wafflespeanut:border_spacing); r=Manishearth
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriat... | diff --git a/style/properties/gecko.mako.rs b/style/properties/gecko.mako.rs
index 12ea3bc1c..e08959eb5 100644
--- a/style/properties/gecko.mako.rs
+++ b/style/properties/gecko.mako.rs
@@ -1442,6 +1442,22 @@ fn static_assert() {
</%self:impl_trait>
+<%self:impl_trait style_struct_name="InheritedTable"
+ ... | 2 | 17 | 1 |
bc98b2bb1ab22cc3dba8309f9f7113816a9b60e4 | Ravi Shankar | 2016-09-30T03:46:38 | servo: Merge #13456 - Silence some warnings in geckolib (from Wafflespeanut:warnings); r=emilio
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./... | diff --git a/style/gecko/selector_impl.rs b/style/gecko/selector_impl.rs
index e1dbffbdc..bcd3a4815 100644
--- a/style/gecko/selector_impl.rs
+++ b/style/gecko/selector_impl.rs
@@ -61,7 +61,7 @@ impl PseudoElement {
}
#[inline]
- fn from_atom(atom: &WeakAtom, in_ua: bool) -> Option<Self> {
+ fn from_a... | 5 | 12 | 7 |
a40a5f3d8c58ace47543fca04feafeb6b48b1eed | Felipe Lacerda | 2016-09-30T00:20:55 | servo: Merge #13414 - Implement `word-break: keep-all` (#9673) (from flacerdk:master); r=mbrubeck
<!-- Please describe your changes on the following line: -->
Implement the `keep-all` value for the `word-break` property, as specified in [CSS](https://drafts.csswg.org/css-text-3/#word-break-property).
The relevant CSS... | diff --git a/gfx/font.rs b/gfx/font.rs
index 7e1cf5236..c955c042e 100644
--- a/gfx/font.rs
+++ b/gfx/font.rs
@@ -148,6 +148,8 @@ bitflags! {
const DISABLE_KERNING_SHAPING_FLAG = 0x04,
#[doc = "Text direction is right-to-left."]
const RTL_FLAG = 0x08,
+ #[doc = "Set if word-break is set... | 5 | 22 | 13 |
0dd9bc0cf15720e74db264c80bfda22fef5d069c | Michael Howell | 2016-09-29T18:16:24 | servo: Merge #13401 - Implement sequential fallback to float speculation (from notriddle:master); r=pcwalton
This shouldn't impact any pages that are already rendering correctly, but it is a very naive implementation of this pass.
---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does n... | diff --git a/layout/block.rs b/layout/block.rs
index 566d95cc1..7de8f3795 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -52,6 +52,7 @@ use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none};
use rustc_serialize::{Encodable, Encoder};
use script_layout_interface::restyle_damage::{BUBBLE_ISIZE... | 6 | 126 | 28 |
91be94a95d2a09b4d9e8d8e478193d91847b5e82 | Martin Robinson | 2016-09-29T14:01:33 | servo: Merge #13417 - Simplify stacking context collection (from mrobinson:simplify-stacking-context-collection); r=glennw
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appr... | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index 27ed5d6ac..1b7195fa2 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -618,7 +618,7 @@ pub struct StackingContext {
pub layer_info: Option<LayerInfo>,
/// Children of this StackingContext.
- children: Vec<Box<Stacki... | 16 | 89 | 185 |
eeb9bc6df93987337979e878d55552b1882286aa | Nazım Can Altınova | 2016-09-29T07:22:54 | servo: Merge #13336 - Implement parsing for mask shorthand (from canaltinova:mask); r=Manishearth
<!-- Please describe your changes on the following line: -->
Implement parsing for mask shorthand. It doesn't contain tests yet. I'll write and update the PR.
---
<!-- Thank you for contributing to Servo! Please replace ... | diff --git a/style/properties/longhand/svg.mako.rs b/style/properties/longhand/svg.mako.rs
index 2d0321ad7..cc9aadf4e 100644
--- a/style/properties/longhand/svg.mako.rs
+++ b/style/properties/longhand/svg.mako.rs
@@ -94,10 +94,9 @@ ${helpers.single_keyword("mask-repeat",
<%helpers:longhand name="mask-position" produ... | 3 | 202 | 8 |
a9b624cb5667c273c108006b630fd2f5d60eadde | Patrick Walton | 2016-09-29T05:11:33 | servo: Merge #13470 - layout: Improve the interaction between baseline-offset-of-last-line-in-flow logic and inline absolute hypothetical boxes (from pcwalton:inline-absolute-hypothetical-baseline); r=notriddle
See commits for details. These changes place the heart icon on Twitter in the right place.
r? @notriddle
S... | diff --git a/layout/flow.rs b/layout/flow.rs
index c8703272f..6cdbdeffe 100644
--- a/layout/flow.rs
+++ b/layout/flow.rs
@@ -1404,7 +1404,9 @@ impl<'a> ImmutableFlowUtils for &'a Flow {
fn baseline_offset_of_last_line_box_in_flow(self) -> Option<Au> {
for kid in base(self).children.iter().rev() {
... | 2 | 11 | 7 |
4d6b899cb5cdda2e922bbcfce85053a4af12477c | Glenn Watson | 2016-09-28T18:42:14 | servo: Merge #13474 - Switch default renderer to webrender, and update webrender (from glennw:wr-default); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: a082501173918d6a5808881f84556cb78391b9b2 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 40c268d6b..1f45d9709 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2661,7 +2661,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#cf945d15c71c757c6694b40a38fd7cfef1a2f827"
+source ... | 2 | 5 | 6 |
3f11cca79062266853da6400bfc1f149dcf9e810 | Jake Goldsborough | 2016-09-27T20:28:09 | servo: Merge #13358 - Form action url 11219 (from ducks:form-action-url-11219); r=mbrubeck
First pass at fixing #10580.
I've added a new macro that returns a DomString with either the attr val or the doc url.
I then made the form element use that macro on the action attribute.
I also added a test that contains an ifra... | diff --git a/script/dom/htmlformelement.rs b/script/dom/htmlformelement.rs
index 9622914b5..a4cb42711 100644
--- a/script/dom/htmlformelement.rs
+++ b/script/dom/htmlformelement.rs
@@ -98,7 +98,7 @@ impl HTMLFormElementMethods for HTMLFormElement {
make_setter!(SetAcceptCharset, "accept-charset");
// https:... | 2 | 22 | 2 |
04f79285708986d1f8c11d87e28980e03af3872c | Gregory | 2016-09-27T17:49:56 | servo: Merge #13412 - Invoke failure steps if there's no metadata (from gterzian:failure_if_no_metadata); r=jdm
Media element network response processing code should invoke failure steps if there's no metadata.
Fixes #13375.
Source-Repo: https://github.com/servo/servo
Source-Revision: ec5ae8562d2c1f78a4fc65254b31759... | diff --git a/script/dom/htmlmediaelement.rs b/script/dom/htmlmediaelement.rs
index 1f2b51f7c..5bbdd7380 100644
--- a/script/dom/htmlmediaelement.rs
+++ b/script/dom/htmlmediaelement.rs
@@ -105,8 +105,13 @@ impl AsyncResponseListener for HTMLMediaElementContext {
fn response_complete(&mut self, status: Result<(), N... | 1 | 6 | 1 |
561a3a6efb72b20b45ecfe974236ca11baab2316 | Manish Goregaokar | 2016-09-27T11:04:57 | servo: Merge #13425 - Don't crash when #[dom_struct] is applied on an empty struct (from Manishearth:no-crash-empty-dom); r=emilio,Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 1ed3521dcfdf573dd68afe18148e785a8af2389a | diff --git a/plugins/reflector.rs b/plugins/reflector.rs
index 04e22fa82..27f8054fd 100644
--- a/plugins/reflector.rs
+++ b/plugins/reflector.rs
@@ -12,6 +12,11 @@ pub fn expand_reflector(cx: &mut ExtCtxt, span: Span, _: &MetaItem, annotatable:
push: &mut FnMut(Annotatable)) {
if let &Anno... | 1 | 5 | 0 |
e1a22b45edcf3536d4d354782ade3d949bad93da | Patrick Walton | 2016-09-27T01:57:59 | servo: Merge #13346 - layout: Make some major improvements to incremental layout to improve CNN (from pcwalton:cnn); r=notriddle
CNN is still too slow to be usable, but this is a partial solution.
r? @notriddle (feel free to reassign if you like)
Source-Repo: https://github.com/servo/servo
Source-Revision: cbe545827... | diff --git a/layout/block.rs b/layout/block.rs
index 1c7925feb..dc623d987 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -51,6 +51,7 @@ use model::{self, IntrinsicISizes, MarginCollapseInfo};
use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none};
use rustc_serialize::{Encodable, Encoder};
u... | 7 | 287 | 202 |
f8158925511baf9ac7c26b97f164f6eb177fa38f | Florent FAYOLLE | 2016-09-27T00:02:26 | servo: Merge #13407 - #13262 Add a unit test verifying that SpecificFragmentInfo size (from fflorent:master); r=Ms2ger
Add a unit test for `SpecificFragmentInfo`.
I made a similar test as for Fragment in size_of.rs, not sure whether that's the right way or what is asked. Don't hesitate to tell me your expectations :... | diff --git a/layout/lib.rs b/layout/lib.rs
index 9f943cf48..b272ad503 100644
--- a/layout/lib.rs
+++ b/layout/lib.rs
@@ -98,3 +98,4 @@ pub mod wrapper;
// For unit tests:
pub use fragment::Fragment;
+pub use fragment::SpecificFragmentInfo; | 1 | 1 | 0 |
7f1ad13b7a238a1fb1937ba92b276ea341b0a8b2 | Josh Matthews | 2016-09-26T18:37:47 | servo: Merge #13433 - Avoid huge numbers of warnings for atom_macro (from servo:jdm-patch-3); r=Ms2ger
This avoids the perma-Travis failure from exceeding the log size due to the number of warnings from this module. I am filing a separate PR to fix the code generation to avoid the warning.
Source-Repo: https://github... | diff --git a/style/gecko_string_cache/mod.rs b/style/gecko_string_cache/mod.rs
index 0e7b250ac..0bcd58f9b 100644
--- a/style/gecko_string_cache/mod.rs
+++ b/style/gecko_string_cache/mod.rs
@@ -22,7 +22,7 @@ use std::ops::Deref;
use std::slice;
#[macro_use]
-#[allow(improper_ctypes)]
+#[allow(improper_ctypes, safe_e... | 1 | 1 | 1 |
bdd1143f23ed5ba94dab46b1f811b5b319170502 | Adolfo Ochagavía | 2016-09-26T17:09:48 | servo: Merge #13397 - Return an enum instead of a boolean from dispatch_event (from aochagavia:dispatch-event); r=Ms2ger
Fixes #13196
---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13196.
- [X] These changes do not require tests beca... | diff --git a/script/dom/dedicatedworkerglobalscope.rs b/script/dom/dedicatedworkerglobalscope.rs
index 589489deb..c425c38b8 100644
--- a/script/dom/dedicatedworkerglobalscope.rs
+++ b/script/dom/dedicatedworkerglobalscope.rs
@@ -19,6 +19,7 @@ use dom::bindings::str::DOMString;
use dom::bindings::structuredclone::Struc... | 7 | 45 | 17 |
e4ad9870bbb87b1db541e192e4a1359a49c97fb4 | Ms2ger | 2016-09-24T07:46:25 | servo: Merge #13389 - Update js (from servo:js); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 16323207228e0e15415ee52fbce4accc83c4ac91 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index e524e5d23..1df39d66b 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -1112,7 +1112,7 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.3"
-source = "git+https://github.com/servo/rust-mozjs#4f25903539e29f9f34391f78ddfdf3f8f6f60ece"
+source = "git... | 1 | 1 | 1 |
96951c3ef7c11b386064043d33d63a122ae1f608 | Ms2ger | 2016-09-24T06:44:09 | servo: Merge #13388 - Avoid a possible deadlock in main_fetch's synchronous code (from servo:deadlock); r=emilio
On playpen, similar code caused a deadlock on 1.11 stable, and worked fine
on nightly 1.13; it seems safer to avoid the pattern entirely.
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d5a05... | diff --git a/net/fetch/methods.rs b/net/fetch/methods.rs
index 1f3eb0e5a..a97ee2e99 100644
--- a/net/fetch/methods.rs
+++ b/net/fetch/methods.rs
@@ -312,15 +312,18 @@ fn main_fetch(request: Rc<Request>, cache: &mut CORSCache, cors_flag: bool,
Data::Done => break,
}
}
-... | 1 | 11 | 8 |
318ffb1bb6f784e9af355f187d0078438bb01943 | Hugo Thiessard | 2016-09-24T03:16:57 | servo: Merge #13361 - Report tidy error for space after ( (from Mylainos:issue-13350); r=Wafflespeanut
<!-- Please describe your changes on the following line: -->
Add report in tidy for code which have a space after the `(` like `some_function( argument)`
---
<!-- Thank you for contributing to Servo! Please replace ... | diff --git a/script/dom/htmlformelement.rs b/script/dom/htmlformelement.rs
index 268b04a15..9622914b5 100644
--- a/script/dom/htmlformelement.rs
+++ b/script/dom/htmlformelement.rs
@@ -593,7 +593,7 @@ impl HTMLFormElement {
"file" | "textarea" => (), // TODO
_ => {
... | 1 | 1 | 1 |
b43640c1bd45742e6bc973d66049391bd0f0441f | Jonathan Schuster | 2016-09-24T02:08:19 | servo: Merge #13354 - Style input-text pseudo with user-agent CSS (from schuster:input-text-style); r=pcwalton
This changes the input-text pseudo-element to be styled with user-agent CSS rather than having a hard-coded style, as part of #8570
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by ... | diff --git a/layout/construct.rs b/layout/construct.rs
index c89d45c96..d5a788778 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -48,6 +48,7 @@ use style::computed_values::content::ContentItem;
use style::computed_values::position;
use style::context::SharedStyleContext;
use style::properties::{self, ... | 3 | 14 | 16 |
e3396205af7d3b4c9e676d46dbee1c5d96b52b09 | Nicolas | 2016-09-23T23:20:03 | servo: Merge #13312 - Flush style sharing cache on parent mismatch (from 6112:flush-style-cache); r=emilio
Fixes #12913. No new tests were added, but we should at least make sure existing tests still pass.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and ... | diff --git a/style/matching.rs b/style/matching.rs
index 1ac8918bc..8a9a12eaa 100644
--- a/style/matching.rs
+++ b/style/matching.rs
@@ -708,6 +708,7 @@ pub trait ElementMatchMethods : TElement {
_ => return StyleSharingResult::CannotShare,
};
+ let mut should_clear_cache = false;
... | 1 | 9 | 0 |
aeba11f7da0d52d7691a9770fd1fab4f43565d47 | Anthony Ramine | 2016-09-23T21:41:34 | servo: Merge #13393 - Update dependencies to use libc++ on OS X (from servo:libcxx); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 63b1d1993d69a0a5297698595beeed3b9ae5062b | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index f4532d8f3..e524e5d23 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -71,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "angle"
version = "0.1.1"
-source = "git+https://github.com/servo/angle?branch=servo#8... | 1 | 11 | 11 |
e4f0630e6bb4e9f0c319dab23bbc8aa3b87adbc6 | Nikhil Shagrithaya | 2016-09-23T12:48:35 | servo: Merge #13311 - Correctly gets and sets rel content attributes in linkelement (from cynicaldevil:linkelement); r=Ms2ger
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with ap... | diff --git a/script/dom/htmllinkelement.rs b/script/dom/htmllinkelement.rs
index bbffecaaf..1c84fbba7 100644
--- a/script/dom/htmllinkelement.rs
+++ b/script/dom/htmllinkelement.rs
@@ -368,7 +368,9 @@ impl HTMLLinkElementMethods for HTMLLinkElement {
make_getter!(Rel, "rel");
// https://html.spec.whatwg.org... | 1 | 3 | 1 |
71fba9a99731f152b9170e084220ad6ad6e3bfdf | Manish Goregaokar | 2016-09-23T04:14:48 | servo: Merge #13228 - Add uncompute functionality (WIP) (from Manishearth:uncompute); r=heycam
As discussed in Taipei we plan to do animations in Stylo on the Rust side. For cascading properly, we need to "uncompute" these,
i.e. convert them into a cascadeable specified value which when computed gets us the same thing... | diff --git a/style/properties/helpers.mako.rs b/style/properties/helpers.mako.rs
index 43b3d7bda..4a49673db 100644
--- a/style/properties/helpers.mako.rs
+++ b/style/properties/helpers.mako.rs
@@ -147,6 +147,12 @@
fn to_computed_value(&self, context: &Context) -> computed_value::T {
... | 18 | 574 | 48 |
87e7526dbfcc10d1dcdb4456ef7bdf5a3f43b531 | Anthony Ramine | 2016-09-22T17:10:05 | servo: Merge #13351 - Update Cargo and Rust (from servo:rustup); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: b86420d693d411a0d42a07574dbf4b2f867d0e28 | diff --git a/script/dom/extendableevent.rs b/script/dom/extendableevent.rs
index 76756b40c..ffb6c3baa 100644
--- a/script/dom/extendableevent.rs
+++ b/script/dom/extendableevent.rs
@@ -51,7 +51,7 @@ impl ExtendableEvent {
}
// https://w3c.github.io/ServiceWorker/#wait-until-method
- pub fn WaitUntil(&sel... | 2 | 42 | 42 |
793b36b6de7e1dc4f460103b0b3a977326054c80 | Martin Robinson | 2016-09-22T11:37:10 | servo: Merge #13331 - Add support for background-repeat: space and round (from mrobinson:background-repeat); r=emilio
<!-- Please describe your changes on the following line: -->
Add support for new background-repeat modes and upgrade Euclid, which now has support for basic arithmetic with Size2D.
---
<!-- Thank you... | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index 0c2cd16b0..27ed5d6ac 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -1148,6 +1148,10 @@ pub struct ImageDisplayItem {
/// direction to tile the entire bounds.
pub stretch_size: Size2D<Au>,
+ /// The amount of spac... | 9 | 161 | 64 |
a43c9caedb2c2aa25331a598b5f36a49156205ab | Bobby Holley | 2016-09-22T00:59:52 | servo: Merge #13172 - stylo: avoid traversing non element/text nodes in style and layout (from bholley:display_enum); r=emilio
r? @emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 614e9ca840baacfa427ec78db99258a83b75e135 | diff --git a/script/layout_wrapper.rs b/script/layout_wrapper.rs
index 5411deb91..19e6c7c4e 100644
--- a/script/layout_wrapper.rs
+++ b/script/layout_wrapper.rs
@@ -58,7 +58,8 @@ use style::attr::AttrValue;
use style::computed_values::display;
use style::context::SharedStyleContext;
use style::data::PrivateStyleData... | 4 | 68 | 35 |
aeb268b3de31a143c344eab142a306e1fbf06fc1 | Emilio Cobos Álvarez | 2016-09-21T22:46:01 | servo: Merge #13269 - stylo: Use the bindgen rewrite to generate the bindings (from emilio:new-bindgen); r=Manishearth
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropri... | diff --git a/style/properties/gecko.mako.rs b/style/properties/gecko.mako.rs
index 1f75fdb57..c4f34be3e 100644
--- a/style/properties/gecko.mako.rs
+++ b/style/properties/gecko.mako.rs
@@ -1640,7 +1640,7 @@ clip-path
fn init_shape(clip_path: &mut StyleClipPath, ty: StyleBasicShapeType) -> &mut StyleBas... | 1 | 2 | 2 |
6239d1a25820767320d1533fb363265ff12c8d59 | Tetsuharu OHZEKI | 2016-09-21T11:16:13 | servo: Merge #13349 - Update mozjs_sys to fix the build failure on macOS Sierra (from saneyuki:update-mozjs-to-fix-build-on-sierra); r=Ms2ger
- https://github.com/servo/servo/issues/13348
- This only fixes the failure to compile mozjs_sys. Linking problem with xcode 8 is still opened (https://github.com/servo/servo/is... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index e3b03e9f8..3b91d9771 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -1392,7 +1392,7 @@ dependencies = [
[[package]]
name = "mozjs_sys"
version = "0.0.0"
-source = "git+https://github.com/servo/mozjs#87c47526cfe64c1ccfb98daaaa14f63de6295be4"
+source = "g... | 1 | 1 | 1 |
5f50d1b2ea7e3a1a511992dbd0eb3065e2970fc4 | Glenn Watson | 2016-09-21T00:19:21 | servo: Merge #13309 - webgl: FBO support preparation (from anholt:webgl-fbo-prep); r=emilio
<!-- Please describe your changes on the following line: -->
Sending this PR now so that we can get the webrender patches merged. This is prep for the webgl-fbo series, with one small fix for some conformance tests.
---
<!-- ... | diff --git a/layout/webrender_helpers.rs b/layout/webrender_helpers.rs
index c6da8f2d1..dacc82783 100644
--- a/layout/webrender_helpers.rs
+++ b/layout/webrender_helpers.rs
@@ -427,9 +427,12 @@ impl WebRenderDisplayItemConverter for DisplayItem {
if let Some(id) = item.webrender_image.key {
... | 4 | 73 | 3 |
f154dd04dbb4e610f2bdfe5208649bd6f156acf1 | Ying-Ruei Liang(KK) | 2016-09-20T22:42:11 | servo: Merge #12493 - Implement referrer policy delivery via noreferrer link relation (from TheKK:referrer_policy_dliver_via_rel); r=jdm
According to https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-delivery, there's `<a>`, `<link>` and `<area>` could apply this delivery method. This PR contains change... | diff --git a/script/document_loader.rs b/script/document_loader.rs
index 04e266994..0fc1e5e06 100644
--- a/script/document_loader.rs
+++ b/script/document_loader.rs
@@ -7,7 +7,7 @@
use dom::bindings::js::JS;
use dom::document::Document;
-use msg::constellation_msg::PipelineId;
+use msg::constellation_msg::{Pipeline... | 8 | 45 | 33 |
1fbb6e7bc2aaa20cc56281bc5ec4f2d4c2a0a744 | Ms2ger | 2016-09-20T12:04:38 | servo: Merge #13334 - Inline push_pending_frame into its callers (from servo:push_pending_frame); r=nox
The recently added replace argument makes it less readable, especially with
the second boolean argument I am adding in #11893.
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d7e747acb7815dfc0cabeed8b... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index 081f9c1eb..fa10a76bb 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -612,18 +612,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
self.pipelines.insert(pipeline_id, pipeline);
... | 1 | 24 | 16 |
be1fa5a5299d3b1605bb11f35efedcce65dc4806 | Patrick Walton | 2016-09-20T03:45:55 | servo: Merge #13329 - layout: Make `baseline_offset_of_last_line_box_in_flow()` only check blocks in flow (from pcwalton:last-line-in-flow); r=notriddle
Improves python.org.
Closes #12124.
r? @notriddle
Source-Repo: https://github.com/servo/servo
Source-Revision: 53938c439f3a0c2b3c3d734346ca291e1eb703a5 | diff --git a/layout/flow.rs b/layout/flow.rs
index 2476e2431..36b8da6cc 100644
--- a/layout/flow.rs
+++ b/layout/flow.rs
@@ -1405,7 +1405,8 @@ impl<'a> ImmutableFlowUtils for &'a Flow {
return kid.as_inline().baseline_offset_of_last_line()
}
if kid.is_block_like() &&
- ... | 1 | 2 | 1 |
57a9837d442b244260bebd2a05b4179c49d0a0c4 | Glenn Watson | 2016-09-20T02:47:40 | servo: Merge #13330 - Update webrender (prim cache changes, blend/composite shaders) (from glennw:update-wr-prim-cache); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: f313beee9bf70a73d1b0d06b1e36e67ad9e28deb | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index da5fd990b..647b62e58 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2643,7 +2643,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#37dab545df3a9b6aa5e762f59272eb3d37227476"
+source ... | 1 | 2 | 2 |
a8be98eb400eee36083dfb068b9bbb62e4e1a8e8 | Patrick Walton | 2016-09-20T00:22:29 | servo: Merge #13302 - layout: Disable the speculation of block formatting contexts' inline sizes if the block formatting contexts have negative margins (from pcwalton:negative-margin-speculation); r=notriddle
The heuristics that determine how and whether floats flow into the
margins are not valid in that case.
Close... | diff --git a/layout/block.rs b/layout/block.rs
index 2b7f17729..1c7925feb 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1666,33 +1666,40 @@ impl BlockFlow {
// Now compute the real value.
self.propagate_and_compute_used_inline_size(shared_context);
- // Now for some speculation.
- ... | 1 | 33 | 26 |
d2942258a71a6d2442f2c693ce64002a1825713c | Eric Anholt | 2016-09-19T21:41:49 | servo: Merge #13324 - Update offscreen_gl_context dependency to get webgl fix (from anholt:webgl-default-texture); r=jdm
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with approp... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index aea8413c4..da5fd990b 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -235,7 +235,7 @@ dependencies = [
"ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"n... | 1 | 8 | 9 |
3b0ae1f3d9c69abe31f2bb7115b856e5d9eed582 | Josh Matthews | 2016-09-19T20:37:16 | servo: Merge #13322 - Make dummy font implementation conform to API changes (from jdm:msvc-build-fix); r=KiChjang
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13321
- [X] There are tests for these changes
Source-Repo: https://github.co... | diff --git a/gfx/platform/dummy/font_template.rs b/gfx/platform/dummy/font_template.rs
index 5e38165a7..3e1145fcb 100644
--- a/gfx/platform/dummy/font_template.rs
+++ b/gfx/platform/dummy/font_template.rs
@@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain on... | 1 | 4 | 3 |
2415c96feb589cc17be23667738a87c712f9ba5b | Connor Brewster | 2016-09-19T19:32:45 | servo: Merge #13167 - Replace current session entry when reloading (from cbrewster:reload_replace_current); r=asajeffrey
<!-- Please describe your changes on the following line: -->
This PR adds a replacement option when navigating. It replaces the current session history entry after a new page has been loaded. This w... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index e501312e2..081f9c1eb 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -259,6 +259,10 @@ impl Frame {
fn remove_forward_entries(&mut self) -> Vec<FrameState> {
replace(&mut self.next, vec!(... | 9 | 82 | 53 |
5f261493e716f0be9cefdf7c785b8904fbcea8f1 | Ms2ger | 2016-09-19T16:37:31 | servo: Merge #13320 - Update js (from servo:js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0b0495cff4c0062f1def279c8079ca76c58aef23 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index d1cef1d36..aea8413c4 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -1112,7 +1112,7 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.3"
-source = "git+https://github.com/servo/rust-mozjs#223b907b8288e672ef304aa558f521b8f7f16762"
+source = "git... | 1 | 1 | 1 |
9471ad88d3fddf88a8bda6b6c3171f89ce595f72 | Josh Matthews | 2016-09-19T14:14:55 | servo: Merge #12076 - Make font template data load fallible (from jdm:font-load); r=pcwalton
Remove a TODO around dealing with a failed file operation.
Can we write an automated test for this? I don't really know what font template data is, but this failure seems to be fontconfig-specific...
---
- [X] `./mach build ... | diff --git a/gfx/font_cache_thread.rs b/gfx/font_cache_thread.rs
index 055216a94..26fcd6b98 100644
--- a/gfx/font_cache_thread.rs
+++ b/gfx/font_cache_thread.rs
@@ -96,8 +96,9 @@ impl FontTemplates {
}
}
- let template = FontTemplate::new(identifier, maybe_data);
- self.templates.p... | 4 | 29 | 25 |
9954c9c920fbb100d79b47e8c4eabfe645dc8101 | Emilio Cobos Álvarez | 2016-09-19T12:29:11 | servo: Merge #13319 - constellation: Minor refactoring to aid legibility (from emilio:constellation-refactoring); r=Ms2ger
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appr... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index a57bc38df..e501312e2 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -1924,28 +1924,34 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
self.pipelines.get(&old_pipeline_id).and_... | 1 | 27 | 21 |
bd732d4e30d040b7c50b6be97989bc87e2cdbaa9 | Julien Enselme | 2016-09-19T09:07:14 | servo: Merge #13306 - Decode UTF-8 with from_utf8_lossy in DedicatedWorkerGlobalScope (from Jenselme:13247-decode-utf8-with-utf8-lossy); r=Ms2ger
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and... | diff --git a/script/dom/dedicatedworkerglobalscope.rs b/script/dom/dedicatedworkerglobalscope.rs
index 2314d94f1..589489deb 100644
--- a/script/dom/dedicatedworkerglobalscope.rs
+++ b/script/dom/dedicatedworkerglobalscope.rs
@@ -173,20 +173,20 @@ impl DedicatedWorkerGlobalScope {
let roots = RootCollecti... | 1 | 7 | 7 |
4b7104c1e150fccaab4d372d72880caa23a3734d | Taryn Hill | 2016-09-19T05:44:05 | servo: Merge #13314 - Update string_cache to 0.2.29 (from Phrohdoh:update-string_cache-to29patch); r=KiChjang
<!-- Please describe your changes on the following line: -->
Update string-cache from 0.2.28 to 0.2.29 which includes `minlength` for #13313.
---
<!-- Thank you for contributing to Servo! Please replace each ... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index a8fe07df4..d1cef1d36 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -819,7 +819,7 @@ dependencies = [
"servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simd 0.1.1 (git+https://github.com/huonw/simd)",
"smallvec 0.1.8 ... | 1 | 11 | 11 |
8270b0812f225e33a58670a18e7fe6a4767666a1 | jmr0 | 2016-09-19T02:21:45 | servo: Merge #13227 - Pipeline visibility logic change (from jmr0:pipeline_visibility); r=jdm
<!-- Please describe your changes on the following line: -->
cc @paulrouget @jdm
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate ... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index ba5a4353d..a57bc38df 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -548,6 +548,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
fn new_pipeline(&mut self,
pipel... | 2 | 22 | 11 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.