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 |
|---|---|---|---|---|---|---|---|
a057d07cb45c5aafef893af65fd7d0e0d375faf7 | Travis Dean | 2016-07-04T23:52:19 | servo: Merge #12243 - Add style check and test for else braces (from TravisDean:else-brace-check); r=ConnorGBrewster
<!-- Please describe your changes on the following line: -->
Added a regex check to enforce project style guidelines. Added unit check. Catches:
```
}
else {
```
when it should be
`} else {`
---
<!-- T... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 9e540b7d7..bc450c44c 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -2261,8 +2261,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
rendergl::render_scene(layer.clone(), context, &self.... | 6 | 18 | 20 |
297c60796c0f2082c7d7f0dc161258cfe65fc8c7 | Per Lundberg | 2016-07-04T20:53:05 | servo: Merge #12240 - Use if let rather than match (from perlun:fix/use-if-let); r=ConnorGBrewster
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #12236
- [ ] There are tests for these changes OR
- [X] These changes do not require tests b... | diff --git a/servo/lib.rs b/servo/lib.rs
index 96296b92f..8ef09eb06 100644
--- a/servo/lib.rs
+++ b/servo/lib.rs
@@ -237,12 +237,8 @@ fn create_constellation(opts: opts::Opts,
layout_thread::LayoutThread,
script::script_thread::ScriptThread>::start(initial_state);
- ... | 1 | 2 | 6 |
9948ded4cf7a10aba08de4e9c31a2091fd60a53d | Anthony Ramine | 2016-07-04T19:57:00 | servo: Merge #12224 - Remove some stuff from util (from nox:die-util-die); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 3b0dadda529a5ba45a8a0dc394187f43a66e7c1f | diff --git a/canvas/canvas_paint_thread.rs b/canvas/canvas_paint_thread.rs
index 1faf41a9a..c69b2039c 100644
--- a/canvas/canvas_paint_thread.rs
+++ b/canvas/canvas_paint_thread.rs
@@ -19,7 +19,6 @@ use std::borrow::ToOwned;
use std::mem;
use util::opts;
use util::thread::spawn_named;
-use util::vec::byte_swap;
use... | 36 | 109 | 174 |
c113cfd0ea3a44e2611c86de0671961b6c3a4ef2 | Zhen Zhang | 2016-07-04T16:15:23 | servo: Merge #11875 - Integration and improvements of File API backends (from izgzhen:file-manager-backend); r=Manishearth
Basically three major changes:
1. More complete origin check in `FileManagerThreadMsg`
2. Add reference counting logic to file manage store and script API
3. Integrate the support of slicing
r? ... | diff --git a/net/blob_loader.rs b/net/blob_loader.rs
index 37665da86..1008b405e 100644
--- a/net/blob_loader.rs
+++ b/net/blob_loader.rs
@@ -2,60 +2,32 @@
* 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 filemanager_thread::Bl... | 12 | 528 | 230 |
9002eb84c924e2de0417f44e033dffbf47e44b22 | James Raspass | 2016-07-04T14:57:36 | servo: Merge #12218 - WebDriver: Fix POST /session/:session_id/elements to return multiple (from JRaspass:master); r=jdm
Very unfamiliar with rust, but I'm trying to test servo with my Perl WebDriver module ( https://metacpan.org/pod/WebDriver::Tiny ) and fix any issues I come across. I hope to make my next commit imp... | diff --git a/webdriver_server/lib.rs b/webdriver_server/lib.rs
index 7e060d74c..586bbac1d 100644
--- a/webdriver_server/lib.rs
+++ b/webdriver_server/lib.rs
@@ -561,8 +561,8 @@ impl Handler {
}
let (sender, receiver) = ipc::channel().unwrap();
- try!(self.frame_script_command(WebDriverScriptC... | 1 | 2 | 2 |
fd94cf5b4e6b1e3f334ab06572f58987b6c590f5 | Anthony Ramine | 2016-07-04T12:53:14 | servo: Merge #12214 - Skip the root node in querySelectorAll (from nox:queryselector); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 3c51290f9e3bb5a1b4118671f24fba219abeabc8 | diff --git a/script/dom/node.rs b/script/dom/node.rs
index ec370dff2..871eb4b13 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -740,7 +740,10 @@ impl Node {
Err(()) => Err(Error::Syntax),
// Step 3.
Ok(selectors) => {
- Ok(QuerySelectorIterator::new(sel... | 1 | 4 | 1 |
edce28042208601b5643121103c2c5c45dadb4a9 | Zhen Zhang | 2016-07-04T03:16:39 | servo: Merge #12196 - Emit change event when files are selected (from izgzhen:emit-change-file-select); r=Manishearth
<!-- Please describe your changes on the following line: -->
r? @Manishearth
As specified in step 6 of [activation behaviour](https://html.spec.whatwg.org/multipage/forms.html#file-upload-state-(type... | diff --git a/script/dom/htmlinputelement.rs b/script/dom/htmlinputelement.rs
index 6c3b008bf..4b2ff4013 100644
--- a/script/dom/htmlinputelement.rs
+++ b/script/dom/htmlinputelement.rs
@@ -1150,6 +1150,7 @@ impl Activatable for HTMLInputElement {
EventCancelable::NotCancelable);
... | 1 | 19 | 1 |
a12e6a9755e9ba4a0319a9b0026ae9aad24a92aa | Johann Hofmann | 2016-07-04T01:32:15 | servo: Merge #12050 - Switch to a faster Brotli crate (from johannhof:brotli); 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: -->
- [x] `./mach build ... | diff --git a/net/Cargo.toml b/net/Cargo.toml
index 8ee59cfb9..2ee5e73bb 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies]
bitflags = "0.7"
-brotli = {git = "https://github.com/ende76/brotli-rs"}
+brotli = "1.0.6"
content-blocker = "0.2"
cookie = { version = "0.2.5",... | 3 | 13 | 5 |
77c942c81ddc1e397e4d6244a6ac2ba189e40397 | Emilio Cobos Álvarez | 2016-07-03T19:51:15 | servo: Merge #12185 - style: Do not re-expire animations (from emilio:dont-reexpire-animations); r=nox
<!-- 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/style/animation.rs b/style/animation.rs
index eb9dc9fd3..87184928e 100644
--- a/style/animation.rs
+++ b/style/animation.rs
@@ -83,6 +83,7 @@ impl<Impl: SelectorImplExt> KeyframesAnimationState<Impl> {
/// Returns true if the animation should keep running.
pub fn tick(&mut self) -> bool {
... | 2 | 18 | 5 |
b0263c1e946ddc58b1c435607750bc2de3900cdd | Zhen Zhang | 2016-07-03T18:59:26 | servo: Merge #12195 - Fix Blob URL origin when scheme is file (from izgzhen:fix-url-blob); r=Manishearth
<!-- Please describe your changes on the following line: -->
r? @Manishearth
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appro... | diff --git a/script/dom/url.rs b/script/dom/url.rs
index c6d23bd7d..2a41f7c7b 100644
--- a/script/dom/url.rs
+++ b/script/dom/url.rs
@@ -117,7 +117,7 @@ impl URL {
pub fn CreateObjectURL(global: GlobalRef, blob: &Blob) -> DOMString {
/// XXX: Second field is an unicode-serialized Origin, it is a temporary... | 1 | 14 | 1 |
198bbfccd8cf2783aecc7a5cfa6c3a021bb03003 | Corey Farwell | 2016-07-03T18:07:12 | servo: Merge #12190 - Minor MIME renaming and aliasing cleanup (from frewsxcv:mime-renaming); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 194fb3e199922ef0e1ce7943036800ecac5bbfe3 | diff --git a/net/about_loader.rs b/net/about_loader.rs
index 56b4f5d28..e5b1756ca 100644
--- a/net/about_loader.rs
+++ b/net/about_loader.rs
@@ -6,7 +6,7 @@ use file_loader;
use hyper::header::ContentType;
use hyper::http::RawStatus;
use hyper::mime::{Mime, SubLevel, TopLevel};
-use mime_classifier::MIMEClassifier;
... | 9 | 56 | 54 |
22d3d20888ccfaef1e81098a1e1984b8b7f4e793 | Andre Silva | 2016-07-03T14:26:53 | servo: Merge #12175 - Remove unnecessary uses of unwrap in ImageCache::handle_cmd (from andrebeat:fix-handle-cmd-unwrap); r=ConnorGBrewster
<!-- Please describe your changes on the following line: -->
Remove unnecessary uses of unwrap in `ImageCache::handle_cmd`.
---
<!-- Thank you for contributing to Servo! Please ... | diff --git a/net/image_cache_thread.rs b/net/image_cache_thread.rs
index 3991c5553..fd6f62ebb 100644
--- a/net/image_cache_thread.rs
+++ b/net/image_cache_thread.rs
@@ -406,11 +406,11 @@ impl ImageCache {
}
ImageCacheCommand::GetImageIfAvailable(url, use_placeholder, consumer) => {
... | 1 | 2 | 2 |
9dfba5d9e4fb87275f734e0a70bdddaab2e231a5 | Michael Howell | 2016-07-03T13:35:01 | servo: Merge #12159 - Do not crash on partial calc interpolation (from notriddle:fix_interpolate_cleanup_regression); r=emilio
It should always be possible to interpolate between CalcLengthOrPercentage points.
____
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
... | diff --git a/style/properties/helpers/animated_properties.mako.rs b/style/properties/helpers/animated_properties.mako.rs
index 52b2e181f..504a72cf4 100644
--- a/style/properties/helpers/animated_properties.mako.rs
+++ b/style/properties/helpers/animated_properties.mako.rs
@@ -324,8 +324,8 @@ impl Interpolate for CalcLe... | 1 | 2 | 2 |
af6a9f3cc5f3258641117e2f5b000d30df4826d7 | Matt Brubeck | 2016-07-02T17:49:09 | servo: Merge #12112 - Update image (from mbrubeck:always-be-updating); r=ConnorGBrewster
Fixes #12094
Source-Repo: https://github.com/servo/servo
Source-Revision: c47b7944b03febb624ee36654e2e2cc2d20fb783 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index f97e69f73..7103bee63 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -326,7 +326,7 @@ dependencies = [
"euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"gleam 0.2.19 (registry+https://github.com/rust-lang/cra... | 1 | 8 | 8 |
4a7f39ed04ccefaee12ec01ffb5154febd830d35 | Patrick Trottier | 2016-07-02T15:13:21 | servo: Merge #12113 - Removing u8 from HTMLIframeElement.rs file (from Coder206:u8); r=mbrubeck,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: -->
- ... | diff --git a/script/dom/htmliframeelement.rs b/script/dom/htmliframeelement.rs
index 3c5377b8c..f279c2cff 100644
--- a/script/dom/htmliframeelement.rs
+++ b/script/dom/htmliframeelement.rs
@@ -50,15 +50,17 @@ use style::context::ReflowGoal;
use url::Url;
use util::prefs::mozbrowser_enabled;
-#[derive(HeapSizeOf)]
-... | 1 | 21 | 19 |
de0cf73813a4f5f3cf0f75b380f7ed80e469750a | Emilio Cobos Álvarez | 2016-07-01T21:12:54 | servo: Merge #11946 - style: Remove the Mutex from new_animations_sender by moving it to the local StyleContext (from emilio:animations-sender); r=bholley
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is comp... | diff --git a/layout/context.rs b/layout/context.rs
index 11cfed0d1..082375796 100644
--- a/layout/context.rs
+++ b/layout/context.rs
@@ -25,15 +25,14 @@ use std::hash::BuildHasherDefault;
use std::rc::Rc;
use std::sync::{Arc, Mutex, RwLock};
use style::context::{LocalStyleContext, StyleContext};
-use style::matching... | 9 | 93 | 64 |
c74a363f37cddb8345755f16083d1d9372893b85 | Alex Gaynor | 2016-07-01T15:50:46 | servo: Merge #12035 - Disable TLS compression (from alex:patch-1); r=frewsxcv
<!-- 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] `./mach build -d` doe... | diff --git a/net/connector.rs b/net/connector.rs
index 23aaf9f55..598589479 100644
--- a/net/connector.rs
+++ b/net/connector.rs
@@ -4,7 +4,7 @@
use hyper::client::Pool;
use hyper::net::{HttpStream, HttpsConnector, SslClient};
-use openssl::ssl::{SSL_OP_NO_SSLV2, SSL_OP_NO_SSLV3, SSL_VERIFY_PEER};
+use openssl::ssl... | 1 | 2 | 2 |
ea72e1fbac01888a285e16ff71d02df1dab848f1 | Ms2ger | 2016-07-01T14:58:50 | servo: Merge #12008 - Reorder code in KeyframesAnimation::from_keyframes() to avoid a panic (from servo:keyframes); r=Manishearth
Fixes #11999.
Fixes #12006.
Source-Repo: https://github.com/servo/servo
Source-Revision: b2a32ec028156170e63a07c072120db89923e6af | diff --git a/style/keyframes.rs b/style/keyframes.rs
index cbfa35b78..7d2197588 100644
--- a/style/keyframes.rs
+++ b/style/keyframes.rs
@@ -154,8 +154,12 @@ fn get_animated_properties(keyframe: &Keyframe) -> Vec<TransitionProperty> {
impl KeyframesAnimation {
pub fn from_keyframes(keyframes: &[Keyframe]) -> Op... | 1 | 5 | 1 |
b33d715fdada55f6ce7a3cf7e64cd2278ed10917 | Ms2ger | 2016-07-01T13:57:15 | servo: Merge #12030 - Don't panic in LayoutThread::exit_now() if the paint thread is gone a… (from servo:exit-now); r=Manishearth
Fixes #11996.
Fixes #12005.
Fixes #12007.
Fixes #12011.
Fixes #12026.
Source-Repo: https://github.com/servo/servo
Source-Revision: 210265d30f46cbf12142bf7495493a14497ed1f5 | diff --git a/layout_thread/lib.rs b/layout_thread/lib.rs
index b33a5c56e..e6b716751 100644
--- a/layout_thread/lib.rs
+++ b/layout_thread/lib.rs
@@ -772,7 +772,7 @@ impl LayoutThread {
traversal.shutdown()
}
- self.paint_chan.send(LayoutToPaintMsg::Exit).unwrap();
+ let _ = self.pa... | 1 | 1 | 1 |
919435a9b953d134524628ae962d0672dbd81bee | Connor Brewster | 2016-07-01T13:04:38 | servo: Merge #11974 - Change load blocker drop assert to debug_assert (from cbrewster:load_blocker_drop_debug_assert); r=asajeffrey
<!-- Please describe your changes on the following line: -->
This was causing some crashes for myself and @glennw in browser.html
I will open an issue for this to be investigated later.
... | diff --git a/script/document_loader.rs b/script/document_loader.rs
index 82e015eef..a68038572 100644
--- a/script/document_loader.rs
+++ b/script/document_loader.rs
@@ -86,7 +86,7 @@ impl LoadBlocker {
impl Drop for LoadBlocker {
fn drop(&mut self) {
if !thread::panicking() {
- assert!(self.lo... | 1 | 1 | 1 |
0d81d2a07180df1bea147aec4e32d8944e9a8453 | Patrick Walton | 2016-07-01T05:07:23 | servo: Merge #11979 - Update Glutin to pick up borderless window performance fixes on Mac (from ConnorGBrewster:glutinupupup)
Source-Repo: https://github.com/servo/servo
Source-Revision: 4f81384d6132aa3778293ce3bb26a489325fddc3 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index cf6978ecc..f97e69f73 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -288,7 +288,7 @@ dependencies = [
[[package]]
name = "cocoa"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
... | 1 | 5 | 5 |
9ae99604e9247626e04db9e9e06a2901324a1129 | Manish Goregaokar | 2016-07-01T03:43:02 | servo: Merge #11953 - Bump default resolution to 1024x768 (from Manishearth:more-res)
Source-Repo: https://github.com/servo/servo
Source-Revision: 5d225d9d667b469fc41ff543f3e84fef45555ace | diff --git a/util/opts.rs b/util/opts.rs
index 1fe76f96d..a55d7e556 100644
--- a/util/opts.rs
+++ b/util/opts.rs
@@ -486,7 +486,7 @@ pub fn default_opts() -> Opts {
trace_layout: false,
devtools_port: None,
webdriver_port: None,
- initial_window_size: Size2D::typed(800, 600),
+ ... | 1 | 3 | 3 |
a0b047bffaa086505f39c17037d00fa729b89e6e | Lars Bergstrom | 2016-07-01T02:26:47 | servo: Merge #11977 - Rollup of 2 pull requests (from larsbergstrom:rollup); r=larsbergstrom
- Successful merges: #11975, #11976
- Failed merges:
Source-Repo: https://github.com/servo/servo
Source-Revision: 63d99c188cbc37a907e887a61e762300f60960d6 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 5f6278f11..cf6978ecc 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.2.2 (registry+https://github.com/rust-lang/c... | 1 | 3 | 3 |
d8db5c9db503fbed139be3586f0ccfcbd7430844 | Glenn Watson | 2016-07-01T00:41:47 | servo: Merge #11973 - Update WR for demo fixes (from glennw:demo-fix); r=ConnorGBrewster
<!-- 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: -->
- [ ] `./mach bu... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index fd9f2a122..5f6278f11 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2585,7 +2585,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.1.0"
-source = "git+https://github.com/servo/webrender#f69f9a1a4cf31c60dc03480abfd0a74aeb305f9c"
+source ... | 1 | 1 | 1 |
efe54d6cb4580e8d7d70d08f11c3701ef59d8a2b | Paul Rouget | 2016-06-30T12:14:33 | servo: Merge #11954 - update browserhtml (from paulrouget:bhtmlUpdate); r=Wafflespeanut
Another browserhtml update to pick performance improvements.
Source-Repo: https://github.com/servo/servo
Source-Revision: 2ff6c3526313b9c0467e26f0236ae2578b7e57c5 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 8e7015032..fd9f2a122 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.2.2 (registry+https://github.com/rust-lang/c... | 1 | 3 | 3 |
ddd7b76d35589362a36dd5cc4bf950b59b59a6aa | Paul Rouget | 2016-06-30T10:18:11 | servo: Merge #11951 - browerhtml update (from paulrouget:bhtmlUpdate); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 2b2b6a3d0c011143ea133e415c6adf3a34bcfbdd | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index d0af1efd0..8e7015032 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.2.2 (registry+https://github.com/rust-lang/c... | 1 | 3 | 3 |
3d3a2d6cb52c795a9aeaeba8cfaec7d2fd70c61d | Patrick Walton | 2016-06-30T09:03:43 | servo: Merge #11949 - compositing: Only recomposite after a scroll if layers actually moved, and fix the jerky scrolling "pops" during flings on Mac (from servo:wr); r=glennw
See the comments in compositor.rs for more details.
Fixes #11658.
Source-Repo: https://github.com/servo/servo
Source-Revision: 26d2ee635589776... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 256612f75..92283558b 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -220,6 +220,9 @@ pub struct IOCompositor<Window: WindowMethods> {
/// Pending scroll/zoom events.
pending_scroll_zoom_events: Vec<ScrollZoomEv... | 3 | 88 | 21 |
1abe40e76d82f27a8e29d436ae159552265bf4b2 | Josh Matthews | 2016-06-29T22:39:58 | servo: Merge #11934 - Special-case setting location.hash to the empty string (from jdm:navigatefragment); r=emilio
This avoids endless redirect loops on facebook and makes us compliant with https://github.com/whatwg/html/pull/1318.
---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does n... | diff --git a/script/dom/location.rs b/script/dom/location.rs
index 9fff2a458..72361193a 100644
--- a/script/dom/location.rs
+++ b/script/dom/location.rs
@@ -66,7 +66,10 @@ impl LocationMethods for Location {
}
// https://html.spec.whatwg.org/multipage/#dom-location-hash
- fn SetHash(&self, value: USVStri... | 1 | 4 | 1 |
41e0453ed3bb15db7b21aad0f925984df16f14d3 | Josh Matthews | 2016-06-29T21:47:57 | servo: Merge #11932 - Print out useful SSL-related information on SSL error page (from jdm:servoorg-cert); r=asajeffrey
Make certificate error pages more useful. Attempt to identify known cases where upgrading OpenSSL would be useful.
<img width="553" alt="screen shot 2016-06-29 at 12 29 30 pm" src="https://cloud.git... | diff --git a/net/http_loader.rs b/net/http_loader.rs
index 2855e38bf..593ae3e1e 100644
--- a/net/http_loader.rs
+++ b/net/http_loader.rs
@@ -33,6 +33,7 @@ use net_traits::hosts::replace_hosts;
use net_traits::response::HttpsState;
use net_traits::{CookieSource, IncludeSubdomains, LoadConsumer, LoadContext, LoadData};... | 4 | 44 | 11 |
61079d09064b1c85990f824ffde04679b180331a | Anthony Ramine | 2016-06-29T20:37:42 | servo: Merge #11930 - Remove some util stuff (from nox:die-util-die); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: dcc4697dde3ba8af32e233b302a16bea76af378a | diff --git a/compositing/delayed_composition.rs b/compositing/delayed_composition.rs
index c2ae4b86f..36c030601 100644
--- a/compositing/delayed_composition.rs
+++ b/compositing/delayed_composition.rs
@@ -10,8 +10,9 @@
use compositor_thread::{CompositorProxy, Msg};
use std::sync::mpsc::{Receiver, Sender, channel};
u... | 9 | 34 | 41 |
17297fb2c92e4a63c5f72a24403f793777c6d764 | Emilio Cobos Álvarez | 2016-06-29T18:28:01 | servo: Merge #11924 - style: Cleanup `Interpolate` code (from emilio:interpolate-cleanup); r=nox,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 appropriate data: -->
-... | diff --git a/style/properties/helpers/animated_properties.mako.rs b/style/properties/helpers/animated_properties.mako.rs
index 3b75b4ee0..552f5b303 100644
--- a/style/properties/helpers/animated_properties.mako.rs
+++ b/style/properties/helpers/animated_properties.mako.rs
@@ -25,9 +25,8 @@ use properties::longhands::ve... | 1 | 148 | 242 |
d4804081966341ac2b3dfabf97ff7ccd2908f877 | Alan Jeffrey | 2016-06-29T17:36:01 | servo: Merge #11906 - Added checks that selection is valid, and fix set_selection_range (from asajeffrey:textinput-ok-selection); r=ConnorGBrewster
<!-- Please describe your changes on the following line: -->
Fixed range checking for text inputs. Included some `debug_assert!` statements to check that the selection ra... | diff --git a/script/textinput.rs b/script/textinput.rs
index c724c2691..a56bd983f 100644
--- a/script/textinput.rs
+++ b/script/textinput.rs
@@ -215,6 +215,16 @@ impl<T: ClipboardProvider> TextInput<T> {
})
}
+ // Check that the selection is valid.
+ fn assert_ok_selection(&self) {
+ if let... | 1 | 20 | 4 |
7bad02fad9cce302d0b51a1f65d9044b946247cd | Josh Matthews | 2016-06-29T16:42:40 | servo: Merge #11913 - Avoid stalled pages containing unreachable stylesheets (from jdm:stylesheet-error); r=Ms2ger
This hits some of the pages in the performance testsuite, and leads to a poor user experience since the document load event is never dispatched and the page never finishes parsing.
---
- [X] `./mach buil... | diff --git a/script/dom/htmllinkelement.rs b/script/dom/htmllinkelement.rs
index ab2c2a998..0af076950 100644
--- a/script/dom/htmllinkelement.rs
+++ b/script/dom/htmllinkelement.rs
@@ -289,43 +289,46 @@ impl AsyncResponseListener for StylesheetContext {
}
fn response_complete(&mut self, status: Result<(), N... | 1 | 33 | 30 |
5225d77d1eccbfb0a2cf2f709cef572a4b804afc | Cameron Paul | 2016-06-29T14:05:35 | servo: Merge #11262 - Add `--version` flag (from campaul:add_version_flag); r=Manishearth
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy --faster` does not report any errors
- [X] These changes fix #11241 (github issue number if applicable).
Either:
- [ ] There are tests for these changes ... | diff --git a/servo/main.rs b/servo/main.rs
index bf4c0b14f..ca0eec179 100644
--- a/servo/main.rs
+++ b/servo/main.rs
@@ -40,6 +40,7 @@ use servo::Browser;
use servo::compositing::windowing::WindowEvent;
use servo::util::opts::{self, ArgumentParsingResult};
use servo::util::panicking::initiate_panic_hook;
+use std::p... | 2 | 14 | 0 |
52bf2544396edcecdfd284569a718778da102267 | Anthony Ramine | 2016-06-29T09:24:56 | servo: Merge #11909 - Use nightly feature of webrender_traits (from nox:wr-nightly); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 19cb3e99680427a7ae30dbbc11f550e35ecc4576 | diff --git a/script/Cargo.toml b/script/Cargo.toml
index a8262f832..d9bdeac84 100644
--- a/script/Cargo.toml
+++ b/script/Cargo.toml
@@ -72,4 +72,4 @@ xml5ever = {version = "0.1.2", features = ["unstable"]}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"
default_features = false
-fe... | 1 | 1 | 1 |
2cdd7633cfa54c9558201d244ba32b4179d9ee41 | Ms2ger | 2016-06-29T08:32:52 | servo: Merge #11900 - Various DisplayList cleanup (from Ms2ger:displaylist-cleanup); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: ffb8b35d3549ead90e0a05d492558bf8cabfbbe1 | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index ac93adcca..25b7c4607 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -215,13 +215,8 @@ pub struct DisplayList {
impl DisplayList {
pub fn new(mut root_stacking_context: StackingContext,
- items: &mut Option<... | 3 | 23 | 33 |
a1ef01d6e1a24f1be3d2d64e506b2b67eef201ce | Paul Rouget | 2016-06-29T05:26:38 | servo: Merge #11922 - browserhtml update (from paulrouget:bhtmlUpdate); r=glennw
<!-- Please describe your changes on the following line: -->
Fix #11905
Source-Repo: https://github.com/servo/servo
Source-Revision: 62f7e8fe4bff080b42831e087ee69428424927cc | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 1019302be..318f77533 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.2.2 (registry+https://github.com/rust-lang/c... | 1 | 3 | 3 |
ac81a124ce20b5e49d6e9455ff41be20368a990a | Michael Howell | 2016-06-29T03:43:07 | servo: Merge #11914 - Text fragment color merge (from notriddle:text_fragment_color_merge); r=jdm
The display list item for a line of text has a single color assigned for
it, so text fragments with different colors cannot be merged.
There is no issue number for this, as far as I know. I found this while
trying an int... | diff --git a/layout/construct.rs b/layout/construct.rs
index 40ffdc420..c7dcf0126 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -949,7 +949,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
// Modify the style as necessary. (See the comment in
// `properties::modify_s... | 2 | 10 | 5 |
ba0f651e568a24284c573df8c0172582e8c6b881 | Patrick Walton | 2016-06-29T02:01:42 | servo: Merge #11918 - gfx: Don't create paint threads when WebRender is in use (from pcwalton:wr-no-paint-threads); r=glennw
They're unused and just waste memory and process table entries.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 5c41cda9a51490b0764938a57218e7c19735104f | diff --git a/gfx/paint_thread.rs b/gfx/paint_thread.rs
index ed1d7568e..aa759ca6b 100644
--- a/gfx/paint_thread.rs
+++ b/gfx/paint_thread.rs
@@ -567,6 +567,12 @@ impl WorkerThreadProxy {
font_cache_thread: FontCacheThread,
time_profiler_chan: time::ProfilerChan)
-> Vec<WorkerTh... | 1 | 6 | 0 |
7b85167e371c3e8999c85142bb1b71d0c79dbb0f | Connor Brewster | 2016-06-28T19:58:06 | servo: Merge #11899 - Create Servo.app and dmg on mac package (from cbrewster:app_packaging); r=larsbergstrom
<!-- Please describe your changes on the following line: -->
This creates Servo.app and puts it in a dmg along with a symlink to `/Applications`.
---
<!-- Thank you for contributing to Servo! Please replace e... | diff --git a/util/resource_files.rs b/util/resource_files.rs
index 58d6a1744..d580b6f8a 100644
--- a/util/resource_files.rs
+++ b/util/resource_files.rs
@@ -39,20 +39,13 @@ pub fn resources_dir_path() -> PathBuf {
let mut path = env::current_exe().expect("can't get exe path");
// Follow symlink
path = pa... | 1 | 5 | 12 |
1efa20c995a2a91f70a5c9d4cce1babaf33f3f2b | Darin Minamoto | 2016-06-28T19:06:17 | servo: Merge #11824 - Use get_mut instead of get-remove-set in XHR send() (from DarinM223:master); r=KiChjang
<!-- Please describe your changes on the following line: -->
Mutates the header directly with get_mut instead of using get(), remove(), and set().
---
<!-- Thank you for contributing to Servo! Please replace e... | diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
index 3ac74d737..4b4290d3c 100644
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies]
devtools_traits = {path = "../devtools_traits"}
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
+hyper = { ... | 9 | 19 | 23 |
ebdd14ef0155b4529f805a73a8768887bc6c6a71 | Anthony Ramine | 2016-06-28T18:13:44 | servo: Merge #11892 - Use wrappers for GL IDs (from nox:webgl-wrappers); r=emilio
See https://github.com/servo/webrender_traits/pull/62.
Source-Repo: https://github.com/servo/servo
Source-Revision: dca85ae98d620723eb7466615d11a032c58d5ca3 | diff --git a/script/dom/bindings/trace.rs b/script/dom/bindings/trace.rs
index cd4a0f5d3..1d1433b26 100644
--- a/script/dom/bindings/trace.rs
+++ b/script/dom/bindings/trace.rs
@@ -96,7 +96,8 @@ use style::values::specified::Length;
use url::Origin as UrlOrigin;
use url::Url;
use uuid::Uuid;
-use webrender_traits::W... | 10 | 115 | 58 |
a254fd75b9c534e868e0fc84bb6b8a8b2a947dff | Simon Sapin | 2016-06-28T14:02:43 | servo: Merge #11884 - Replace usage of std::intrinsics::discriminant_value with `match` (from servo:antidiscrimination); r=nox
<!-- Please describe your changes on the following line: -->
Replace usage of `std::intrinsics::discriminant_value` with per-enum generated code that uses `match` expressions. The LLVM IR sho... | diff --git a/style/lib.rs b/style/lib.rs
index 9f777b281..bad7907f9 100644
--- a/style/lib.rs
+++ b/style/lib.rs
@@ -23,9 +23,6 @@
//! [cssparser]: ../cssparser/index.html
//! [selectors]: ../selectors/index.html
-// FIXME: replace discriminant_value with per-enum methods that use `match`?
-#![feature(core_intrinsi... | 3 | 99 | 63 |
f21b4e71a2a3bda3453b5e7f58ddc18af76735cb | Ms2ger | 2016-06-27T22:14:55 | servo: Merge #11834 - Add some documentation to the style crate (from servo:style-docs); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 3809e4a23dc1423caa78385d2bfa0ea4d6eabbcb | diff --git a/style/animation.rs b/style/animation.rs
index 299d1117f..4a399a973 100644
--- a/style/animation.rs
+++ b/style/animation.rs
@@ -2,6 +2,8 @@
* 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/. */
+//! CSS transitions and anim... | 21 | 123 | 21 |
fdb55f0eafac0382003c78b97381dd9dfabd0ae5 | Dan Robertson | 2016-06-26T08:19:14 | servo: Merge #10826 - Add webdriver commands for (Get|Add)Cookie (from danlrobertson:cookies); r=asajeffrey
Add the webdriver commands for GetCookie and AddCookie. In addition the basic messages for sending cookie data back and forth from the resource thread needed to be created and the handlers for those messages wer... | diff --git a/msg/Cargo.toml b/msg/Cargo.toml
index ac3a96780..a47e3f83d 100644
--- a/msg/Cargo.toml
+++ b/msg/Cargo.toml
@@ -24,3 +24,4 @@ serde_macros = "0.7"
url = {version = "1.0.0", features = ["heap_size", "serde"]}
util = {path = "../util", features = ["servo"]}
webrender_traits = {git = "https://github.com/se... | 16 | 206 | 12 |
0655c4c003d1a05ace7cb31ed92addb0273bd0ba | Michael Howell | 2016-06-25T23:40:34 | servo: Merge #11867 - Clean up code (from notriddle:master); r=jdm
[:grin:](http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule)
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because cleanup
Source-... | diff --git a/style/values.rs b/style/values.rs
index 88a025eb8..cd90e5f3b 100644
--- a/style/values.rs
+++ b/style/values.rs
@@ -1176,6 +1176,7 @@ pub mod specified {
#[derive(Clone, PartialEq, PartialOrd, Copy, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf, Deserialize, Serialize))]
+ /// An a... | 1 | 2 | 2 |
2947c205a79430ef66ac03cabf0f8e08b20677fb | Ms2ger | 2016-06-25T05:26:37 | servo: Merge #11852 - Move ChromeToPaintMsg to gfx_traits (from Ms2ger:ChromeToPaintMsg); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9ee0a01f66b4b6fcbfd86e0316d6aed35ef99ebf | diff --git a/compositing/Cargo.toml b/compositing/Cargo.toml
index 29d0c3c73..d5480587a 100644
--- a/compositing/Cargo.toml
+++ b/compositing/Cargo.toml
@@ -9,7 +9,6 @@ name = "compositing"
path = "lib.rs"
[dependencies]
-gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
script_traits = {path = "../sc... | 8 | 28 | 26 |
f812a13dfe370777c10688bbc76b0d638992008f | Davide Giovannini | 2016-06-25T04:34:37 | servo: Merge #11665 - Fixed issue #11651 (Do not fire a blur event when calling .focus() on… (from davideGiovannini:master); r=KiChjang
<!-- Please describe your changes on the following line: -->
Added check in `HTMLElement.Focus` to avoid requesting focus when the element already has it.
Added check in `Document.com... | diff --git a/script/dom/document.rs b/script/dom/document.rs
index a69537d3c..08c04bf2b 100644
--- a/script/dom/document.rs
+++ b/script/dom/document.rs
@@ -599,6 +599,9 @@ impl Document {
/// Reassign the focus context to the element that last requested focus during this
/// transaction, or none if no elemen... | 1 | 3 | 0 |
ebea4e99c773f21bb4622a361250a38ccf8eeeb4 | Alan Jeffrey | 2016-06-24T20:19:01 | servo: Merge #11695 - Removed some sources of panic from script thread (from asajeffrey:script-thread-dont-panic); r=Ms2ger
<!-- Please describe your changes on the following line: -->
**This PR needs some thought!**
It removes some sources of panic from script_thread.rs, caused by pipeline lookup failure. It's incom... | diff --git a/script/script_thread.rs b/script/script_thread.rs
index e4b68c495..a8e818467 100644
--- a/script/script_thread.rs
+++ b/script/script_thread.rs
@@ -1008,7 +1008,10 @@ impl ScriptThread {
let context = self.root_browsing_context();
match msg {
DevtoolScriptControlMsg::Evaluate... | 1 | 58 | 30 |
742f4382298d48084b5a256010aa57be5c8b99a8 | Jack Moffitt | 2016-06-24T00:22:47 | servo: Merge #11845 - Update angle and rust-mozjs to fix linking symbols for CEF (from metajack:updates-for-cef); r=jdm
<!-- Please describe your changes on the following line: -->
CEF linking is currently failing. This makes linking work. This is a partial fix for #8883.
---
<!-- Thank you for contributing to Servo! ... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index eff5e11ef..f5e2d6152 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "angle"
version = "0.1.0"
-source = "git+https://github.com/servo/angle?branch=servo#e... | 1 | 2 | 2 |
6ff00cb90c71a96c1fe754129caf4dbc76c7d42a | Guillaume Gomez | 2016-06-23T18:29:51 | servo: Merge #11832 - Fix insert-adjacent error (from GuillaumeGomez:insert-adjacent); r=nox
r? @nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 32f2ab70889a757cc89ef07f050dfed09a671224 | diff --git a/script/dom/element.rs b/script/dom/element.rs
index 0b639539f..479a73dee 100644
--- a/script/dom/element.rs
+++ b/script/dom/element.rs
@@ -2069,14 +2069,14 @@ impl ElementMethods for Element {
let context = match context.downcast::<Element>() {
Some(elem) if elem.local_name() != &ato... | 1 | 2 | 2 |
2051d102fd6ccd71cc83a16000fc67e8c8d10d97 | Ms2ger | 2016-06-23T17:39:17 | servo: Merge #11833 - Merge AuExtensionMethods and LocalToCss (from Ms2ger:LocalToCss); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 209be8113d7b917f1f1304c9224a161f78234660 | diff --git a/layout/query.rs b/layout/query.rs
index 3ce7b31bf..f5735c978 100644
--- a/layout/query.rs
+++ b/layout/query.rs
@@ -36,7 +36,7 @@ use style::properties::longhands::{display, position};
use style::properties::style_structs;
use style::selector_impl::PseudoElement;
use style::servo::Stylist;
-use style::v... | 10 | 31 | 40 |
cb8b266c75990c139a8ddffe82642cf5cddf98a1 | mrmiywj | 2016-06-23T15:58:54 | servo: Merge #11735 - add reload keyboard shortcut (from mrmiywj:reload-page-shortcut); 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: -->
- [X] `./ma... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index a987bd7bd..1c37c0df1 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -1341,6 +1341,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.start_shutting_down();
}
... | 5 | 48 | 0 |
9ebe87eaeff83869f5ce003b2c262dfd33c9a981 | Simon Sapin | 2016-06-23T14:19:28 | servo: Merge #11835 - Use our copy of RefCell for style data (from servo:diy-as-unsafe-cell); r=nox
<!-- Please describe your changes on the following line: -->
This allows removing `#![feature(as_unsafe_cell)]` in geckolib and make progress towards #11815.
---
<!-- Thank you for contributing to Servo! Please replac... | diff --git a/layout/lib.rs b/layout/lib.rs
index 12769808d..e747993dd 100644
--- a/layout/lib.rs
+++ b/layout/lib.rs
@@ -2,7 +2,6 @@
* 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/. */
-#![feature(as_unsafe_cell)]
#![feature(box_patt... | 9 | 470 | 7 |
178af5793ac55d63689c4bbf0fe26cc184cab38e | Ms2ger | 2016-06-23T12:45:04 | servo: Merge #11831 - Make the STYLE_BLOOM global private (from Ms2ger:bloom); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 14dc1199dfe9c3815c580a73452e7bf4ba26998d | diff --git a/layout/traversal.rs b/layout/traversal.rs
index 9888db994..5db766f68 100644
--- a/layout/traversal.rs
+++ b/layout/traversal.rs
@@ -13,16 +13,12 @@ use gfx::display_list::OpaqueNode;
use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, RestyleDamage};
use scri... | 2 | 37 | 32 |
9360973a24a03770d9358c0f07418618c0685dd4 | Ms2ger | 2016-06-22T09:51:46 | servo: Merge #11819 - Remove the glutin_app feature from the servo crate (from servo:glutin-feature); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: a0a62ed3fdc023015fd59cf9358e0a0cc3b2bc9b | diff --git a/servo/Cargo.toml b/servo/Cargo.toml
index ba363a8f2..8e806baac 100644
--- a/servo/Cargo.toml
+++ b/servo/Cargo.toml
@@ -19,7 +19,7 @@ doc = false
bench = false
[features]
-default = ["glutin_app", "webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level"]
max_log_level = ["log/release_max... | 1 | 2 | 2 |
a728c038b9b47c4be8b9ab3fded2deadc6dc51df | Matt Brubeck | 2016-06-21T22:51:26 | servo: Merge #11752 - Minor code cleanup in layout (from mbrubeck:cleanup); r=pcwalton
r? @pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 47387a5c442c5a0167b5286fa1113124ba8d67db | diff --git a/layout/block.rs b/layout/block.rs
index f02cd54d5..94b7cc43b 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -49,7 +49,7 @@ use layout_debug;
use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none};
use model::{self, IntrinsicISizes, MarginCollapseInfo};
use rustc_serialize::{Enco... | 4 | 6 | 9 |
156fe97dbffd5898cee55c5d2735c035a99bd61e | Connor Brewster | 2016-06-21T13:53:15 | servo: Merge #11809 - Remove pipeline_to_frame_map (from cbrewster:remove_pipeline_to_frame_map); r=asajeffrey
<!-- Please describe your changes on the following line: -->
I think storing the `FrameId` on the `Pipeline` is cleaner than maintaining an extra `HashMap`. If not, I am ok with not making this change.
---
<... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index 62f19f3c2..1197912a2 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -128,9 +128,6 @@ pub struct Constellation<Message, LTF, STF> {
/// A list of all the frames
frames: HashMap<FrameId, Frame... | 2 | 27 | 24 |
ee644d2c913eebca1e62795aa1d1d849a3095432 | Ms2ger | 2016-06-20T22:00:13 | servo: Merge #11804 - Introduce a layout_thread crate; drop the dependency of layout on script (from Ms2ger:layout-thread-crate); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a94d3ee744fd0ff87bfe0548ba96927e64ce4b54 | diff --git a/layout/Cargo.toml b/layout/Cargo.toml
index c6b1727d1..9800610d6 100644
--- a/layout/Cargo.toml
+++ b/layout/Cargo.toml
@@ -21,7 +21,6 @@ gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-layout_traits = {path... | 9 | 191 | 103 |
19bfbbb8b1680ca1dc11f6600a9f26619fd1bbfe | Connor Imes | 2016-06-20T20:28:22 | servo: Merge #11785 - Update heartbeats-simple to 0.3.0 (from connorimes:update-hbs-0.3.0); r=metajack
Updated heartbeats-simple dependency for native changes:
-Collapse libraries into one.
-Remove overriding of some default CMake behavior.
-Windows compatibility with compiler flags, locking, and sleeping in example (... | diff --git a/profile/Cargo.toml b/profile/Cargo.toml
index 3a0e74321..ad7ab35a9 100644
--- a/profile/Cargo.toml
+++ b/profile/Cargo.toml
@@ -13,7 +13,7 @@ profile_traits = {path = "../profile_traits"}
plugins = {path = "../plugins"}
util = {path = "../util"}
ipc-channel = {git = "https://github.com/servo/ipc-channel... | 4 | 17 | 34 |
27c8fb3a2347fa1dcb3c673340900d61998be42a | Zhen Zhang | 2016-06-20T17:06:52 | servo: Merge #11757 - Implement filter for file-type input's accept attribute (from izgzhen:file-acccept-mime-filter); r=Manishearth
Now the two sides are pasted together with the new version of `mime_guess` landed.
I tested this thing locally with stuff like this:
```html
<input id="input_file" type="file" accept="... | diff --git a/net/Cargo.toml b/net/Cargo.toml
index 013df85f3..8eba3907a 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -22,8 +22,8 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel"}
lazy_static = "0.2"
log = "0.3.5"
matches = "0.1"
-mime = "0.2.0"
-mime_guess = "1.6.0"
+mime = "0.2.1"
+mime_guess =... | 7 | 67 | 35 |
cc05efe6dfd229db6b844d4c1d5178b9bc3b5e18 | Ms2ger | 2016-06-20T13:17:13 | servo: Merge #11800 - Remove unused argument to place_float_if_applicable (from Ms2ger:place_float_if_applicable); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: c270622bfdd7a409c1a940322f630fd6cbd985c0 | diff --git a/layout/block.rs b/layout/block.rs
index d74490f77..6571d7d70 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -820,7 +820,7 @@ impl BlockFlow {
flow::base(kid).collapsible_margins
.block_start_margin_for_noncollapsible_context()
... | 6 | 11 | 11 |
aa3a8c5862993fd5df0e362bcbc30ff3cbb623ba | Ms2ger | 2016-06-20T11:56:13 | servo: Merge #11797 - Use *const AtomicUsize rather than *mut AtomicUsize in WorkQueue (from Ms2ger:workqueue-mut-atomic); r=nox
Atomics use internal mutability, so this *mut is at best confusing.
Source-Repo: https://github.com/servo/servo
Source-Revision: a5778fb5da8dbe6229cbd8da7a383b6e336a4ebd | diff --git a/util/workqueue.rs b/util/workqueue.rs
index 5aef7da27..ebc85df46 100644
--- a/util/workqueue.rs
+++ b/util/workqueue.rs
@@ -35,7 +35,7 @@ pub struct WorkUnit<QueueData, WorkData: Send> {
/// Messages from the supervisor to the worker.
enum WorkerMsg<QueueData: 'static, WorkData: 'static + Send> {
//... | 1 | 4 | 4 |
a60d8c22da7bc16a89ed15740851b83403158542 | Michael Howell | 2016-06-20T10:58:23 | servo: Merge #11798 - Account for the font of empty input fields (from notriddle:input_caret); r=nox
The font of empty fragments is not accounted for in layout. This behavior is incorrect when part of an input field.
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any error... | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 27f08dfd5..80664d720 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1972,16 +1972,16 @@ impl Fragment {
ascent: computed_block_size + self.border_padding.block_start,
}
}
- SpecificFrag... | 1 | 3 | 3 |
b1f5b4994763777062e1bdac2d02e540f0dab5aa | Keith Yeung | 2016-06-20T06:29:33 | servo: Merge #11799 - Update string_cache to v0.2.20 (from KiChjang:update-string-cache); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: fa0f2898fb8917cff54e07a6bd3ad8730ef10605 | diff --git a/gfx/Cargo.toml b/gfx/Cargo.toml
index 6982ed4a2..4a5dcba9a 100644
--- a/gfx/Cargo.toml
+++ b/gfx/Cargo.toml
@@ -35,7 +35,7 @@ rustc-serialize = "0.3"
serde = "0.7"
serde_macros = "0.7"
smallvec = "0.1"
-string_cache = {version = "0.2.18", features = ["heap_size"]}
+string_cache = {version = "0.2.20", fe... | 5 | 13 | 13 |
1e5fec151b8d1064059daf7779884e321285a09b | UK992 | 2016-06-19T15:32:52 | servo: Merge #11788 - Silent some warnings (from UK992:warnings); r=jdm
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because only silent some warnings
Source-Repo: https://github.com/servo/servo
Source-Revision: 95941cb... | diff --git a/net/filemanager_thread.rs b/net/filemanager_thread.rs
index 56cf0ca62..6164867c7 100644
--- a/net/filemanager_thread.rs
+++ b/net/filemanager_thread.rs
@@ -48,14 +48,14 @@ impl UIProvider for TFDProvider {
}
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
- fn open_file_dialog(&se... | 1 | 4 | 4 |
184397095e6d57b2b9cdac3b5b0b01c2b7be14cf | Michael Howell | 2016-06-18T18:56:37 | servo: Merge #11786 - Alignment is wrong (from notriddle:cleanup); r=jdm
Fix off-alignment.
---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not fix any particular issue number
- [X] These changes do not require tests because refactoring
... | diff --git a/layout/text.rs b/layout/text.rs
index e2d88e539..472ef9fcd 100644
--- a/layout/text.rs
+++ b/layout/text.rs
@@ -233,13 +233,13 @@ impl TextRunScanner {
if flush_mapping {
mapping.flush(&mut mappings,
- &mut run_info,
- ... | 1 | 7 | 7 |
2abe813550a04f9d824ef428b2dc9f8fb84dc842 | Achal Shah | 2016-06-17T14:52:38 | servo: Merge #11768 - Update Blob::{new, new_inherited} to take Strings (from achals:blob-string); 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 appropriate data: -... | diff --git a/script/dom/blob.rs b/script/dom/blob.rs
index d8beec236..dcb4c68f3 100644
--- a/script/dom/blob.rs
+++ b/script/dom/blob.rs
@@ -17,7 +17,6 @@ use ipc_channel::ipc;
use net_traits::filemanager_thread::{FileManagerThreadMsg, SelectedFileId};
use num_traits::ToPrimitive;
use std::ascii::AsciiExt;
-use std:... | 5 | 13 | 14 |
134d4e0cbde33a79cdf09e0ff40fe9a423441f2a | ddh | 2016-06-17T14:05:39 | servo: Merge #11778 - Added DoubleEndedIterator for MutFlowListIterator (from avadacatavra:mutflowlistdoubleiter); r=Ms2ger
<!-- Please describe your changes on the following line: -->
Added DoubleEndedIterator for MutFlowListIterator
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` whe... | diff --git a/layout/flow_list.rs b/layout/flow_list.rs
index 5a0d389f5..c9bbe0d7c 100644
--- a/layout/flow_list.rs
+++ b/layout/flow_list.rs
@@ -117,6 +117,12 @@ impl<'a> DoubleEndedIterator for FlowListIterator<'a> {
}
}
+impl<'a> DoubleEndedIterator for MutFlowListIterator<'a> {
+ fn next_back(&mut self) -... | 1 | 6 | 0 |
b27f9123d335393639657478859a24c2dc398cca | Alexandrov Sergey | 2016-06-17T09:53:36 | servo: Merge #11769 - Remove unused XHR method (from splav:master); r=jdm
<!-- Please describe your changes on the following line: -->
Remove unused XHR method.
---
<!-- 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/script/dom/xmlhttprequest.rs b/script/dom/xmlhttprequest.rs
index 785a5928c..edae06fe6 100644
--- a/script/dom/xmlhttprequest.rs
+++ b/script/dom/xmlhttprequest.rs
@@ -1041,12 +1041,6 @@ impl XMLHttpRequest {
self.response_status.set(Ok(()));
}
- fn insert_trusted_header(&self, name: Str... | 1 | 0 | 6 |
fac69603c6f059e1763f6f80c10d5ac7a06e73dc | Anthony Ramine | 2016-06-17T07:07:37 | servo: Merge #11506 - Make canvas send their data themselves to other canvas (from nox:slither); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 5a0c98afb2998e7990e1c813f2bc15fe3c191638 | diff --git a/canvas/canvas_paint_thread.rs b/canvas/canvas_paint_thread.rs
index 6e15a5ab4..1faf41a9a 100644
--- a/canvas/canvas_paint_thread.rs
+++ b/canvas/canvas_paint_thread.rs
@@ -148,6 +148,12 @@ impl<'a> CanvasPaintThread<'a> {
Canvas2dMsg::DrawImageSelf(image_size, dest_rect, source... | 6 | 43 | 25 |
9a3b7ee959a916bd0dd7f24130b56c89f9b88870 | Emilio Cobos Álvarez | 2016-06-16T09:44:44 | servo: Merge #11748 - stylo: Support the rest of the background-xxx P1 properties (from emilio:stylo-background-xxx); r=mbrubeck
<!-- 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 `__` wit... | diff --git a/style/properties/longhand/background.mako.rs b/style/properties/longhand/background.mako.rs
index d2e6a090a..77be57aa0 100644
--- a/style/properties/longhand/background.mako.rs
+++ b/style/properties/longhand/background.mako.rs
@@ -184,7 +184,7 @@ ${helpers.predefined_type(
${helpers.single_keyword("bac... | 1 | 1 | 1 |
9c6bf3b4092ca4f5667094a12ffac34d3c5003bb | Darin Minamoto | 2016-06-16T08:57:38 | servo: Merge #11746 - Image with height defined in % resizes properly (from DarinM223:master); r=mbrubeck
<!-- Please describe your changes on the following line: -->
Checked the html in the github issue and the image looks like it is resized properly in Servo.
Fixed image resizing when height is specified in percent... | diff --git a/layout/block.rs b/layout/block.rs
index 2e0794913..d74490f77 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -2842,8 +2842,9 @@ impl ISizeAndMarginsComputer for AbsoluteReplaced {
let opaque_block = OpaqueFlow::from_flow(block);
let containing_block_inline_size =
block.... | 4 | 22 | 11 |
ba86af83651d00408ac0c7be0ce07e7fa5800ad9 | Maciej Skrzypkowski | 2016-06-16T07:12:15 | servo: Merge #11758 - Small performance improvement (from mskrzypkows:construct); r=SimonSapin
<!-- 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] `./m... | diff --git a/layout/construct.rs b/layout/construct.rs
index 3dfcfdf26..49546fb26 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -726,7 +726,6 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
return
}
- let selection = node.selection();
let mut style... | 1 | 1 | 2 |
db8ee09d1500cfeeb75ed0d7b8e0460ce9dc3257 | Alan Jeffrey | 2016-06-15T12:19:08 | servo: Merge #11749 - Check to see if about:failure failed (from asajeffrey:constellation-failing-failure); r=glennw
<!-- Please describe your changes on the following line: -->
Check to see if about:failure is failing,
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is ... | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index cdf66a006..c726d546e 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -907,6 +907,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
debug!("Panic handler for pipeline {:?}: {}.", pi... | 1 | 11 | 5 |
f392af580d5d2744ada6e373b7d0d52ab601c578 | Ms2ger | 2016-06-14T23:32:37 | servo: Merge #11745 - Update to rustc 2016-06-14 (from servo:rustup); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 40e2b7d674531a36af1f96ac079e036dcaf1304f | diff --git a/net_traits/image/base.rs b/net_traits/image/base.rs
index 90cd039da..815a27633 100644
--- a/net_traits/image/base.rs
+++ b/net_traits/image/base.rs
@@ -91,7 +91,7 @@ pub fn detect_image_format(buffer: &[u8]) -> Result<ImageFormat, &str> {
fn is_gif(buffer: &[u8]) -> bool {
match buffer {
- [... | 3 | 79 | 80 |
74e558c4b22346644ead4dd5f750b08300a5f200 | Zhen Zhang | 2016-06-14T12:27:47 | servo: Merge #11717 - Add filepicker (from izgzhen:filepicker); r=Manishearth
Add filepicker
Add file picker based on tinyfiledialog to the file manager implementation.
Changes:
- [x] Add the picker invocation code
- [x] Rewrite unit test to accommodate the change
- [x] Patch up `htmlinputelement` to make things wor... | diff --git a/net/filemanager_thread.rs b/net/filemanager_thread.rs
index 5b18b332f..6cc47adf0 100644
--- a/net/filemanager_thread.rs
+++ b/net/filemanager_thread.rs
@@ -7,48 +7,88 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use mime_classifier::MIMEClassifier;
use mime_guess::guess_mime_type_opt;
use ne... | 4 | 114 | 41 |
0d90e877e19f4fdb64e4702d9a0eb9747fb9e2fc | Ms2ger | 2016-06-13T14:21:45 | servo: Merge #11737 - Move the initialize_data method out of the TNode trait (from Ms2ger:init-data); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: e0772c59a69db13ec2650c41b16f455df5d8064e | diff --git a/layout/traversal.rs b/layout/traversal.rs
index 692d956f0..bd07e1f72 100644
--- a/layout/traversal.rs
+++ b/layout/traversal.rs
@@ -65,7 +65,14 @@ impl<'lc, 'ln> DomTraversalContext<ServoLayoutNode<'ln>> for RecalcStyleAndConst
}
}
- fn process_preorder(&self, node: ServoLayoutNode<'ln>)... | 4 | 21 | 27 |
8a48193bc6a314155d3c230a1652af509bd6d894 | Ms2ger | 2016-06-13T11:31:57 | servo: Merge #11736 - Use Ref/RefMut::map rather than transmute for ServoLayoutNode (from Ms2ger:detransmute); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e32b2c9ddf7f6c44057812d7840e2e93ce5eb7bd | diff --git a/layout/wrapper.rs b/layout/wrapper.rs
index b6c5266c2..303c9f769 100644
--- a/layout/wrapper.rs
+++ b/layout/wrapper.rs
@@ -233,11 +233,11 @@ impl<'ln> TNode for ServoLayoutNode<'ln> {
}
fn borrow_data(&self) -> Option<Ref<PrivateStyleData>> {
- unsafe { self.borrow_layout_data().map(|d|... | 1 | 2 | 2 |
4196a485773d48e68cf6aaacb03ced193c336e77 | Patrick Walton | 2016-06-13T06:03:48 | servo: Merge #11715 - compositor: Rerequest scroll positions from WebRender while overscrolled layers are bouncing back (from pcwalton:wr-overscroll-event-targeting-fix); r=glennw
This fixes a very annoying issue whereby overscrolling would cause mouse
events to go to the wrong place until the layer was scrolled again... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 6bfa6c992..7b476ab2f 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -2487,7 +2487,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}
if let Some(ref webrender_api) = self.webrender_api {
- ... | 1 | 2 | 1 |
a5edc5e4657cf8fe27aa78b0dec30e4cb96f4c8e | Darin Minamoto | 2016-06-13T01:29:47 | servo: Merge #11734 - Replace RefCell in SCRIPT_THREAD_ROOT with Cell (from DarinM223:master); r=Ms2ger
<!-- Please describe your changes on the following line: -->
Replaced RefCell usage in SCRIPT_THREAD_ROOT with Cell.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is ... | diff --git a/script/script_thread.rs b/script/script_thread.rs
index 8cf97710b..4750a8d63 100644
--- a/script/script_thread.rs
+++ b/script/script_thread.rs
@@ -87,7 +87,7 @@ use script_traits::{NewLayoutInfo, ScriptMsg as ConstellationMsg};
use script_traits::{ScriptThreadFactory, TimerEvent, TimerEventRequest, Timer... | 1 | 10 | 10 |
28a9a71d5a6cbafbc51c34d2061e8b5f2a72fa91 | mrmiywj | 2016-06-12T19:47:02 | servo: Merge #11696 - use less repetitive name (from mrmiywj:rename-to-less-repetitive); r=ConnorGBrewster
<!-- 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/layout/display_list_builder.rs b/layout/display_list_builder.rs
index 945968446..62d490b44 100644
--- a/layout/display_list_builder.rs
+++ b/layout/display_list_builder.rs
@@ -377,7 +377,7 @@ impl FragmentDisplayListBuilding for Fragment {
let base = state.create_base_display_item(&bounds,
... | 3 | 55 | 55 |
edf680122b5a521646f6d2faa06b89a125e57187 | Ms2ger | 2016-06-11T23:42:53 | servo: Merge #11700 - Remove an invalid assertion in fire_timer (from Ms2ger:assert); r=jdm
It's not clear to me if this is something we should expect to happen, but it
does indeed happen, so we should disable the assertion while we investigate.
Fixes #9984.
Source-Repo: https://github.com/servo/servo
Source-Revisio... | diff --git a/script/timers.rs b/script/timers.rs
index 53113e066..504dbb8aa 100644
--- a/script/timers.rs
+++ b/script/timers.rs
@@ -176,7 +176,10 @@ impl OneshotTimers {
let base_time = self.base_time();
// Since the event id was the expected one, at least one timer should be due.
- assert!(... | 1 | 4 | 1 |
6c9d92ce6a6c34eb08f4af2b661e62572f71aeb5 | Anthony Ramine | 2016-06-10T19:52:55 | servo: Merge #11702 - Don't load all font faces sources (from nox:fonts); r=metajack
We stop at the first one we manage to load.
Source-Repo: https://github.com/servo/servo
Source-Revision: ce88b8ed30feff9c7d3f067041fe5d781e012351 | diff --git a/gfx/font_cache_thread.rs b/gfx/font_cache_thread.rs
index 2a1a1e776..b0a156c4a 100644
--- a/gfx/font_cache_thread.rs
+++ b/gfx/font_cache_thread.rs
@@ -21,7 +21,7 @@ use std::ops::Deref;
use std::sync::{Arc, Mutex};
use std::u32;
use string_cache::Atom;
-use style::font_face::Source;
+use style::font_fa... | 3 | 119 | 109 |
ab9f51abb9d8ab6ba6e815060b19cc679b159a79 | Josh Matthews | 2016-06-10T15:06:29 | servo: Merge #11707 - Avoid frequent intermittent failure in tests (from jdm:resize_warn); r=Ms2ger
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11613 (github issue number if applicable).
- [X] These changes do not require tests because... | diff --git a/script/script_thread.rs b/script/script_thread.rs
index eec185323..51460cd4b 100644
--- a/script/script_thread.rs
+++ b/script/script_thread.rs
@@ -1087,7 +1087,7 @@ impl ScriptThread {
load.window_size = Some(size);
return;
}
- panic!("resize sent to nonexistent p... | 1 | 1 | 1 |
1450c5c690861119a3078dfc7f72b1031eb5e544 | Bob | 2016-06-10T13:49:53 | servo: Merge #10382 - stop client websocket close echoing server close (from bobthekingofegypt:fix-websocket-close); r=metajack
Client initiated close requests should send a close message to the
server that the server will echo back to complete the process. Servo
should not then echo the servers close request back ag... | diff --git a/net/websocket_loader.rs b/net/websocket_loader.rs
index f7819b96b..60d6c8932 100644
--- a/net/websocket_loader.rs
+++ b/net/websocket_loader.rs
@@ -10,6 +10,7 @@ use net_traits::hosts::replace_hosts;
use net_traits::unwrap_websocket_protocol;
use net_traits::{WebSocketCommunicate, WebSocketConnectData, W... | 1 | 14 | 6 |
a809961b71dae16fdafbe9d27c5572f2d1c2d015 | Josh Matthews | 2016-06-10T10:52:37 | servo: Merge #11692 - Add a default Accept-Language header to HTTP requests (from jdm:language); r=Manishearth
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11008
- [X] There are tests for these changes
Source-Repo: https://github.com/s... | diff --git a/net/http_loader.rs b/net/http_loader.rs
index f9fc6224d..f94b6ffce 100644
--- a/net/http_loader.rs
+++ b/net/http_loader.rs
@@ -13,9 +13,10 @@ use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
use flate2::read::{DeflateDecoder, GzDecoder};
use hsts::{HstsEntry, HstsList, secure_u... | 1 | 19 | 1 |
5baacf80095fc54b7f1cae7aa4524915208554b4 | Zhen Zhang | 2016-06-09T23:14:30 | servo: Merge #11552 - Improve implementation and add testing regarding file manager thread (from izgzhen:add-testing-fix-filemanager); r=Manishearth
First there is a more completed unit test. And in the test running, I found a runtime error `Serde(Custom("bincode does not support Deserializer::deserialize))` when read... | diff --git a/net/filemanager_thread.rs b/net/filemanager_thread.rs
index 9c741d00d..5b18b332f 100644
--- a/net/filemanager_thread.rs
+++ b/net/filemanager_thread.rs
@@ -8,7 +8,7 @@ use mime_classifier::MIMEClassifier;
use mime_guess::guess_mime_type_opt;
use net_traits::blob_url_store::{BlobURLStoreEntry, BlobURLStor... | 5 | 50 | 63 |
c6000147d5b940f8411a7bd9173df8450522b318 | Lars Bergstrom | 2016-06-09T20:57:56 | servo: Merge #11687 - Android basedir (from larsbergstrom:android_basedir); r=mbrubeck
<!-- Please describe your changes on the following line: -->
This fixes #11633, as when the new basedir stuff that uses xdg was added, it did not preserve the previous Android behavior, which used `/sdcard/servo`. Obviously, long-te... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index ae10f5351..00399f7b8 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -1241,7 +1241,7 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies ... | 4 | 23 | 8 |
569b5fc68810b01f8014d66edff43b8d386931fb | Ms2ger | 2016-06-09T16:33:17 | servo: Merge #11684 - Avoid an index-out-of-bounds error in ScriptMemoryFailsafe (from servo:fix-failsafe); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0ac1ff066107def0781d18e1d76856380a349bef | diff --git a/script/dom/browsingcontext.rs b/script/dom/browsingcontext.rs
index 99c72e1e4..1b78fb757 100644
--- a/script/dom/browsingcontext.rs
+++ b/script/dom/browsingcontext.rs
@@ -108,6 +108,12 @@ impl BrowsingContext {
Root::from_ref(&self.history.borrow()[self.active_index.get()].document)
}
+ ... | 2 | 10 | 2 |
9900ff7ad4054a5096072a0e5d5658cce3a0e5c6 | zakorgyula | 2016-06-08T18:31:41 | servo: Merge #11652 - Add blacklist check to GetIncludedService(s) functions (from szeged:blacklistfix); r=jdm
Somehow we missed it from our previous blacklist PR, to add blacklist check for the GetIncludedService() and GetIncludedServices() functions. Link for the spec: https://webbluetoothcg.github.io/web-bluetooth/... | diff --git a/script/dom/bluetoothremotegattservice.rs b/script/dom/bluetoothremotegattservice.rs
index 48cf9be63..cf0f896d3 100644
--- a/script/dom/bluetoothremotegattservice.rs
+++ b/script/dom/bluetoothremotegattservice.rs
@@ -170,6 +170,9 @@ impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService {
... | 1 | 9 | 1 |
0ebf1e5a07cc8fd95e44f5b3221e0d01c394827d | Ms2ger | 2016-06-08T17:41:37 | servo: Merge #11676 - Create some channels on the constellation thread (from Ms2ger:constellation-channels); r=asajeffrey
Source-Repo: https://github.com/servo/servo
Source-Revision: 1b7ac699bc5bf21bc936386da5bc2296bcee6abb | diff --git a/constellation/constellation.rs b/constellation/constellation.rs
index aea7092b0..cdf66a006 100644
--- a/constellation/constellation.rs
+++ b/constellation/constellation.rs
@@ -308,18 +308,18 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
STF: ScriptThreadFactory<Message=Message>
{
... | 1 | 8 | 8 |
f2e7430b971b6ce0098d6963cb250bca5582328c | zakorgyula | 2016-06-08T15:42:42 | servo: Merge #11636 - Fix an incorect behavior, when converting optional services (from szeged:optservicesfix); r=jdm
As specified in https://webbluetoothcg.github.io/web-bluetooth/#ref-for-blacklisted-2 if any service in the optionalServices are blacklisted, there is no need to throw an error (just remove the service... | diff --git a/script/dom/bluetooth.rs b/script/dom/bluetooth.rs
index e00fb33cf..7deca26c9 100644
--- a/script/dom/bluetooth.rs
+++ b/script/dom/bluetooth.rs
@@ -125,10 +125,9 @@ fn convert_request_device_options(options: &RequestDeviceOptions,
if let Some(ref opt_services) = options.optionalServices {
for... | 1 | 2 | 3 |
c37a7a8eddc46a882d1a21cf1c141796d2ba94e6 | Ms2ger | 2016-06-08T14:40:11 | servo: Merge #11675 - Remove a spurious field from the SetFrameTree message (from Ms2ger:SetFrameTree-field); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 0e776ffcf77f456d20a63cd170fb5b2821704431 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 800c383b1..6bfa6c992 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -576,9 +576,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.change_page_url(pipeline_id, url);
}
- ... | 3 | 5 | 14 |
fb894a0632db8ca07e431209faf0659e8cb1e5d6 | Anthony Ramine | 2016-06-08T12:36:55 | servo: Merge #11640 - Update Rust to 1.11.0-nightly (ec872dc8a 2016-06-07) (from servo:rustup); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 57e086f0fb185e5f6143f5c26d54162c5d07456b | diff --git a/net/lib.rs b/net/lib.rs
index 52c3560b1..80c6294c2 100644
--- a/net/lib.rs
+++ b/net/lib.rs
@@ -6,7 +6,6 @@
#![feature(custom_derive)]
#![feature(box_syntax)]
#![feature(fnbox)]
-#![feature(fs_time)]
#![feature(mpsc_select)]
#![feature(plugin)]
#![plugin(plugins)]
diff --git a/plugins/lints/unrooted_... | 7 | 81 | 87 |
7bcb15db7d9a7596c63d0a5eb7ae764cd4b6b66c | Zhen Zhang | 2016-06-08T11:13:39 | servo: Merge #11536 - Add blob loader (from izgzhen:add-blob-loader); r=Manishearth
Add a blob loader to implement [Blob URL](https://w3c.github.io/FileAPI/#url). The related interfaces to script thread are also declared.
Progressing in parallel with PR #11534. Related to #11131.
<!-- Please describe your changes on... | diff --git a/net/blob_loader.rs b/net/blob_loader.rs
new file mode 100644
index 000000000..00b7f4ae0
--- /dev/null
+++ b/net/blob_loader.rs
@@ -0,0 +1,87 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can o... | 6 | 191 | 0 |
07cd77292aaee4cb6b42a8250d406a1c3d968469 | Connor Brewster | 2016-06-07T19:16:13 | servo: Merge #11616 - Add support for navigating by a delta (from cbrewster:navigation_delta); r=asajeffrey
<!-- Please describe your changes on the following line: -->
This adds support for passing a delta with `NavigationDirection`. This will be used with `history.go`
r? @asajeffrey
---
<!-- Thank you for contribu... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index fb471ab90..800c383b1 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -1803,8 +1803,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
fn on_navigation_window_event(&self, direction: WindowNavigateMsg) {
... | 5 | 31 | 30 |
aea3b5f6f9fad36adea68074cda9a33a1dd62a39 | Alan Jeffrey | 2016-06-07T18:27:44 | servo: Merge #11644 - Mozbrowser top level browsing context (from asajeffrey:mozbrowser-top-level-browsing-context); r=ConnerGBrewster
<!-- Please describe your changes on the following line: -->
Got `window.top` and `window.parent` to return the right result inside a `mozbrowser` iframe.
---
<!-- Thank you for contr... | diff --git a/constellation/pipeline.rs b/constellation/pipeline.rs
index 0d92cf8ba..578ccae09 100644
--- a/constellation/pipeline.rs
+++ b/constellation/pipeline.rs
@@ -136,12 +136,13 @@ impl Pipeline {
let (script_chan, content_ports) = match state.script_chan {
Some(script_chan) => {
- ... | 7 | 57 | 40 |
6de07b7b0d177b20a55270db14ed558b0e359481 | Ms2ger | 2016-06-07T16:09:14 | servo: Merge #11656 - Reduce the amount of dom code used outside the script crate (from Ms2ger:reduce-dom-exposure); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 1e3edf3ca454b91dfdc267c5b2f4347eda9b7cb6 | diff --git a/layout/construct.rs b/layout/construct.rs
index 8d37b6aa6..3dfcfdf26 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -34,9 +34,9 @@ use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT};
use list_item::{ListItemFlow, ListStyleTypeContent};
use multicol::{MulticolFlow, MulticolColum... | 37 | 144 | 115 |
f257d6928a1715e21fd300edf4e48ec1aa5e3df1 | Anthony Ramine | 2016-06-07T12:07:03 | servo: Merge #11654 - Make report_pending_exception unsafe (from nox:error); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 6be0494287455c5c30ef6f898b511b4348efbeef | diff --git a/script/dom/bindings/error.rs b/script/dom/bindings/error.rs
index a9ee93663..ed0b81c4d 100644
--- a/script/dom/bindings/error.rs
+++ b/script/dom/bindings/error.rs
@@ -121,12 +121,10 @@ pub unsafe fn throw_dom_exception(cx: *mut JSContext, global: GlobalRef, result:
}
/// Report a pending exception, th... | 3 | 12 | 8 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.