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 |
|---|---|---|---|---|---|---|---|
cfbe99ecbe9a147e7f836984be3a712bf72c25b6 | Sean McArthur | 2015-09-02T16:48:07 | servo: Merge #7418 - Enable HTTP connection pooling (from jdm:httppool); r=jdm
Rebased and adjusted version of #6948. Closes #6948.
Source-Repo: https://github.com/servo/servo
Source-Revision: 366d4a83f1448e115cf998cc6c4e8c564773da65 | diff --git a/net/Cargo.toml b/net/Cargo.toml
index 3d304658b..19d046dc1 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -42,4 +42,3 @@ regex_macros = "0.1.8"
flate2 = "0.2.0"
uuid = "0.1.16"
euclid = "0.1"
-
diff --git a/net/http_loader.rs b/net/http_loader.rs
index 4c2575135..e34910ea3 100644
--- a/net/http_loa... | 5 | 151 | 80 |
88d7a3c8e0311183fa76c3d8e78e88b0c430d3aa | Corey Farwell | 2015-09-02T15:42:29 | servo: Merge #7513 - Upgrade some dependencies to silence warnings (from frewsxcv:bump-no-warnings); r=Ms2ger
In order to pick up these changes:
* servo/euclid#101
* netvl/xml-rs#102
* jgraham/webdriver-rust#17
* ecoal95/rust-offscreen-rendering-context#27
Source-Repo: https://github.com/servo/servo
Source-Revision:... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 183834df3..c0e8618d7 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -10,7 +10,7 @@ dependencies = [
"devtools 0.0.1",
"devtools_traits 0.0.1",
"env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.5 (registry+https... | 1 | 28 | 28 |
517705739ebed2c5c69d8a1757d02c4677290408 | Martin Tomasi | 2015-09-02T15:15:16 | servo: Merge #7429 - Fixed serialize_list to no longer append an additional space at the e… (from GyrosOfWar:serialize_list_space_fix); r=jdm
…nd of the string.
Fixes #7404
Source-Repo: https://github.com/servo/servo
Source-Revision: e1ede2074d2ceb74c0d9f38b23697f17dc3a8fc9 | diff --git a/script/dom/cssstyledeclaration.rs b/script/dom/cssstyledeclaration.rs
index 966826047..e882330b1 100644
--- a/script/dom/cssstyledeclaration.rs
+++ b/script/dom/cssstyledeclaration.rs
@@ -20,6 +20,7 @@ use util::str::DOMString;
use std::ascii::AsciiExt;
use std::borrow::ToOwned;
use std::cell::Ref;
+use... | 2 | 4 | 3 |
7bbd395210e368572edb3b62d8fc4a0e17758b8d | Simon Sapin | 2015-09-02T08:33:18 | servo: Merge #7496 - Implement CSS3 Calc (from servo:calc_); r=SimonSapin
This is #7185 with one commit added to make it build merged with master, which got support for the `ch` unit in the meantime.
Source-Repo: https://github.com/servo/servo
Source-Revision: a547ae6826cf171c42b090408a4c20d58d1829d9 | diff --git a/layout/block.rs b/layout/block.rs
index 392638437..7288a11c9 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -327,7 +327,12 @@ impl CandidateBSizeIterator {
(LengthOrPercentageOrAuto::Percentage(percent), Some(block_container_block_size)) => {
MaybeAuto::Specified(block_... | 13 | 545 | 63 |
6e146973508e81c1d2fb96cacea0125f9139f8bc | Martin Robinson | 2015-09-02T04:18:52 | servo: Merge #7503 - Upgrade to the latest rust-layers (from mrobinson:iframe-issue); r=glennw
This should fix a bug where hidden iframes are not properly clipped
away from the compositor scene. This commit adds a test for this
behavior.
Fixes #6849.
Source-Repo: https://github.com/servo/servo
Source-Revision: ba2cb... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index af8c32f26..32d20e98f 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -860,7 +860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#c4fa5... | 1 | 1 | 1 |
76a1bcd0a0bbbfab8a440fde1a845c89b6647e20 | Mathieu Rheaume | 2015-09-02T01:57:42 | servo: Merge #7504 - Issue #7501 emove unused time function in time module of profile (from ddrmanxbxfr:RemoveUnusedTimeFunction); r=jdm
Title sums it up. Time function in the time module of profile crate was unused.
Unless we plan to use it soon, we should clean it up
See issue #7501 related to it.
Thanks.
Source... | diff --git a/profile/time.rs b/profile/time.rs
index f1c852736..302003ecb 100644
--- a/profile/time.rs
+++ b/profile/time.rs
@@ -209,16 +209,3 @@ impl Profiler {
println!("");
}
}
-
-pub fn time<T, F>(msg: &str, callback: F) -> T
- where F: Fn() -> T
-{
- let start_time = precise_time_ns();
- le... | 1 | 0 | 13 |
9acbda9f41bb52a8e5a258400d465ca26993b618 | Patrick Walton | 2015-09-01T22:36:58 | servo: Merge #7498 - layout: Implement partial support for inline absolute containing blocks (from pcwalton:inline-absolute-containing-blocks); r=mbrubeck
Improves the position of the down arrows on google.com SERPs.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: e46499a5dfd9189fc439c228d9... | diff --git a/layout/construct.rs b/layout/construct.rs
index 797f7cf07..d701edfc4 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -294,14 +294,16 @@ impl<'a> FlowConstructor<'a> {
}
#[inline]
- fn set_flow_construction_result(&self, node: &ThreadSafeLayoutNode, result: ConstructionResult) {... | 4 | 114 | 35 |
d668a83a98a64a9759d0c4f6549edb1dc551ecaf | Ravi Shankar | 2015-09-01T20:38:48 | servo: Merge #7438 - Tidy can now check for version conflicts (from Wafflespeanut:cargo-tidy); r=jdm
fixes #7133
Source-Repo: https://github.com/servo/servo
Source-Revision: 8b5418f58f5b80e3485ec9eff24d14dc0fbea9f9 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 5acf07faf..af8c32f26 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -627,7 +627,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-i... | 1 | 1 | 1 |
aa62e8d121b112ba7371d5fc7824aea993a245b5 | Patrick Walton | 2015-09-01T18:33:07 | servo: Merge #7313 - layout: Make overflow calculation take relative percentages into account (from pcwalton:position-relative-percentage-overflow); r=mbrubeck
This necessitated changing overflow to be calculated by the parent flow
if relatively positioned children are present. That is because the
overflow regions can... | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index 9ebe86b1f..2c38e0e6f 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -1176,14 +1176,13 @@ impl<'a> PaintContext<'a> {
// FIXME(https://github.com/rust-lang/rust/issues/23338)
let font = self.font_context.get_paint_f... | 10 | 180 | 90 |
0a0c51a8d924dd0e180972b064146010efe3e82c | Simon Martin | 2015-09-01T17:22:52 | servo: Merge #7449 - Issue #7393: Properly sniff mislabeled feeds (from simartin:issue_7393); r=metajack
Hi,
This patch is an attempt to fix https://github.com/servo/servo/issues/7393, where the code detecting mislabeled feeds (see https://mimesniff.spec.whatwg.org/#sniffing-a-mislabeled-feed) had spurious space in t... | diff --git a/net/mime_classifier.rs b/net/mime_classifier.rs
index 0ed472b39..de1b445ab 100644
--- a/net/mime_classifier.rs
+++ b/net/mime_classifier.rs
@@ -125,6 +125,10 @@ impl <'a, T: Iterator<Item=&'a u8> + Clone> Matches for T {
// Side effects
// moves the iterator when match is found
fn matches(&m... | 1 | 15 | 6 |
6013cd7050a02ac728e9976b9b7d73ad914a5f7b | erneyja | 2015-09-01T14:33:02 | servo: Merge #7468 - Making test-tidy check that = have space after them (from JoshTheGoldfish:Issue7460); r=jdm
For issue #7460. Need to ensure compatibility with #7390.
Source-Repo: https://github.com/servo/servo
Source-Revision: 15de679f115f06a8ce33625d77e820b049730d4b | diff --git a/compositing/lib.rs b/compositing/lib.rs
index 95eba39c8..92a633674 100644
--- a/compositing/lib.rs
+++ b/compositing/lib.rs
@@ -39,9 +39,9 @@ extern crate clipboard;
extern crate time;
extern crate url;
-#[cfg(target_os="macos")]
+#[cfg(target_os = "macos")]
extern crate core_graphics;
-#[cfg(target_o... | 19 | 69 | 69 |
82e0f9bde5e1b288cb0e2ea3d8507e35bc6db51f | Josh Matthews | 2015-09-01T13:50:56 | servo: Merge #7486 - Remove hack for android builders now that build is successful once more (from jdm:bad-android); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 8a15f941ed5e4b0697556bfafcfbb02be96a4569 | diff --git a/servo/main.rs b/servo/main.rs
index 530bbf639..3c8be21e1 100644
--- a/servo/main.rs
+++ b/servo/main.rs
@@ -183,10 +183,10 @@ mod android {
use self::libc::funcs::c95::stdio::fgets;
use self::libc::funcs::posix88::stdio::fdopen;
use self::libc::funcs::posix88::unistd::{pipe, dup2... | 1 | 1 | 1 |
863666b9d872aba23aa14b45516f3245c90d7747 | Prabhjyot Singh Sodhi | 2015-09-01T13:02:56 | servo: Merge #7489 - removing unnecessary clones (from psdh:clearClone); r=jdm
Fixes #7485
Source-Repo: https://github.com/servo/servo
Source-Revision: 696ccf67943772c6eb496db729e3c22d5176c4a3 | diff --git a/net/http_loader.rs b/net/http_loader.rs
index cf5078a1a..4c2575135 100644
--- a/net/http_loader.rs
+++ b/net/http_loader.rs
@@ -183,7 +183,7 @@ impl HttpRequestFactory for NetworkHttpRequestFactory {
context.set_CA_file(&resources_dir_path().join("certs")).unwrap();
let connector = Http... | 1 | 3 | 3 |
fcd294516cf80723f4fdf2241c163adf95570ee5 | Eli Friedman | 2015-09-01T04:24:08 | servo: Merge #7488 - Simplify reflection usage in Actor code (from eefriedman:reflect-gate); r=jdm
The fixed version is shorter, and doesn't use unstable features.
Source-Repo: https://github.com/servo/servo
Source-Revision: 7e8b8293b051ba787e7717b6bf42655f4ee26f1a | diff --git a/devtools/actor.rs b/devtools/actor.rs
index c640822d7..ca09e831d 100644
--- a/devtools/actor.rs
+++ b/devtools/actor.rs
@@ -6,13 +6,11 @@
use devtools_traits::PreciseTime;
use rustc_serialize::json;
-use std::any::{Any, TypeId};
+use std::any::Any;
use std::cell::{Cell, RefCell};
use std::collections... | 3 | 15 | 63 |
7906a60aca48596c4f606be0e12b939c9cfb4a91 | Corey Farwell | 2015-09-01T03:17:54 | servo: Merge #7483 - Enforce linking to spec for method implementations via macros (from frewsxcv:macro-spec-links); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 4984aaf8bfca0698a132e10e9f48cef42d1b8302 | diff --git a/script/dom/cssstyledeclaration.rs b/script/dom/cssstyledeclaration.rs
index e44e17d39..247de62b2 100644
--- a/script/dom/cssstyledeclaration.rs
+++ b/script/dom/cssstyledeclaration.rs
@@ -334,5 +334,6 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
rval
}
+ // https://drafts... | 22 | 117 | 8 |
213427bc69f118ce3b9f48760f13982fe68029e3 | Michael Howell | 2015-09-01T02:35:06 | servo: Merge #7474 - Inline constraint resolver for absolutely positioned tables (from notriddle:master); r=pcwalton
Fixes #7425.
Source-Repo: https://github.com/servo/servo
Source-Revision: dee6283483a79b034565a6f9ad979f87c2765f78 | diff --git a/layout/table_wrapper.rs b/layout/table_wrapper.rs
index c3312bceb..ebf960206 100644
--- a/layout/table_wrapper.rs
+++ b/layout/table_wrapper.rs
@@ -13,12 +13,12 @@
#![deny(unsafe_code)]
-use block::{BlockFlow, FloatNonReplaced, ISizeAndMarginsComputer, ISizeConstraintInput};
+use block::{BlockFlow, Fl... | 1 | 73 | 2 |
3233463f996ee23fd82fea88acde2478bddf3cf6 | meh | 2015-09-01T01:45:20 | servo: Merge #7448 - Re-export crates needed to use the Servo Rust API (from meh:servo-reexport); r=jdm
This helps out on using the Servo API from a Rust project.
Right now I have to explicitly declare all the crates contained in `components` to use them.
Unsure about re-exporting `euclid`, `url` and `layers`, but t... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 0d01f4856..5acf07faf 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -4,13 +4,18 @@ version = "0.0.1"
dependencies = [
"android_glue 0.0.2",
"bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "canvas 0.0.1",
+ "canvas_traits 0.... | 4 | 98 | 27 |
252b2890f11875c75e045125018547971e397e24 | Prabhjyot Singh Sodhi | 2015-09-01T00:28:14 | servo: Merge #7470 - implemented a pass-through mark_as_root for FlexFlow (from psdh:flexflow); r=pcwalton
Fixes #7467
Source-Repo: https://github.com/servo/servo
Source-Revision: 23d1416cc23d1fb11741a17de17cf79e7591de2b | diff --git a/layout/flex.rs b/layout/flex.rs
index 3c34aeaf7..88fe929a9 100644
--- a/layout/flex.rs
+++ b/layout/flex.rs
@@ -312,6 +312,10 @@ impl Flow for FlexFlow {
&mut self.block_flow
}
+ fn mark_as_root(&mut self) {
+ self.block_flow.mark_as_root();
+ }
+
fn bubble_inline_sizes(&m... | 1 | 4 | 0 |
e5dde8c6587752adae3e3f72c86605884ba9fe14 | Glenn Watson | 2015-08-31T22:58:07 | servo: Merge #7482 - Update glutin to get android build fix (from glennw:glutin-update); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: dbf8c9d2bca87b3e9f656b72f2ac05f8688417ba | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 0129277cb..0d01f4856 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -628,7 +628,7 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.3.5"
-source = "git+https://github.com/servo/glutin?branch=servo#22a561c30a0560f445f50abcebf8439d264e0c67"
+so... | 1 | 1 | 1 |
a5e58219e3c64837445cd2408597b278bb705e19 | Bryan Bell | 2015-08-31T20:58:33 | servo: Merge #7370 - gfx: Border radius support for asymmetric sized borders (from bjwbell:bugfix-unequal-borders); r=pcwalton
When the border-top/right/bottom/left-widths are not equal, the angle on the border corner arc separating the borders isn't PI/4.
For instance if the top border width is much larger than the ... | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index a96d413ca..9ebe86b1f 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -72,6 +72,19 @@ enum DashSize {
DashedBorder = 3
}
+#[derive(Copy, Clone, Debug)]
+struct Ellipse {
+ origin: Point2D<f32>,
+ width: f32,
+ height: f32,
+}... | 1 | 260 | 44 |
757621ac38e109e5ea978b3c6a4010382bb64f8c | wilmoz | 2015-08-31T19:18:23 | servo: Merge #7475 - Make test-tidy check that braces have spaces before or after them (from wilcus:checkBracesSpaces); r=jdm
https://github.com/servo/servo/issues/7413
Posible future/past bug fixed in components/script/timers.rs
Source-Repo: https://github.com/servo/servo
Source-Revision: 60c72f601c4dd7cfbc8a4a98309... | diff --git a/gfx/text/shaping/harfbuzz.rs b/gfx/text/shaping/harfbuzz.rs
index 462d5bf48..426068a41 100644
--- a/gfx/text/shaping/harfbuzz.rs
+++ b/gfx/text/shaping/harfbuzz.rs
@@ -576,13 +576,13 @@ extern fn glyph_h_advance_func(_: *mut hb_font_t,
fn glyph_space_advance(font: *mut Font) -> f64 {
let space_unicod... | 8 | 20 | 20 |
755cc8b049fc1e767e8cb458c673f092c29399bb | Matt Brubeck | 2015-08-31T18:20:49 | servo: Merge #7434 - Remove unused font shaping code and flags (from mbrubeck:drop-table); r=pcwalton
r? @pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 108251bece897b96a8b205df22e7d3e790979331 | diff --git a/gfx/platform/macos/font.rs b/gfx/platform/macos/font.rs
index b96f217e0..eb33e3262 100644
--- a/gfx/platform/macos/font.rs
+++ b/gfx/platform/macos/font.rs
@@ -33,11 +33,6 @@ pub struct FontTable {
data: CFData,
}
-// Noncopyable.
-impl Drop for FontTable {
- fn drop(&mut self) {}
-}
-
impl Fon... | 2 | 12 | 170 |
dccd37ce79fcdee8f649641b084c1c4a27652aae | Avi Weinstock | 2015-08-31T13:22:06 | servo: Merge #7471 - Prevent ClipboardContext::new from panicing on OSX if NSPasteboard#ge… (from aweinstock314:update-clipboard-20150831); r=Manishearth
…neralPasteboard fails (https://github.com/servo/servo/issues/7380).
https://github.com/aweinstock314/rust-clipboard/commit/8c4c31e73a5ac5afd97825acc4c534dccfc0ab9b... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 4f21ac4c6..0129277cb 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -169,7 +169,7 @@ dependencies = [
[[package]]
name = "clipboard"
version = "0.0.3"
-source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b079... | 1 | 1 | 1 |
b460980853df93cd582d2c760aa6749ccfd872e7 | Anthony Ramine | 2015-08-31T09:02:05 | servo: Merge #7466 - Implement FromIterator<Root<A>> for RootedVec<JS<A>> (fixes #5117) (from nox:rootedvec-from-iter); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: fea36ceb9a2d5114e41ce9067911b01f8e4fa5fd | diff --git a/script/dom/bindings/trace.rs b/script/dom/bindings/trace.rs
index b1dcbbce1..8e48de2c6 100644
--- a/script/dom/bindings/trace.rs
+++ b/script/dom/bindings/trace.rs
@@ -29,7 +29,7 @@
//! The `no_jsmanaged_fields!()` macro adds an empty implementation of `JSTraceable` to
//! a datatype.
-use dom::binding... | 2 | 14 | 3 |
f4aad2a7953df0cf2496eefb4828fe67d333b747 | Anthony Ramine | 2015-08-31T08:19:55 | servo: Merge #7463 - Implement the ch unit as 0.5em (from nox:css-ch); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 1093f6bdcf501bec37dc3d422b24c05eea8e1c23 | diff --git a/style/values.rs b/style/values.rs
index 7e5774d92..2a5de980e 100644
--- a/style/values.rs
+++ b/style/values.rs
@@ -151,6 +151,7 @@ pub mod specified {
pub enum FontRelativeLength {
Em(CSSFloat),
Ex(CSSFloat),
+ Ch(CSSFloat),
Rem(CSSFloat)
}
@@ -159,6 +160,7 @@... | 1 | 8 | 3 |
c54b3b3c3f0625d2bbcbef2da18a719a543a326a | Sam Gibson | 2015-08-31T02:07:40 | servo: Merge #7139 - Testable net load (from samfoo:testable-net-load); r=jdm
*The goal of this PR is to get early feedback on this before I go too far down the rabbit hole. This new code path is working, and there's several tests I've written as a proof of concept. There are still some regressions that I'll be fixing... | diff --git a/net/http_loader.rs b/net/http_loader.rs
index e59ad1521..cf5078a1a 100644
--- a/net/http_loader.rs
+++ b/net/http_loader.rs
@@ -2,49 +2,47 @@
* 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 devtools_traits::{Chro... | 5 | 479 | 291 |
070fa53ea73f164c1ab474dcc99ef51f0ae41d95 | Anthony Ramine | 2015-08-30T19:22:41 | servo: Merge #7407 - Optimise most basic case of .replaceChild() when updating childNodes (from nox:childnodes-replace); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 86da67bb1e229f16b13892c42bd2a444b1b97644 | diff --git a/script/dom/nodelist.rs b/script/dom/nodelist.rs
index 01bc27d3a..3e2bc5145 100644
--- a/script/dom/nodelist.rs
+++ b/script/dom/nodelist.rs
@@ -215,7 +215,10 @@ impl ChildrenList {
},
};
list.last_visited.set(Some(JS::from_ref(visited)));
- ... | 1 | 4 | 1 |
b29d1830e7c91806f2d41295cb170611a9065c5c | ecoal95 | 2015-08-30T15:29:42 | servo: Merge #7442 - Add WebGL shader validation and translation (from emilio:shader-validation); r=jdm
r? @jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 79328c11e320ad10a19d64d280df2e292eaf2e03 | diff --git a/canvas/webgl_paint_task.rs b/canvas/webgl_paint_task.rs
index b434f4687..aad45c916 100644
--- a/canvas/webgl_paint_task.rs
+++ b/canvas/webgl_paint_task.rs
@@ -112,14 +112,12 @@ impl WebGLPaintTask {
gl::enable_vertex_attrib_array(attrib_id),
CanvasWebGLMsg::GetAttribLocation(... | 6 | 68 | 28 |
b6f8f62e2d28f54e1a4bf85cc4ac2bcf8ae9ff3e | Corey Farwell | 2015-08-30T13:00:33 | servo: Merge #7433 - Cleanup, refactor FormDataMethods::Get (from frewsxcv:formdata-get); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 89a5e2b3d098fc2afdb95ebcebeb8d7beeebc96a | diff --git a/script/dom/formdata.rs b/script/dom/formdata.rs
index 8390430c3..8631cefbd 100644
--- a/script/dom/formdata.rs
+++ b/script/dom/formdata.rs
@@ -85,21 +85,14 @@ impl FormDataMethods for FormData {
self.data.borrow_mut().remove(&name);
}
- #[allow(unsafe_code)]
// https://xhr.spec.wha... | 1 | 6 | 13 |
7975060e1bfd9b2e4546f3a2bc4e9731a9c07246 | Ms2ger | 2015-08-28T19:51:32 | servo: Merge #7435 - Send the start and end half of a TimelineMarker to the devtools … (from Ms2ger:markers); r=jdm
…PullTimelineMarkers thread together.
Source-Repo: https://github.com/servo/servo
Source-Revision: b68b31a062c245684c3b41132c568fd3836fb30c | diff --git a/devtools/actors/timeline.rs b/devtools/actors/timeline.rs
index 17327b104..b38b85a97 100644
--- a/devtools/actors/timeline.rs
+++ b/devtools/actors/timeline.rs
@@ -6,7 +6,6 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use msg::constellation_msg::PipelineId;
use rustc_serialize::{json, Encoder... | 4 | 47 | 99 |
b3afe6e44a0923a54875dd3f1509315acc53094a | Josh Matthews | 2015-08-28T19:14:28 | servo: Merge #7436 - Improve debuggability of http_loader panics (from jdm:netthreadname); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 645dd7ba03ea56f01f2e162c590ea047516320ac | diff --git a/net/http_loader.rs b/net/http_loader.rs
index bc47b6aa7..e59ad1521 100644
--- a/net/http_loader.rs
+++ b/net/http_loader.rs
@@ -42,8 +42,8 @@ pub fn factory(resource_mgr_chan: IpcSender<ControlMsg>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
hsts_list: Arc<Mutex<HSTS... | 1 | 2 | 2 |
06af8b59446d5b8fd5723959ea644c4fafdf3d6d | Glenn Watson | 2015-08-28T17:26:09 | servo: Merge #7417 - Fix requestAnimationFrame in headless mode. Fixes #7296 (from glennw:headless-raf); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 064b72ac97197e7d1c6cbfd14a4546822c662332 | diff --git a/compositing/headless.rs b/compositing/headless.rs
index d56c50de1..d8f952bea 100644
--- a/compositing/headless.rs
+++ b/compositing/headless.rs
@@ -7,6 +7,7 @@ use windowing::WindowEvent;
use euclid::scale_factor::ScaleFactor;
use euclid::size::Size2D;
+use msg::constellation_msg::AnimationState;
use ... | 1 | 13 | 1 |
7d16c073159f1b2ae6b65e8b2c4a2bfd13675283 | Josh Matthews | 2015-08-28T16:08:32 | servo: Merge #7391 - Replace catch-all experimental flag with fine-grained boolean prefere… (from jdm:prefs); r=Ms2ger
…nces initialized from a JSON document.
Source-Repo: https://github.com/servo/servo
Source-Revision: 72125f070d7faa0f3a927cf8150fabfb382648e7 | diff --git a/compositing/constellation.rs b/compositing/constellation.rs
index 497dbcbe8..8d0c2fee4 100644
--- a/compositing/constellation.rs
+++ b/compositing/constellation.rs
@@ -54,8 +54,8 @@ use style::viewport::ViewportConstraints;
use url::Url;
use util::cursor::Cursor;
use util::geometry::PagePx;
-use util::o... | 10 | 90 | 45 |
7eeaf513c7806d6385bb23cf8bc04d4e132982a3 | Johann Tuffe | 2015-08-28T15:35:47 | servo: Merge #7227 - rewrite of mime_classifier.rs to use more iterators (from tafia:tafia-mime_classifier); r=jdm
Rewrite few parts of the file to use more iterators.
Note that I have **no idea** what the code is actually doing functionally, I just tried to mimic exactly what was being done. All tests are ok
Source... | diff --git a/net/mime_classifier.rs b/net/mime_classifier.rs
index ea71a2661..0ed472b39 100644
--- a/net/mime_classifier.rs
+++ b/net/mime_classifier.rs
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::borrow::ToOwned;
-use std::cmp::max;
pub struct MIMEClassifier {
im... | 1 | 139 | 171 |
59a0337aaec48fb7e2706863e81cda762b153113 | Corey Farwell | 2015-08-28T14:49:00 | servo: Merge #7431 - Merge adjacent identical `impl` sections (from frewsxcv:dom-methods-cleanup); r=Ms2ger
Prior to #7416 and #7401, many of these `impl` sections were not
identical
Source-Repo: https://github.com/servo/servo
Source-Revision: 2f227a034a12158e2592b645c061d92c87c8eba6 | diff --git a/script/dom/blob.rs b/script/dom/blob.rs
index 23b9965a9..f8102dd9a 100644
--- a/script/dom/blob.rs
+++ b/script/dom/blob.rs
@@ -77,10 +77,7 @@ impl Blob {
};
Ok(Blob::new(global, bytes, &typeString.to_ascii_lowercase()))
}
-}
-
-impl Blob {
pub fn read_out_buffer(&self, send: ... | 16 | 0 | 52 |
2e9a6f7b78237511585e588d05a5cb8fb61dd533 | Simon Sapin | 2015-08-28T11:16:03 | servo: Merge #6854 - Remove usage of slice_chars in script (from servo:slice_chars); r=jdm+Ms2ger
It’s deprecated in the #6850 rustup.
The first commit changes some behavior which was previously incorrect: the spec says indices in DOM strings are UTF-16 code units, not `char` code points.
The second commit should no... | diff --git a/script/dom/characterdata.rs b/script/dom/characterdata.rs
index 47427eb44..d9c558ee2 100644
--- a/script/dom/characterdata.rs
+++ b/script/dom/characterdata.rs
@@ -17,7 +17,7 @@ use dom::element::Element;
use dom::eventtarget::{EventTarget, EventTargetTypeId};
use dom::node::{Node, NodeTypeId};
-use ut... | 3 | 131 | 54 |
cd76602af36299becb98f2373c2291f608c297c2 | benshu | 2015-08-27T23:00:15 | servo: Merge #7341 - Add profiling to the script event loop (#5331) (from benschulz:script-profiling); r=Manishearth
I fear the category names are unimaginative; in some cases they may even be misleading or downright incorrect. Requests to rename categories as well as any other feedback are highly appreciated.
Source... | diff --git a/script/dom/dedicatedworkerglobalscope.rs b/script/dom/dedicatedworkerglobalscope.rs
index efc5dc238..128bedbbe 100644
--- a/script/dom/dedicatedworkerglobalscope.rs
+++ b/script/dom/dedicatedworkerglobalscope.rs
@@ -17,9 +17,10 @@ use dom::bindings::structuredclone::StructuredCloneData;
use dom::bindings:... | 11 | 184 | 50 |
7050f07c3a5cbd9dd48537fd6c4c66c9eec6d8f0 | João Oliveira | 2015-08-27T00:37:58 | servo: Merge #7403 - Remove get_unsound_ref_forever function (from jxs:delete_get_unsound_ref_forever); r=nox
closes #7383
Source-Repo: https://github.com/servo/servo
Source-Revision: 7a6d8a30d316fb65c2c846d3d6d0d5e33b29bc5c | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index 5b05d3ea9..a483fde3a 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -433,11 +433,6 @@ impl<T: Reflectable> Root<T> {
&**self
}
- /// Don't use this. Don't make me find you.
- pub fn get_unsound_ref_... | 1 | 0 | 5 |
311d00cc05fc9757ea416db53c7e4ab535b8150c | Martin Robinson | 2015-08-26T17:38:34 | servo: Merge #7392 - Split out layered child stacking contexts in display lists (from mrobinson:layered-separate); r=pcwalton
This patch is in preparation for more dynamic layerization of the
pieces of display lists. It also prevents having to sort the children
by z-index multiple times.
Source-Repo: https://github.c... | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index 5713a91d7..9555a3fb9 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -98,6 +98,8 @@ pub struct DisplayList {
pub outlines: LinkedList<DisplayItem>,
/// Child stacking contexts.
pub children: LinkedList<Arc<Stacking... | 2 | 42 | 20 |
ca2514cf94f19a3875f05df5fb09acd11ac05096 | Ms2ger | 2015-08-26T14:52:16 | servo: Merge #7386 - Remove Emitter::markers (from Ms2ger:emitter); r=jdm
The vector is filled in and immediately emptied again. It is clearer to
keep the vector in the caller instead.
Source-Repo: https://github.com/servo/servo
Source-Revision: 0e78815242440dee9bcf84e60c0a1d1fb68d67ad | diff --git a/devtools/actors/timeline.rs b/devtools/actors/timeline.rs
index a608ff138..17327b104 100644
--- a/devtools/actors/timeline.rs
+++ b/devtools/actors/timeline.rs
@@ -7,7 +7,6 @@ use msg::constellation_msg::PipelineId;
use rustc_serialize::{json, Encoder, Encodable};
use std::cell::RefCell;
use std::collec... | 1 | 14 | 14 |
2e4b13dca99c2e82388929b9d31e1930e027cc75 | David Zbarsky | 2015-08-26T14:13:11 | servo: Merge #6880 - Don't try to unwrap the result of requestAnimationFrame callback (from dzbarsky:rAF); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 186c1d14d5b5fd8e9fcd5147d47ebe998dfe45cd | diff --git a/script/dom/window.rs b/script/dom/window.rs
index ca642c8a2..c6bfcd251 100644
--- a/script/dom/window.rs
+++ b/script/dom/window.rs
@@ -530,7 +530,8 @@ impl<'a> WindowMethods for &'a Window {
let callback = move |now: f64| {
// TODO: @jdm The spec says that any exceptions should be... | 1 | 2 | 1 |
63b92a7494a11bf3568ea859a30d52b3bc21d388 | Ms2ger | 2015-08-26T13:18:34 | servo: Merge #7378 - Update url (from Ms2ger:url); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 9e52dd8ceee6a1af05f3d167e690b6e80c50fab5 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index ab04e500d..3e880ad7a 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -24,7 +24,7 @@ dependencies = [
"script_tests 0.0.1",
"style_tests 0.0.1",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.36 (registry+https://gith... | 1 | 23 | 23 |
a463e97fde1b61b3a366cb96a3f25e59c0adfe5e | Sara Tang | 2015-08-26T11:53:38 | servo: Merge #7352 - BinaryOrPlaintextClassifier::classify_impl does not need to return Option (from saratang:issue_7347); r=Ms2ger
Fixes for Issue #7347, though I wasn't sure how to test my code afterwards.
Source-Repo: https://github.com/servo/servo
Source-Revision: 78d72f6a9bfa6c2f4828a6e8c83265526b666f1a | diff --git a/net/mime_classifier.rs b/net/mime_classifier.rs
index c4e949665..ea71a2661 100644
--- a/net/mime_classifier.rs
+++ b/net/mime_classifier.rs
@@ -277,28 +277,28 @@ impl MIMEChecker for Mp4Matcher {
struct BinaryOrPlaintextClassifier;
impl BinaryOrPlaintextClassifier {
- fn classify_impl(&self, data: &... | 1 | 5 | 5 |
5b09c2fa7f6b11c8e6b52284f192a4874cc1eebf | wilmoz | 2015-08-26T11:21:42 | servo: Merge #7360 - Make handle_potential_webgl_error more ergonomic (from wilcus:ErgonomicSignature); r=Ms2ger
https://github.com/servo/servo/issues/7358
Source-Repo: https://github.com/servo/servo
Source-Revision: 06ba2167ba3a247c1e7473a208ee4e692f6fa30e | diff --git a/script/dom/webglrenderingcontext.rs b/script/dom/webglrenderingcontext.rs
index d9ed4d0d8..c7f6ca548 100644
--- a/script/dom/webglrenderingcontext.rs
+++ b/script/dom/webglrenderingcontext.rs
@@ -58,7 +58,10 @@ macro_rules! handle_potential_webgl_error {
$return_on_error
}
... | 1 | 8 | 5 |
1c3ca94a777dfdeca525742676bca25f0fb82bfe | Patrick Walton | 2015-08-25T23:16:34 | servo: Merge #7369 - layout: Fix calculation of overflow for stacking contexts that contain `position: relative` fragments (from pcwalton:relative-layer-overflow); r=glennw
Fixes placement of the header on espn.go.com.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: a1cd27e6a3b961129fd4710513... | diff --git a/gfx/paint_task.rs b/gfx/paint_task.rs
index 43ca598c3..6fd677495 100644
--- a/gfx/paint_task.rs
+++ b/gfx/paint_task.rs
@@ -382,7 +382,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send + 'static {
// When there is a new layer, the transforms and origin
// are... | 3 | 9 | 7 |
b99455b45aa3c5b44cd3efb24f3d15913802ce59 | Avi Weinstock | 2015-08-25T19:59:45 | servo: Merge #7364 - Update rust-clipboard to a version that works on Windows and Mac (from aweinstock314:update-clipboard-20140825); r=jdm
Possibly completes #5376.
Source-Repo: https://github.com/servo/servo
Source-Revision: ab55e3ec1012bf6032803c2036059297b19e3b94 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index facd2a902..ab04e500d 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -101,6 +101,14 @@ name = "bitflags"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "block"
+version = "0.1.0"
+source = "regist... | 1 | 36 | 6 |
01750ee76a5dff5bc57070becfac2ffd0a0997d1 | wilmoz | 2015-08-25T17:29:56 | servo: Merge #7362 - Forbid multiline imports (from wilcus:ForbidMultilineImports); r=jdm
https://github.com/servo/servo/issues/7356
Source-Repo: https://github.com/servo/servo
Source-Revision: 121110a52a549b44e65aa4ba0669bd75702588ea | diff --git a/script/dom/webglrenderingcontext.rs b/script/dom/webglrenderingcontext.rs
index 2effacd8c..d9ed4d0d8 100644
--- a/script/dom/webglrenderingcontext.rs
+++ b/script/dom/webglrenderingcontext.rs
@@ -2,13 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain ... | 1 | 4 | 5 |
d3e25ef70d5a457a28931af6b3ecd9cc205a8447 | Patrick Walton | 2015-08-25T00:01:39 | servo: Merge #7340 - layout: Don't crash if `quotes: none` is specified and generated content uses quotes (from pcwalton:quotes-none-crash); r=mbrubeck
Avoids a crash on The Verge.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: e97d8bd25cad5204e0b129884e5c032ddba92e83 | diff --git a/layout/generated_content.rs b/layout/generated_content.rs
index f51261676..316f012b8 100644
--- a/layout/generated_content.rs
+++ b/layout/generated_content.rs
@@ -213,11 +213,11 @@ impl<'a,'b> ResolveGeneratedContentFragmentMutator<'a,'b> {
RenderingMode::All... | 1 | 23 | 20 |
342a737ffb9c4fbe5c6c02dc61ba6dd5eb534c40 | Connor Imes | 2015-08-24T21:05:56 | servo: Merge #7342 - Fix heartbeats build with new -sys version. Fixes #7328 (from connorimes:fix-heartbeats-build); r=larsbergstrom
Updated -sys packages to build from a local copy of the native library source rather than using git submodules.
Source-Repo: https://github.com/servo/servo
Source-Revision: abb57c357997... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index ade72cabc..350f69e53 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -681,7 +681,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d... | 1 | 2 | 2 |
aa7c4aa2475213ec9a7a3ade9c3f5083c403b0e7 | João Oliveira | 2015-08-24T17:52:03 | servo: Merge #7338 - Move RegisterBindings::RegisterProxyHandlers call into script::init (from jxs:master); r=Ms2ger
closes #7336
Source-Repo: https://github.com/servo/servo
Source-Revision: 9bb97319a241af27991705e3385fef6a8093735d | diff --git a/script/lib.rs b/script/lib.rs
index 5bae56330..3c68c18d2 100644
--- a/script/lib.rs
+++ b/script/lib.rs
@@ -98,6 +98,8 @@ mod devtools;
mod horribly_inefficient_timers;
mod webdriver_handlers;
+use dom::bindings::codegen::RegisterBindings;
+
#[cfg(target_os="linux")]
#[allow(unsafe_code)]
fn perform... | 2 | 6 | 5 |
9e8a8e81f9831a39f5395d804d5413e029b82533 | Paul Rouget | 2015-08-24T11:08:41 | servo: Merge #7331 - prevent division by 0 (from paulrouget:issue-7316); r=SimonSapin
Fix #7316
Source-Repo: https://github.com/servo/servo
Source-Revision: 524b02dbf7c2d8ef0d3a453124075f7718f7e458 | diff --git a/layout/flex.rs b/layout/flex.rs
index 6861d6a62..3c34aeaf7 100644
--- a/layout/flex.rs
+++ b/layout/flex.rs
@@ -212,8 +212,14 @@ impl FlexFlow {
debug!("inline_mode_assign_inline_sizes");
debug!("content_inline_size = {:?}", content_inline_size);
- debug!("child_count = {:?}", Im... | 1 | 8 | 2 |
7e0606c0b1e878b3b210dd41731926df1cad2e4f | Simon Sapin | 2015-08-24T10:23:13 | servo: Merge #7334 - Parse :active pseudo-class selector (from servo:active); r=SimonSapin
This is #7258 with a spec link added in doc-comment.
The pseudo-class is never matched, but this can still help with stylesheets like `a:hover, a:active { color: something }` where failing to parse one pseudo-class makes the en... | diff --git a/layout/wrapper.rs b/layout/wrapper.rs
index 6deb515f5..ca7d6142b 100644
--- a/layout/wrapper.rs
+++ b/layout/wrapper.rs
@@ -478,6 +478,12 @@ impl<'le> ::selectors::Element for LayoutElement<'le> {
node.get_focus_state_for_layout()
}
+ #[inline]
+ fn get_active_state(&self) -> bool {
+... | 4 | 35 | 1 |
cff47407e29a094195b2d35f70efd54f87ad2aa6 | João Oliveira | 2015-08-23T23:39:12 | servo: Merge #7330 - remove PrivateCSSStyleDeclarationHelpers trait from Element, (from jxs:master); r=nox
call get_inline_style_declaration and
get_important_inline_style_declaration inline
closes #7319
Source-Repo: https://github.com/servo/servo
Source-Revision: f63d35662e03ce6fe9097833fa90d0e97aec16ec | diff --git a/script/dom/cssstyledeclaration.rs b/script/dom/cssstyledeclaration.rs
index cb59a097b..5e2b82c18 100644
--- a/script/dom/cssstyledeclaration.rs
+++ b/script/dom/cssstyledeclaration.rs
@@ -78,23 +78,6 @@ impl CSSStyleDeclaration {
}
}
-trait PrivateCSSStyleDeclarationHelpers {
- fn get_declaratio... | 1 | 3 | 20 |
5a7394ff1ede26fcb3a44233213afcc033949f36 | Connor Imes | 2015-08-22T23:23:50 | servo: Merge #7179 - Integrate with simple Heartbeats (from connorimes:add-heartbeats); r=larsbergstrom
This PR adds Heartbeats capability to servo. Heartbeats are used for detailed performance and power/energy profiling. We will add the power/energy readings in the future.
New dependencies are introduced which nee... | diff --git a/profile/Cargo.toml b/profile/Cargo.toml
index 4ec2abfcb..c71569c31 100644
--- a/profile/Cargo.toml
+++ b/profile/Cargo.toml
@@ -13,6 +13,9 @@ path = "../profile_traits"
[dependencies.util]
path = "../util"
+[dependencies.hbs-pow]
+git = "https://github.com/libheartbeats/heartbeats-simple-rust.git"
+
[... | 6 | 168 | 6 |
a37a1acb97432cb2650d272e563712acf64d54d8 | Patrick Walton | 2015-08-22T21:56:05 | servo: Merge #7291 - layout: Centralize the logic that determines whether fragments get layers in the fragment (from pcwalton:has-layer-flag); r=mbrubeck
…so that it can be activated when we're forcing
the creation of extra layers due to positioned descendants that
themselves have layers.
The newly failing tests were... | diff --git a/layout/block.rs b/layout/block.rs
index abc169ef1..d697cad97 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -31,15 +31,17 @@ use context::LayoutContext;
use display_list_builder::{BlockFlowDisplayListBuilding, BorderPaintingMode};
use display_list_builder::{FragmentDisplayListBuilding};
use float... | 3 | 99 | 67 |
138083258b6dc3ad8035013ac12d6419d5d12e6b | Patrick Walton | 2015-08-22T20:04:07 | servo: Merge #7277 - layout: Make `position: relative` with non-auto `z-index` create a stacking context (from pcwalton:position-relative-stacking-context); r=glennw
Improves imgur.com and Fast Company articles.
This change made `min-height-106.htm.ini` fail because the thing it was testing
for never worked: we were ... | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 55ee934bb..f2f1bafcf 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -2023,15 +2023,17 @@ impl Fragment {
overflow_x::T::visible,
overflow_x::T::visible) |
(position::T::fixed,
+ z_index::T::Auto,... | 1 | 6 | 4 |
84f2279e66d4f3c5d9df4eb7ffcabad22a580a1c | Paul Rouget | 2015-08-22T11:20:09 | servo: Merge #7096 - Glutin update (from paulrouget:glutin-update); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 12c44d69f69e723b86fa7539a1238e0c883816a5 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 60df35ece..4a9911942 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -91,6 +91,11 @@ dependencies = [
"serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "bitflags"
+version = "0.1.1"
+source = "registry+https:... | 1 | 124 | 13 |
8bc4b9598ec2c3f6be379eac9e0aaa0914b20cf7 | Corey Farwell | 2015-08-21T10:43:57 | servo: Merge #7299 - Cleanup Element iteration in dom/htmlcollection.rs (from frewsxcv:cleanup-htmlcollection-iteration); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 7c45ff8e05a6ebd21f9aa5c360e997a01d48b1fc | diff --git a/script/dom/htmlcollection.rs b/script/dom/htmlcollection.rs
index 48c082fd2..f31dc1894 100644
--- a/script/dom/htmlcollection.rs
+++ b/script/dom/htmlcollection.rs
@@ -15,7 +15,6 @@ use dom::window::Window;
use util::str::{DOMString, split_html_space_chars};
use std::ascii::AsciiExt;
-use std::iter::{F... | 1 | 35 | 31 |
4ceff85cb8b45b0e4589ee4f7b429a36f8d8589f | Corey Farwell | 2015-08-20T17:19:21 | servo: Merge #7297 - Work around uses of #[allow(unrooted_must_root)] (from frewsxcv:avoid-disable-root-lint); r=Manishearth
Using this directive could cause rooting errors to be silently ignored,
so we should avoid it as much as possible
Source-Repo: https://github.com/servo/servo
Source-Revision: c84b25cc992dfc2d3b... | diff --git a/script/dom/htmlcollection.rs b/script/dom/htmlcollection.rs
index 71da0d9c0..48c082fd2 100644
--- a/script/dom/htmlcollection.rs
+++ b/script/dom/htmlcollection.rs
@@ -176,28 +176,25 @@ impl HTMLCollection {
impl<'a> HTMLCollectionMethods for &'a HTMLCollection {
// https://dom.spec.whatwg.org/#dom... | 1 | 7 | 10 |
45ab54164433f75d000a94d6f110aace6d141208 | Ravi Shankar | 2015-08-20T14:17:30 | servo: Merge #7238 - Improved field names for devtools-related channels (from Wafflespeanut:workerglobal); r=Ms2ger
(for #6924) - I took this because the confusion was actually caused by me while working on #6829
Source-Repo: https://github.com/servo/servo
Source-Revision: 0466766b2c946a781d917b3dac8f87714719369c | diff --git a/script/dom/dedicatedworkerglobalscope.rs b/script/dom/dedicatedworkerglobalscope.rs
index c1e8639d0..1521b0d5b 100644
--- a/script/dom/dedicatedworkerglobalscope.rs
+++ b/script/dom/dedicatedworkerglobalscope.rs
@@ -157,7 +157,7 @@ impl DedicatedWorkerGlobalScope {
fn new_inherited(init: WorkerGlobalS... | 3 | 24 | 24 |
2735ac6b3e313f03a9039e46671fddab6bbb6b4f | Theodore Kokkoris | 2015-08-20T13:10:14 | servo: Merge #7289 - Combine transform-origin, perspective-origin code (from tgkokk:perspective-transform-origin-combine); r=dzbarsky
First PR, please tell me if anything is wrong/could use improvement.
Fixes #7194.
Source-Repo: https://github.com/servo/servo
Source-Revision: c98c1651a329d152b436d017e15546f9b922fe93 | diff --git a/style/properties.mako.rs b/style/properties.mako.rs
index bafa23e94..323209083 100644
--- a/style/properties.mako.rs
+++ b/style/properties.mako.rs
@@ -100,6 +100,9 @@ def switch_to_style_struct(name):
%>
pub mod longhands {
+ use cssparser::Parser;
+ use parser::ParserContext;
+ use values::s... | 1 | 99 | 136 |
c3782b75f8c19994089a53e46159c62848bbaf1e | Anthony Ramine | 2015-08-20T12:40:33 | servo: Merge #7251 - Correctly handle length-changing mappings in text-transform (from nox:text-transform-length-change); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 39b7508aa2b1f7d9b97d69ce3396d24c92c30efe | diff --git a/layout/text.rs b/layout/text.rs
index fb1e2b937..fdac2dfa6 100644
--- a/layout/text.rs
+++ b/layout/text.rs
@@ -503,8 +503,9 @@ impl RunMapping {
/// Accounts for `text-transform`.
///
-/// FIXME(#4311, pcwalton): Case mapping can change length of the string; case mapping should
-/// be language-specif... | 1 | 7 | 6 |
10a67affee78ed1b1e6968f74862d0c239c2158f | Ms2ger | 2015-08-20T12:01:39 | servo: Merge #7271 - Remove the unused XMLHttpRequestEventTarget::eventtarget method (from Ms2ger:xhret); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: d3c7e31722fb194f1a266eec9ae57d2f2557e7a6 | diff --git a/script/dom/xmlhttprequesteventtarget.rs b/script/dom/xmlhttprequesteventtarget.rs
index 3bf1aa408..031d0cd36 100644
--- a/script/dom/xmlhttprequesteventtarget.rs
+++ b/script/dom/xmlhttprequesteventtarget.rs
@@ -26,12 +26,8 @@ impl XMLHttpRequestEventTarget {
eventtarget: EventTarget::new_inhe... | 1 | 1 | 5 |
20af932cfc505e5b683f85636422bc6a16191cb7 | Patrick Walton | 2015-08-20T11:17:47 | servo: Merge #7294 - layout: Don't panic if `requestAnimationFrame()` is called before first layout (from servo:tick-animations-with-no-layout-root); r=glennw+Ms2ger
Closes #7115.
Source-Repo: https://github.com/servo/servo
Source-Revision: 8f05447a7b1977f91fab753166fa428164a9307b | diff --git a/layout/layout_task.rs b/layout/layout_task.rs
index 4c982ec96..010bbdd57 100644
--- a/layout/layout_task.rs
+++ b/layout/layout_task.rs
@@ -1276,14 +1276,23 @@ impl LayoutTask {
&self.url,
... | 1 | 17 | 8 |
0484dc9697cfcf764d0ad78dec4a0314a381de31 | Corey Farwell | 2015-08-20T08:52:40 | servo: Merge #7285 - Bump js (rust-mozjs) to the latest commit (from frewsxcv:bump-mozjs); r=Ms2ger
I need the constants added in
https://github.com/servo/rust-mozjs/pull/191 for
https://github.com/servo/servo/pull/7254
Source-Repo: https://github.com/servo/servo
Source-Revision: 14b921ee29b1b5e46e8773836b5a31e85faab... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 02a96a64a..60df35ece 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -728,7 +728,7 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9"
+source = "git+h... | 1 | 1 | 1 |
6e6837493047e571f72485f42b7101f7247cf773 | Patrick Walton | 2015-08-20T00:34:58 | servo: Merge #7292 - gfx: Sort layers according to their Z-index value before handing them off to the compositor (from pcwalton:layer-sorting); r=glennw
Closes #7166.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: c328b76459f34dfe33570d686452e08b7718b4bd | diff --git a/gfx/paint_task.rs b/gfx/paint_task.rs
index 175a7b040..26c5308ae 100644
--- a/gfx/paint_task.rs
+++ b/gfx/paint_task.rs
@@ -27,6 +27,7 @@ use msg::constellation_msg::PipelineExitType;
use profile_traits::mem::{self, ReportsChan};
use profile_traits::time::{self, profile};
use rand::{self, Rng};
+use sma... | 1 | 8 | 0 |
f3f20890f036919c4073671fc67874f20279f586 | Patrick Walton | 2015-08-19T19:33:08 | servo: Merge #7287 - layout: Put iframes that form stacking contexts in the right place (from pcwalton:iframe-stacking-context); r=glennw
Improves eBay.
Closes #7282.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: ac4ca053376fe061a324d3b860892719aa3a32ad | diff --git a/layout/display_list_builder.rs b/layout/display_list_builder.rs
index 8710c519d..59264e24a 100644
--- a/layout/display_list_builder.rs
+++ b/layout/display_list_builder.rs
@@ -1011,9 +1011,15 @@ impl FragmentDisplayListBuilding for Fragment {
// because layout for the iframe only needs to know siz... | 1 | 9 | 3 |
70fe5f67ebe9ce8b86843357a6b418a8a530367e | Patrick Walton | 2015-08-19T17:39:33 | servo: Merge #7280 - layout: Take the style-specified width into account when computing the intrinsic inline sizes of images (from pcwalton:style-specified-img-intrinsic-width); r=mbrubeck
Improves Facebook Timeline.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 5c284a546a539ddcc546fc5c00... | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 68dde96f3..bb9a0b820 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1269,10 +1269,16 @@ impl Fragment {
result.union_block(&block_flow.base.intrinsic_inline_sizes)
}
SpecificFragmentInfo::Image(ref mut im... | 1 | 10 | 4 |
3870a451d115c8736094b37592abc497dc06a141 | Ms2ger | 2015-08-19T13:30:57 | servo: Merge #7283 - Cleanup ActorRegistry::create_shareable (from Ms2ger:create_shareable); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 1fd5418f432e3c456cdd557c536db4c349775248 | diff --git a/devtools/actor.rs b/devtools/actor.rs
index 8cc9a2231..cf2dab905 100644
--- a/devtools/actor.rs
+++ b/devtools/actor.rs
@@ -110,16 +110,18 @@ impl ActorRegistry {
}
/// Creating shareable registry
- pub fn create_shareable(self) -> Arc<Mutex<ActorRegistry>>{
- if self.shareable.is_som... | 1 | 9 | 7 |
a2bd00a8f489a1f280d802d99aca5bede394a49a | Patrick Walton | 2015-08-19T10:41:54 | servo: Merge #7279 - layout: Avoid a division by zero in `tile_image()` (from pcwalton:tile-image-divide-by-zero); r=mbrubeck
Fixes a crash on Facebook Timeline.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 0234bbe44469218b70746b2f450d0df8a4db1585 | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 568ebf506..68dde96f3 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -390,9 +390,13 @@ impl ImageFragmentInfo {
}
/// Tile an image
- pub fn tile_image(position: &mut Au, size: &mut Au,
- virtual_position: Au, i... | 1 | 6 | 2 |
c04e05dbad00b3b1033b4fe1987da50e843e1c65 | Patrick Walton | 2015-08-19T09:54:10 | servo: Merge #7276 - layout: Make inline absolute hypothetical boxes not clip their contents (from pcwalton:inline-absolute-hypothetical-clip); r=mbrubeck
Improves the logo on ebay.com.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 195d267e2311d1723f9a70ba9d40db04c557606a | diff --git a/layout/construct.rs b/layout/construct.rs
index e90d46a00..60a547094 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -978,7 +978,13 @@ impl<'a> FlowConstructor<'a> {
let fragment_info = SpecificFragmentInfo::InlineAbsoluteHypothetical(
InlineAbsoluteHypotheticalFragmen... | 2 | 17 | 1 |
8cf03216528ea1b392d8bb3320dd7bb4fd52e409 | Patrick Walton | 2015-08-19T09:20:37 | servo: Merge #7274 - layout: Make table cells' minimum inline sizes override explicitly specified widths if the latter are too small (from pcwalton:table-minimum-width); r=mbrubeck
Improves ebay.com.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 30a1339ed1f57819bcd6b3e0d9e5d5d9d097d6e2 | diff --git a/layout/block.rs b/layout/block.rs
index 70a3da462..9580f1cd6 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1494,42 +1494,15 @@ impl BlockFlow {
surrounding_inline_size,
}
}
-}
-
-impl Flow for BlockFlow {
- fn class(&self) -> FlowClass {
- ... | 3 | 44 | 35 |
2abbab6a4038db0ac39081c2eefeacd49df7cf06 | wilmoz | 2015-08-19T08:47:22 | servo: Merge #7272 - Make EventTypeId reflect DOM inheritance hierarchy (from wilcus:EventType); r=Ms2ger
https://github.com/servo/servo/issues/7205#issuecomment-132285499
Source-Repo: https://github.com/servo/servo
Source-Revision: 15b09fc0afc26f39fc96b8b4b84df4f4aec1ee21 | diff --git a/script/dom/event.rs b/script/dom/event.rs
index 43250102b..77f7f7aa5 100644
--- a/script/dom/event.rs
+++ b/script/dom/event.rs
@@ -10,6 +10,7 @@ use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::... | 4 | 22 | 13 |
ac3dfd7b751b3ecfbb934db08b3b7428f3b4aa0e | Michael Howell | 2015-08-19T07:40:28 | servo: Merge #7260 - Navigate to a new page even when there's a fragment (from notriddle:issue_7169); r=Ms2ger
Closes #7169
Source-Repo: https://github.com/servo/servo
Source-Revision: 70b9922eb021a41ebdd9f54a4db0e9ddfb17786a | diff --git a/script/dom/document.rs b/script/dom/document.rs
index c53889350..bc1198afa 100644
--- a/script/dom/document.rs
+++ b/script/dom/document.rs
@@ -256,7 +256,7 @@ pub trait DocumentHelpers<'a> {
fn disarm_reflow_timeout(self);
fn unregister_named_element(self, to_unregister: &Element, id: Atom);
... | 2 | 22 | 13 |
9340d87898123890c716eb785d1dc39b809212aa | Patrick Walton | 2015-08-18T19:38:05 | servo: Merge #7256 - layout: Use the value of the `max-width` property when speculating what the inline sizes of block formatting contexts are likely to be (from pcwalton:block-formatting-contexts-max-width); r=mbrubeck
Usually, Web developers set this property on block formatting contexts
in order to avoid running in... | diff --git a/layout/block.rs b/layout/block.rs
index 420802bed..70a3da462 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1639,10 +1639,16 @@ impl Flow for BlockFlow {
// We can't actually compute the inline-size of this block now, because floats
// might affect it. Speculate th... | 1 | 10 | 4 |
fcb2d0b2861740293eea67c764d37b0b1bcac135 | Manish Goregaokar | 2015-08-18T14:15:51 | servo: Merge #7224 - Integrate clippy into Servo; cleanup some of script (from Manishearth:clippy); r=Ms2ger
The integration is off by default for now. You can try it out with `./mach build --features "script/plugins/clippy"`.
We're using a branch of clippy with some of the lints changed to Allow, either because they... | diff --git a/devtools_traits/lib.rs b/devtools_traits/lib.rs
index fa562744a..b7ef2ebf5 100644
--- a/devtools_traits/lib.rs
+++ b/devtools_traits/lib.rs
@@ -192,8 +192,8 @@ impl Decodable for Modification {
fn decode<D: Decoder>(d: &mut D) -> Result<Modification, D::Error> {
d.read_struct("Modification", ... | 21 | 99 | 117 |
d89c165ce04ea7240fa080056942b1df166e9675 | Corey Farwell | 2015-08-18T13:31:57 | servo: Merge #7178 - flow::Flow should follow *_mut naming conventions (from frewsxcv:flow-api-mut); r=nox
Fixes #7148
Source-Repo: https://github.com/servo/servo
Source-Revision: 014608f60c45574e6a347f39a96aa33b8eab02e1 | diff --git a/layout/block.rs b/layout/block.rs
index c73f97a82..420802bed 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -451,7 +451,7 @@ impl<'a> PreorderFlowTraversal for AbsoluteAssignBSizesTraversal<'a> {
}
}
- let block = flow.as_block();
+ let block = flow.as_mut_block... | 15 | 125 | 135 |
db3a919a477914c507c9b096f0775fb75dc1980d | Ravi Shankar | 2015-08-18T12:49:26 | servo: Merge #7241 - Matching over event listeners and handlers; r=Ms2ger (from Wafflespeanut:event_handler); r=Ms2ger
... for #7065
Source-Repo: https://github.com/servo/servo
Source-Revision: ff6a70fad3545a04a9646121bd1b0725254bebeb | diff --git a/script/dom/eventdispatcher.rs b/script/dom/eventdispatcher.rs
index e8603b3b0..3451b22d1 100644
--- a/script/dom/eventdispatcher.rs
+++ b/script/dom/eventdispatcher.rs
@@ -47,7 +47,7 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget,
event.set_current_target(cur_target);
... | 2 | 30 | 21 |
8041a2b4d7723315ef7256f86f63407f2e7df14b | Anthony Ramine | 2015-08-18T11:15:12 | servo: Merge #7243 - Avoid a panic when handling collapsing borders (fixes #7144) (from nox:border-collapse-panic); r=pcwalton
There is no need to compute next_collapsed_borders_in_block_direction for all kind of flows when it's used only in the table row case. That also avoids a panic when the next child is a table c... | diff --git a/layout/table.rs b/layout/table.rs
index c3c63b857..d9d65604c 100644
--- a/layout/table.rs
+++ b/layout/table.rs
@@ -262,32 +262,6 @@ impl Flow for TableFlow {
{
let mut iterator = self.block_flow.base.child_iter().peekable();
while let Some(kid) = iterator.next() {
- ... | 1 | 22 | 26 |
8a4dbfe71cdd76ec1551857f789af7e0fd5588ba | Ms2ger | 2015-08-18T10:40:54 | servo: Merge #7263 - Update js (from servo:update-js); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b3d3514c1b6fa010a4a5905e01cd2913538a07e | diff --git a/script/dom/bindings/utils.rs b/script/dom/bindings/utils.rs
index 54ca9c1ca..9f458f83c 100644
--- a/script/dom/bindings/utils.rs
+++ b/script/dom/bindings/utils.rs
@@ -690,7 +690,7 @@ unsafe extern fn wrap(cx: *mut JSContext,
-> *mut JSObject {
// FIXME terrible idea. need secur... | 3 | 12 | 3 |
fc3bd8937cedc8f54b1cc2ddbbde4120857dd9fd | João Oliveira | 2015-08-18T08:46:46 | servo: Merge #7257 - Replace uses of `for foo in bar.iter()`, (from jxs:master); r=Ms2ger
and `for foo in bar.iter_mut(), and for foo in bar.into_iter()
(continuation of #7197)
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d6d6a05009606dfbbfc9765d7dc2c745c18f6a5 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 8721b6d10..9a561b6b7 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -401,7 +401,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
(Msg::AssignPaintedBuffers(pipeline_id, epoch, replies, frame_tree_id... | 29 | 73 | 74 |
1b5d67165898fa882e0954ac49e6c9d38f1ffbf7 | Glenn Watson | 2015-08-18T04:44:38 | servo: Merge #7246 - Add a simple method to emulate a platform UA (e.g. pretend a desktop build is an android UA) (from glennw:platform-ua); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: f340900c38768122ee8647eb3dc3f7cd0e2a6254 | diff --git a/net/resource_task.rs b/net/resource_task.rs
index 7b87ec883..f3acee929 100644
--- a/net/resource_task.rs
+++ b/net/resource_task.rs
@@ -128,7 +128,7 @@ pub fn start_sending_opt(start_chan: LoadConsumer, metadata: Metadata) -> Result
}
/// Create a ResourceTask
-pub fn new_resource_task(user_agent: Opti... | 3 | 41 | 18 |
31c5e40b1a6c5f418d588b4d19dd956859142a05 | Patrick Walton | 2015-08-17T22:53:58 | servo: Merge #7222 - gfx: Paint dashed borders with nonzero radii the same way Gecko does (from pcwalton:dashed-border-radius); r=glennw
It's not ideal, but it was easy to implement and will do for now.
Closes #7157.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: f4b526cfb4ea1ef263ff029650c... | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index afedee4c7..c0e092450 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -244,6 +244,7 @@ impl<'a> PaintContext<'a> {
self.draw_dashed_border_segment(direction,
bounds,
... | 1 | 106 | 26 |
3d1492b1c7a9e939f7e38823fbcef10ac8a17e28 | Patrick Walton | 2015-08-17T19:56:53 | servo: Merge #7177 - layout: Improve our handling of inline absolute containing blocks (from pcwalton:intervening-inline-block); r=mbrubeck
Several issues are addressed in this commit:
* Inline flows now bubble up their absolute descendants instead of
making the inline flow the containing block for them. (In the fu... | diff --git a/layout/block.rs b/layout/block.rs
index fdfec58e7..c73f97a82 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -708,9 +708,9 @@ impl BlockFlow {
/// Return true if this has a replaced fragment.
///
- /// Text, Images, Inline Block and
- // Canvas (https://html.spec.whatwg.org/multipa... | 5 | 164 | 83 |
434b5ece91f4a1edb5b4a355dce74bf074ea880d | Nicholas Nethercote | 2015-08-17T14:56:29 | servo: Merge #7252 - Fix panics in the script_task memory reporter (from nnethercote:fix-reporter-panics); r=Ms2ger
These are caused by page_root being empty.
@jdm, I think it was #6874 that introduced these. I'm seeing them all the time when starting Servo on Reddit with memory profiling enabled. With this patch app... | diff --git a/script/script_task.rs b/script/script_task.rs
index 23ab43828..faf1f06d2 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -1188,23 +1188,26 @@ impl ScriptTask {
let mut urls = vec![];
let mut dom_tree_size = 0;
let mut reports = vec![];
- for it_page in se... | 1 | 17 | 14 |
deb4314792883b45f722ea61908d8d7c6aa836ea | João Oliveira | 2015-08-17T08:33:28 | servo: Merge #7245 - replace len() !=0 with !is_empty() (from jxs:master); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: d90907cb5f7399196b76b3117e19ff4d1b775a96 | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index b5cbc48cf..4b6286aa9 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -213,7 +213,7 @@ impl DisplayList {
};
doit(&(self.all_display_items()));
- if self.children.len() != 0 {
+ if !self.children.... | 2 | 2 | 2 |
96463243f6e331356d0d8a7682564c5b60cbf36f | vectorijk | 2015-08-17T08:03:23 | servo: Merge #7219 - remove unused static collection type in htmlcollection.rs (from vectorijk:issue#7042); r=Ms2ger
ref #7042
Source-Repo: https://github.com/servo/servo
Source-Revision: 71ae18bae4fe72a57ba1f8984891b2523f97b807 | diff --git a/script/dom/htmlcollection.rs b/script/dom/htmlcollection.rs
index fcf9de175..bbac05d5b 100644
--- a/script/dom/htmlcollection.rs
+++ b/script/dom/htmlcollection.rs
@@ -24,28 +24,25 @@ pub trait CollectionFilter : JSTraceable {
#[derive(JSTraceable)]
#[must_root]
-pub enum CollectionTypeId {
- Static... | 1 | 25 | 42 |
c4b6002b27cb7731a22740acc787b772006f0afc | wartman4404 | 2015-08-16T22:52:01 | servo: Merge #7244 - Remove the DOMRefCell wrapper around Window::compositor (from wartman4404:master); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 3bb930661d06c864e17374bfd1f0b0f4d06d7253 | diff --git a/script/dom/window.rs b/script/dom/window.rs
index 1ed699f09..43e4ca6e6 100644
--- a/script/dom/window.rs
+++ b/script/dom/window.rs
@@ -68,7 +68,7 @@ use libc;
use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD};
use std::ascii::AsciiExt;
use std::borrow::ToOwned;
-use std::cell::{Cell, Ref, R... | 1 | 5 | 5 |
1043ccc986478939ac2712653be02e162cf220e9 | vectorijk | 2015-08-16T09:23:27 | servo: Merge #7191 - remove ScriptListener (from vectorijk:removeScriptListener); r=Ms2ger
Fix issue #7175 and for code review
Source-Repo: https://github.com/servo/servo
Source-Revision: 5ab9aa5013801a8ac2b9527a6079c62cc56ff81b | diff --git a/compositing/pipeline.rs b/compositing/pipeline.rs
index a78f606f8..6d398b6f4 100644
--- a/compositing/pipeline.rs
+++ b/compositing/pipeline.rs
@@ -16,7 +16,6 @@ use gfx::font_cache_task::FontCacheTask;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
use layers::ge... | 7 | 23 | 69 |
50af98c1b04011f49778f2aaf516859907ddd46d | Simon Sapin | 2015-08-15T15:17:31 | servo: Merge #7188 - Fix Element::set_inline_style_property_priority’s handling of priority (from servo:set_inline_style_property_priority); r=nox
Thanks to @michaelwu for pointing out a copy-paste error.
Source-Repo: https://github.com/servo/servo
Source-Revision: 31413f4313fb96f9d17e54157d404c7633e59fc2 | diff --git a/script/dom/element.rs b/script/dom/element.rs
index b0f296b9a..8da1c8c93 100644
--- a/script/dom/element.rs
+++ b/script/dom/element.rs
@@ -713,7 +713,7 @@ impl<'a> ElementHelpers<'a> for &'a Element {
let (from, to) = if style_priority == StylePriority::Important {
(&mut decl... | 1 | 1 | 1 |
41568d5b2bcd8617afa8657ec83d36ef58f5f911 | Ms2ger | 2015-08-15T14:16:55 | servo: Merge #7234 - Implement a PerformanceActor (from Ms2ger:PerformanceActor); r=metajack
This is necessary for the devtools "Start Recording Performance" button to
send a message.
(This message is not yet supported, so it leads to
'unexpected message type "startRecording" found for actor "performance4"'.)
Source... | diff --git a/devtools/actors/performance.rs b/devtools/actors/performance.rs
new file mode 100644
index 000000000..4c6d27678
--- /dev/null
+++ b/devtools/actors/performance.rs
@@ -0,0 +1,73 @@
+/* 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 distr... | 3 | 83 | 2 |
17bf40a46d423a13121c7155649da29b3f70c723 | Manish Goregaokar | 2015-08-14T18:53:54 | servo: Merge #7195 - Upgrade Rust to nightly 2015-08-10 (from servo:rustup_20150814); r=Ms2ger
Still needs snapshot.
Snapshot probably could also work as today's nightly (I wasn't able to download the latest one due to choppy internet), there isn't any plugins churn I know of
r? @larsbergstrom
Source-Repo: https://... | diff --git a/plugins/lints/unrooted_must_root.rs b/plugins/lints/unrooted_must_root.rs
index dc116f311..3bdb94b59 100644
--- a/plugins/lints/unrooted_must_root.rs
+++ b/plugins/lints/unrooted_must_root.rs
@@ -49,13 +49,13 @@ fn is_unrooted_ty(cx: &Context, ty: &ty::TyS, in_new_function: bool) -> bool {
match t... | 3 | 10 | 11 |
f2ce581c1af025708274aeab9878f691ca38b1f7 | Ms2ger | 2015-08-14T13:16:19 | servo: Merge #7215 - Use external mutability for FramerateActor::ticks (from Ms2ger:ticks); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d4d18f51f2ac46191d94bfe322a2c0164fb98f17 | diff --git a/devtools/actors/framerate.rs b/devtools/actors/framerate.rs
index 4713046b6..97a366c9f 100644
--- a/devtools/actors/framerate.rs
+++ b/devtools/actors/framerate.rs
@@ -6,7 +6,6 @@ use ipc_channel::ipc::IpcSender;
use rustc_serialize::json;
use std::mem;
use std::net::TcpStream;
-use std::sync::{Arc, Mut... | 2 | 8 | 13 |
8d9ade71d6e33f16bce23fd352dd19689959595a | Nicholas Nethercote | 2015-08-14T12:41:58 | servo: Merge #7213 - Tweak how the "system-heap-allocated" memory report is gathered (from nnethercote:tweak-system-heap-allocated); r=Ms2ger
To handle potential overflow because mallinfo() is ancient.
Source-Repo: https://github.com/servo/servo
Source-Revision: 38c5fb80d3c6c0e08732f5bdb3f0e9f9bf192def | diff --git a/profile/mem.rs b/profile/mem.rs
index b04ced990..598acfb04 100644
--- a/profile/mem.rs
+++ b/profile/mem.rs
@@ -440,14 +440,21 @@ mod system_reporter {
#[cfg(target_os="linux")]
fn get_system_heap_allocated() -> Option<usize> {
- let info: struct_mallinfo = unsafe {
- mallinfo... | 1 | 15 | 8 |
08f48712ba046d29138dd68ed22449f64011d9f5 | João Oliveira | 2015-08-14T06:51:59 | servo: Merge #7208 - replace .len() == 0 with is_empty() (from jxs:master); r=Ms2ger
closes #7198
Source-Repo: https://github.com/servo/servo
Source-Revision: 85022a4c347dca3f5d28cec3010f7e9410217df4 | diff --git a/canvas/canvas_paint_task.rs b/canvas/canvas_paint_task.rs
index f5c4e6c1f..766a7f969 100644
--- a/canvas/canvas_paint_task.rs
+++ b/canvas/canvas_paint_task.rs
@@ -710,7 +710,7 @@ fn write_image(draw_target: &DrawTarget,
smoothing_enabled: bool,
composition_op: CompositionOp... | 19 | 23 | 27 |
4439797ad1494a21c07a9abdbb12c79c4a794ca1 | Fabrice Desré | 2015-08-14T03:05:34 | servo: Merge #7119 - Tentative fix for issue #7110 (from fabricedesre:devtools); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a35360aa31983aad45bdae634c80a24682cb8318 | diff --git a/devtools/actor.rs b/devtools/actor.rs
index b0cd26e24..a42012147 100644
--- a/devtools/actor.rs
+++ b/devtools/actor.rs
@@ -15,6 +15,12 @@ use std::net::TcpStream;
use std::raw::TraitObject;
use std::sync::{Arc, Mutex};
+#[derive(PartialEq)]
+pub enum ActorMessageStatus {
+ Processed,
+ Ignored,
... | 12 | 83 | 76 |
d3860b5d15ad7da2c7e1c8569c11cdab23be80ee | Glenn Watson | 2015-08-14T02:07:56 | servo: Merge #7206 - Fix "'PaintWorker' panicked at 'index 0 and/or 4 in `*` do not lie on… (from glennw:fix-debug-panic); r=pcwalton
… character boundary" when printing display list.
This whole piece of code seems a bit fragile, but it fixes the immediate problem for now.
Source-Repo: https://github.com/servo/servo... | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index bb2b6653b..2822b6908 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -314,7 +314,7 @@ impl StackingContext {
if opts::get().dump_display_list_optimized {
println!("**** optimized display list. Tile... | 1 | 1 | 1 |
988562a8ddb957da9ce1aa85828540a9f976f819 | Greg Guthe | 2015-08-14T00:11:57 | servo: Merge #7165 - Fail on unrecognized debug option (from g-k:refactor-debug-options); r=ms2ger
Refs: https://github.com/servo/servo/issues/7142
Ran some basic functional tests:
```
$ ./mach run -d -Z bubble-widths,disable-canvas-aa,trace-layout tests/ref/blur_ref.html
$ ./mach run -d -Z help
Usage: /Users/greg... | diff --git a/util/opts.rs b/util/opts.rs
index dec1dc3b1..6202396b7 100644
--- a/util/opts.rs
+++ b/util/opts.rs
@@ -10,8 +10,8 @@ use geometry::ScreenPx;
use euclid::size::{Size2D, TypedSize2D};
use getopts::Options;
use num_cpus;
-use std::collections::HashSet;
use std::cmp;
+use std::default::Default;
use std::... | 1 | 137 | 28 |
e27743d4043ee803300adbe732db1f62c312a19d | Jack Moffitt | 2015-08-13T23:00:53 | servo: Merge #7200 - Update skia to get NEON fixes (from metajack:neon-skia); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 92496d32d3cae876d7162991cc9f727df1cb7991 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 3c1c7d985..85625b828 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -1350,7 +1350,7 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#0e2cc56c36ca08371777e11be018d93d2a877881"
+source = "... | 1 | 1 | 1 |
4e287a95a670c2ce7d2301db5069dd5d9350eabe | Ms2ger | 2015-08-13T20:25:38 | servo: Merge #7192 - Implement a ProfilerActor struct (from Ms2ger:profiler); r=jdm
This is sufficient to make the profiler tab show up in Firefox's devtools.
Source-Repo: https://github.com/servo/servo
Source-Revision: 07716780fc805aea63285337ee15e9e56acb47c7 | diff --git a/devtools/actors/profiler.rs b/devtools/actors/profiler.rs
new file mode 100644
index 000000000..3db8b7074
--- /dev/null
+++ b/devtools/actors/profiler.rs
@@ -0,0 +1,34 @@
+/* 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 wi... | 3 | 46 | 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.