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 |
|---|---|---|---|---|---|---|---|
78d812feea33d91b5e07e295f08fa22a5fb51555 | Ms2ger | 2015-02-20T08:42:53 | servo: Merge #4975 - Move util to libc from crates.io (from Ms2ger:util-libc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0a4c8c0e4c0e8c94a82363b10971c99fc0d9abbc | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index abf404d4c..1efd7d91b 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -840,6 +840,7 @@ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"lazy_static 0.1.7 (git+https://gi... | 3 | 2 | 1 |
61c1cffbae36c86e2e4ac60adb404100cffde704 | Jack Moffitt | 2015-02-19T23:21:57 | servo: Merge #4969 - Added overlay for demoing parallel painting (from servo:parallel-paint-demo); r=glennw
You can enable this with `-Z show-parallel-paint`. The output looks like this:
 in tiles.into_iter().enumerate() {
let thread_id = i % self.worker_thr... | 2 | 41 | 15 |
35f1b3c9b394b7394cdf7dcf06a3b44ceab6a10b | Ms2ger | 2015-02-19T20:43:00 | servo: Merge #4970 - Move layout to libc from crates.io (from Ms2ger:js-layout); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: f769626dd2e351c8b408b39bfac6f6cbd53581a9 | diff --git a/layout/Cargo.toml b/layout/Cargo.toml
index eb39cdf31..b24e2c256 100644
--- a/layout/Cargo.toml
+++ b/layout/Cargo.toml
@@ -60,3 +60,4 @@ encoding = "0.2"
url = "0.2.16"
bitflags = "*"
rustc-serialize = "0.2"
+libc = "*"
diff --git a/layout/lib.rs b/layout/lib.rs
index 5644f55b7..44f8f49c0 100644
--- a/... | 5 | 5 | 3 |
eb8e7582a239e0314d0447aed80d94cdfc9428af | Ms2ger | 2015-02-19T19:03:54 | servo: Merge #4963 - Move js to libc from crates.io (from Ms2ger:js-libc); r=jdm
Requires https://github.com/servo/rust-mozjs/pull/136.
Source-Repo: https://github.com/servo/servo
Source-Revision: d94bd278a4a6e5ef38a9967be69ada0f1bf50f6d | diff --git a/script/Cargo.toml b/script/Cargo.toml
index abe767558..f58356ff9 100644
--- a/script/Cargo.toml
+++ b/script/Cargo.toml
@@ -70,3 +70,4 @@ url = "0.2.16"
time = "0.1.12"
bitflags = "*"
rustc-serialize = "*"
+libc = "*"
diff --git a/script/lib.rs b/script/lib.rs
index d0419505e..35d481d5b 100644
--- a/scr... | 3 | 4 | 2 |
5dfbc68da07172dd08107066c1c7108e472d1af4 | Glenn Watson | 2015-02-18T21:42:49 | servo: Merge #4951 - Change window title to reflect document title (from glennw:set-title); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: dc31d96f65246def19cb7a23f3a62795cd7344a1 | diff --git a/script/dom/htmltitleelement.rs b/script/dom/htmltitleelement.rs
index 9696e9ae7..76ef927f6 100644
--- a/script/dom/htmltitleelement.rs
+++ b/script/dom/htmltitleelement.rs
@@ -70,6 +70,19 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTitleElement> {
Some(htmlelement as &VirtualMethods)
}
+ ... | 2 | 14 | 1 |
cb33695847e69391a3104243df7342789cf76eba | Ms2ger | 2015-02-17T14:30:50 | servo: Merge #4947 - Use rustc-serialize rather than the built-in deprecated serialize (from Ms2ger:serialize); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: afb152a8569953f730df564be2745c5a6302bf6f | diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
index 23b7bf5fe..a97c9f1c4 100644
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -17,4 +17,5 @@ path = "../msg"
path = "../util"
[dependencies]
-time = "*"
\ No newline at end of file
+time = "*"
+rustc-serialize = "0.2"
diff --git a/devtools/actor.rs b... | 28 | 36 | 31 |
165783e204f0e9b9ce34cb03d8921a7214190a6b | Manish Goregaokar | 2015-02-17T07:18:49 | servo: Merge #4946 - Update to latest glutin (from Manishearth:glutin_up); r=gw
Also moves some of our deps away from rustc's libc and onto Crates libc.
Needs:
- https://github.com/servo/rust-azure/pull/144
- https://github.com/servo/rust-xlib/pull/35
- https://github.com/servo/gleam/pull/14
- https://github.com... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index fde35423a..0ca03e61e 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -36,7 +36,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304"
+source = "git+... | 1 | 26 | 16 |
291d2b1d78ad16b6bc24afc2d3364d08df1572a7 | Nicholas Nethercote | 2015-02-16T22:54:48 | servo: Merge #4938 - Avoid bloom filter churn (from nnethercote:dont-clone-bloom-filter); r=Ms2ger
When a cached bloom filter is found during traversal, there are two
cases, both of which currently do unnecessary allocations. This patch
avoids these allocations. In the process, it renders correct two
previously-incorr... | diff --git a/layout/traversal.rs b/layout/traversal.rs
index c31d4dcde..3ec4aa1bb 100644
--- a/layout/traversal.rs
+++ b/layout/traversal.rs
@@ -55,7 +55,7 @@ thread_local!(static STYLE_BLOOM: RefCell<Option<(Box<BloomFilter>, UnsafeLayout
/// Returns the task local bloom filter.
///
/// If one does not exist, a new... | 1 | 4 | 5 |
b3d3edd8551f5e14a3610e021868f20b535833bf | Glenn Watson | 2015-02-16T21:06:52 | servo: Merge #4934 - Fixes background-color calculation for iframes. Fixes #1248 (from glennw:fix-1248); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d2e840bf49f7d9d8022ab2566cfb641dd578a44 | diff --git a/layout/layout_task.rs b/layout/layout_task.rs
index fb6f14fe5..3d2bc463c 100644
--- a/layout/layout_task.rs
+++ b/layout/layout_task.rs
@@ -666,7 +666,17 @@ impl LayoutTask {
// FIXME(pcwalton): This is really ugly and can't handle overflow: scroll. Refactor
// it with extreme p... | 2 | 12 | 2 |
9e194a36cde7f815351b52cc878964d003807c0e | Glenn Watson | 2015-02-16T20:19:02 | servo: Merge #4937 - Support root element having percentage heights in layout (from glennw:pc-height); r=pcwalton
This allows using standard CSS techniques to place a footer at the bottom of the page.
Source-Repo: https://github.com/servo/servo
Source-Revision: c7d3ea1c6588512c62ce6688ad0e544dacccfb8f | diff --git a/layout/block.rs b/layout/block.rs
index 50042be38..bac78f902 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1299,8 +1299,16 @@ impl BlockFlow {
// Calculate non-auto block size to pass to children.
let content_block_size = self.fragment.style().content_block_size();
- let... | 1 | 12 | 4 |
dca75d5703615a55126760761ea49452c1ce35cc | Ms2ger | 2015-02-14T06:21:49 | servo: Merge #4914 - Cleanup match_lang_ty a bit (from Ms2ger:match_lang_ty); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 736c58067064a421f732dae118fde811b50b8aa6 | diff --git a/plugins/utils.rs b/plugins/utils.rs
index 1be51283c..0bc146186 100644
--- a/plugins/utils.rs
+++ b/plugins/utils.rs
@@ -38,26 +38,30 @@ pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P<Ty>]>
/// Checks if a type has a #[servo_lang = "str"] attribute
pub fn match_lang_ty(cx: &C... | 1 | 22 | 18 |
2adcc435015cf46b0d19d7517b8458ce3e0d5467 | Adenilson Cavalcanti | 2015-02-13T22:51:50 | servo: Merge #4903 - Companion single Color patch (from Adenilson:singleColor02); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b5749e9855b68636d5366450602cd73397a6f219 | diff --git a/gfx/color.rs b/gfx/color.rs
index 0bf03bff6..a91c6818e 100644
--- a/gfx/color.rs
+++ b/gfx/color.rs
@@ -3,9 +3,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use azure::AzFloat;
-use azure::azure_hl::Color as AzColor;
+use azure::azure::AzColor;
-pub type Color = AzColor;
+#[inl... | 7 | 27 | 14 |
acaa4e34a20d7fef535972b464b2817224e7762e | Ms2ger | 2015-02-13T16:48:54 | servo: Merge #4927 - Cleanup memory.rs a bit (from Ms2ger:mem); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 52fc01ad37e5e06de997862f480e8bb679ad8a89 | diff --git a/util/memory.rs b/util/memory.rs
index 27ee408b3..5249f3709 100644
--- a/util/memory.rs
+++ b/util/memory.rs
@@ -10,7 +10,6 @@ use std::ffi::CString;
use std::old_io::timer::sleep;
#[cfg(target_os="linux")]
use std::old_io::File;
-use std::mem;
use std::mem::size_of;
#[cfg(target_os="linux")]
use std:... | 1 | 18 | 10 |
fa1f984e36d77c20b58fe2f4ea043ff0be7ca0d1 | Ruud van Asseldonk | 2015-02-13T16:06:53 | servo: Merge #4925 - Remove glob re-exports in devtools_traits/lib.rs (from ruuda:devtools-traits); r=jdm
This resolves #4921.
Source-Repo: https://github.com/servo/servo
Source-Revision: 40eff84ae1220c3d596cddf4fb789763b71bcb38 | diff --git a/compositing/constellation.rs b/compositing/constellation.rs
index 07c1faea6..dedf6e07b 100644
--- a/compositing/constellation.rs
+++ b/compositing/constellation.rs
@@ -6,8 +6,7 @@ use pipeline::{Pipeline, CompositionPipeline};
use compositor_task::CompositorProxy;
use compositor_task::Msg as Compositor... | 9 | 40 | 40 |
2d45783a968cd0fa69bc560b758228665b599ddd | Ms2ger | 2015-02-13T14:36:50 | servo: Merge #4924 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9c476a290aa493404a8e5953d0e813cb68c4c434 | diff --git a/gfx/lib.rs b/gfx/lib.rs
index 5ccf043d3..98b35d017 100644
--- a/gfx/lib.rs
+++ b/gfx/lib.rs
@@ -8,9 +8,9 @@
#![feature(core)]
#![feature(hash)]
#![feature(int_uint)]
-#![feature(io)]
+#![cfg_attr(any(target_os="linux", target_os = "android"), feature(io))]
#![feature(libc)]
-#![feature(path)]
+#![cfg_a... | 2 | 3 | 3 |
70ea38e5c6b403eaf237bad30517b95ff3e23e66 | Nicholas Nethercote | 2015-02-13T13:54:56 | servo: Merge #4917 - Fix jemalloc memory measurements (from nnethercote:fix-jemalloc-reporting); r=jdm
It turns out you need to send an "epoch" request to jemalloc before
asking for a measurement otherwise you get stale data! Heavens.
Source-Repo: https://github.com/servo/servo
Source-Revision: 7acc6887d5190b31e171be... | diff --git a/util/memory.rs b/util/memory.rs
index d52500b62..27ee408b3 100644
--- a/util/memory.rs
+++ b/util/memory.rs
@@ -198,17 +198,31 @@ extern {
newp: *mut c_void, newlen: size_t) -> c_int;
}
-fn get_jemalloc_stat(name: &'static str) -> Option<u64> {
- let mut old: size_t = 0;
- let c... | 1 | 23 | 9 |
5246ffec7804bb518a926e27ba81a26a2b53fa03 | Ms2ger | 2015-02-13T12:33:49 | servo: Merge #4922 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 66f4faf44fbc6e8703d4336219a20dd3b19fb493 | diff --git a/canvas/lib.rs b/canvas/lib.rs
index 3e8350b8c..af26c94d3 100644
--- a/canvas/lib.rs
+++ b/canvas/lib.rs
@@ -2,8 +2,9 @@
* 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(core)]
+
#![allow(missing_copy_imple... | 29 | 109 | 79 |
a5b93df840d0a32f49cda824a4a570c7f6d1f1f0 | Simon Sapin | 2015-02-13T10:06:49 | servo: Merge #4919 - Cleanup libstyle (from SimonSapin:cleanup-libstyle); r=gw
Source-Repo: https://github.com/servo/servo
Source-Revision: 11b627704d539122bdf9755644fb5bc0c6a03bb6 | diff --git a/style/font_face.rs b/style/font_face.rs
index 241b289a3..f10d2a4fa 100644
--- a/style/font_face.rs
+++ b/style/font_face.rs
@@ -20,11 +20,11 @@ pub fn iter_font_face_rules_inner<F>(rules: &[CSSRule], device: &Device,
CSSRule::Charset(..) |
CSSRule::Namespace(..) => {},
... | 7 | 66 | 62 |
78c8c362344b9b5f6fa8d947c34f76a31b1a4f48 | Ms2ger | 2015-02-13T09:24:50 | servo: Merge #4911 - Cleanup join_layout a little bit (from Ms2ger:join_layout); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c5a4e78302fab9c40a0ed946663cf4609969cdb8 | diff --git a/script/page.rs b/script/page.rs
index 55729fd35..b369a5e33 100644
--- a/script/page.rs
+++ b/script/page.rs
@@ -327,25 +327,19 @@ impl Page {
/// layout task has finished any pending request messages.
fn join_layout(&self) {
let mut layout_join_port = self.layout_join_port.borrow_mut();
... | 1 | 11 | 17 |
7b2bc92571c20876e30bf2ccd3f2c44653a683a1 | Matt Brubeck | 2015-02-12T23:39:53 | servo: Merge #4904 - Replace util::dlist code with new collections::DList methods (from mbrubeck:dlist); r=pcwalton
r? @pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 26aee53c827c4db517171cd89786d894b1ceb76c | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index 9dacfd41b..2b5b87077 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -109,14 +109,12 @@ impl DisplayList {
/// `other` in the process.
#[inline]
pub fn append_from(&mut self, other: &mut DisplayList) {
- ser... | 3 | 17 | 119 |
0bbe232d024a9ca10edb217bc55938e3f919138c | Ms2ger | 2015-02-12T22:36:47 | servo: Merge #4912 - Use boxed::into_raw in create_or_get_local_context (from Ms2ger:local_context); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 45d18ce21c0f902e2b88f01cd57b68a7e8c0a633 | diff --git a/layout/context.rs b/layout/context.rs
index d5647c93a..edf5c5177 100644
--- a/layout/context.rs
+++ b/layout/context.rs
@@ -17,8 +17,8 @@ use script_traits::UntrustedNodeAddress;
use msg::constellation_msg::ConstellationChan;
use net::local_image_cache::LocalImageCache;
use servo_util::geometry::Au;
+us... | 1 | 2 | 2 |
76f563bd163c31f55fa1f7f76d58900b84b81d44 | Tetsuharu OHZEKI | 2015-02-12T21:06:49 | servo: Merge #4909 - Fix warnings about RefCell<T>.try_borrow() (from saneyuki:warn); r=jdm
follow up #4893
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d1a2d90e531e82c8692af469f308e539d15bedb | diff --git a/script/dom/bindings/cell.rs b/script/dom/bindings/cell.rs
index fc0a845b7..810852568 100644
--- a/script/dom/bindings/cell.rs
+++ b/script/dom/bindings/cell.rs
@@ -10,7 +10,7 @@ use js::jsapi::{JSTracer};
use util::task_state;
use util::task_state::{SCRIPT, IN_GC};
-use std::cell::{RefCell, Ref, RefMut... | 1 | 10 | 4 |
a06bf53d348ed4afaf7dff0dec4a781a9bde50f8 | Ms2ger | 2015-02-12T20:21:47 | servo: Merge #4908 - Remove some methods from js.rs (from Ms2ger:dead-code-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b351b216c6ac5df1913ddd589d3300d7cd07ebb0 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index 970281c29..a842583ce 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -83,6 +83,14 @@ impl<T: Reflectable> Unrooted<T> {
}
}
+ /// Create a new unrooted value from a `JS<T>`.
+ #[allow(unrooted_must_r... | 3 | 21 | 27 |
85ca22dc3926656bd794fe446fba09f5b8313b6d | Ms2ger | 2015-02-12T19:12:47 | servo: Merge #4905 - Fix some warnings in script (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b655b54f8022d963460e510511ad774a1a1d9ccd | diff --git a/script/dom/bindings/conversions.rs b/script/dom/bindings/conversions.rs
index 529c24ac2..62f71cea5 100644
--- a/script/dom/bindings/conversions.rs
+++ b/script/dom/bindings/conversions.rs
@@ -308,7 +308,7 @@ pub fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString {
unsafe {
... | 12 | 29 | 18 |
1caa7c72b2deb54420e3e6bbf6e548b1ae0acb72 | Ms2ger | 2015-02-12T18:06:50 | servo: Merge #4902 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fab80925818e53bfb92ffa2684a6834bb9f70f29 | diff --git a/layout/block.rs b/layout/block.rs
index ef22c1233..50042be38 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -63,7 +63,7 @@ use style::computed_values::{overflow, position, box_sizing, display, float};
use std::sync::Arc;
/// Information specific to floated blocks.
-#[derive(Clone, Encodable)]
+#... | 9 | 38 | 30 |
1fe43a18436f53ead07a82f6051f6b9466956d8a | Keith Yeung | 2015-02-12T17:18:45 | servo: Merge #4866 - Updated trigger_fragment to take a string instead of URL and updated cal (from KiChjang:trigger-fragment-string); r=jdm
Fixes #4863
Source-Repo: https://github.com/servo/servo
Source-Revision: 29d24a5049cda10111bb36f3ca2d798e68137107 | diff --git a/script/dom/window.rs b/script/dom/window.rs
index 2e599e373..301cbfd3d 100644
--- a/script/dom/window.rs
+++ b/script/dom/window.rs
@@ -385,10 +385,13 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
let url = UrlParser::new().base_url(&base_url).parse(href.as_slice());
// FIXME: handle ... | 2 | 12 | 9 |
c8e70a3c1d1ddba9e9d007290aab7b6e728bfde5 | Martin Robinson | 2015-02-11T16:27:54 | servo: Merge #4895 - Send back unused buffers to the right pipeline (from mrobinson:fix-buffer-return); r=mbrubeck
Update to latest rust-layers and send back all buffers to their
original pipeline.
Source-Repo: https://github.com/servo/servo
Source-Revision: bc6882bdefc318402a46ede1494eb79339705c21 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 0d1596eef..35fbe2e0a 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -21,7 +21,7 @@ use gfx::color;
use gfx::paint_task::Msg as PaintMsg;
use gfx::paint_task::PaintRequest;
use layers::geometry::{DevicePixel, LayerPixe... | 2 | 11 | 15 |
8ce80bb1877790d0c048cd3c6d28ea711a25d1cd | Glenn Watson | 2015-02-11T10:51:47 | servo: Merge #4884 - Dispatch a load event at iframes. Fixes #4350 (from glennw:iframe-load); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fcfa00f4df7e382f1390c26ab3fd322886d2e138 | diff --git a/script/script_task.rs b/script/script_task.rs
index 4b64700b8..983ec9967 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -31,7 +31,7 @@ use dom::htmlelement::HTMLElementTypeId;
use dom::htmliframeelement::HTMLIFrameElement;
use dom::keyboardevent::KeyboardEvent;
use dom::mouseevent::Mo... | 1 | 15 | 1 |
d2a8a83d0ebddd961b801a1c97b1980db0babf45 | Ms2ger | 2015-02-10T14:24:45 | servo: Merge #4889 - Use base64 from rustc-serialize (fixes #4747) (from Ms2ger:4747-base64); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 58b7186cea7a61645b38158053e3849d121fa487 | diff --git a/net/data_loader.rs b/net/data_loader.rs
index 0fce067d0..3d3736ea4 100644
--- a/net/data_loader.rs
+++ b/net/data_loader.rs
@@ -5,7 +5,7 @@
use resource_task::{Metadata, LoadData, TargetedLoadResponse, start_sending, ResponseSenders};
use resource_task::ProgressMsg::{Payload, Done};
-use serialize::bas... | 4 | 4 | 4 |
1c8b85230d98b903c772b2bf2b229e32d1014802 | Ms2ger | 2015-02-10T13:45:47 | servo: Merge #4885 - Update the documentation in js.rs (from Ms2ger:doc-js); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 1b23c4fd579fc387f79b33989415174a2a821ec6 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index bfc8f9cae..970281c29 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -4,45 +4,50 @@
//! Smart pointers for the JS-managed DOM objects.
//!
-//! The DOM is made up of Rust types whose lifetime is entirely controlled by... | 1 | 85 | 62 |
f6370f41bf00d34c532b6d6de0e22fa2c2f29fc3 | Ms2ger | 2015-02-10T12:15:45 | servo: Merge #4887 - Import net as net rather than servo_net (from Ms2ger:servo_net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e3a4d493117ffd09ce75270b36012845ebb9c08c | diff --git a/compositing/constellation.rs b/compositing/constellation.rs
index f93b90971..c8ab30b92 100644
--- a/compositing/constellation.rs
+++ b/compositing/constellation.rs
@@ -24,10 +24,10 @@ use msg::constellation_msg::{LoadData, NavigationType};
use msg::constellation_msg::{PipelineExitType, PipelineId};
use m... | 28 | 51 | 52 |
a33c58d4a9ff9f496682e3a4cd552229b1bd2765 | Ms2ger | 2015-02-10T10:51:46 | servo: Merge #4886 - Import msg as msg rather than servo_msg (from Ms2ger:servo_msg); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 29d3b872de4abb693b75e71fc0b987c52b0fd1f6 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 7ece8277d..0d1596eef 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -29,12 +29,12 @@ use png;
use gleam::gl::types::{GLint, GLsizei};
use gleam::gl;
use script_traits::{ConstellationControlMsg, ScriptControlChan};
-us... | 36 | 85 | 86 |
62e454747aa190ac3c8e72c7697f9716abefa769 | Nicholas Nethercote | 2015-02-10T00:30:45 | servo: Merge #4858 - Use mallinfo() to report the system heap size on Linux (from nnethercote:mallinfo); r=glennw
Although Rust allocations are on the jemalloc heap, allocations done by
Skia and the graphics driver are on the system heap, so it's worth
reporting that as well.
One thing I'm not sure about: I think mal... | diff --git a/util/memory.rs b/util/memory.rs
index eea6fd173..c555dc8af 100644
--- a/util/memory.rs
+++ b/util/memory.rs
@@ -112,41 +112,87 @@ impl MemoryProfiler {
match nbytes {
Some(nbytes) => {
let mebi = 1024f64 * 1024f64;
- println!("{:16}: {:12.2}", path, (nb... | 1 | 61 | 15 |
2c86a66ec2e83858091ed50f9e8c03fa8f1bd94d | Josh Matthews | 2015-02-09T23:45:47 | servo: Merge #4881 - Allow unused variables, imports, and mutable (from jdm:allowunused); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 7048291dc0db4efecf9c13779feeb5e022210123 | diff --git a/canvas/lib.rs b/canvas/lib.rs
index 9e91a2d6b..3e8350b8c 100644
--- a/canvas/lib.rs
+++ b/canvas/lib.rs
@@ -2,8 +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/. */
-#![deny(unused_imports)]
-#![deny(unused_variabl... | 14 | 0 | 28 |
7b28310d1b52603a3054bf2bd20ea3aed7bea62d | Ms2ger | 2015-02-09T18:57:50 | servo: Merge #4875 - Document the main steps involved in adding a new DOM interface (from Ms2ger:new-dom-doc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1af8170037922250bbc3884f94c8a647f495eeb3 | diff --git a/script/dom/mod.rs b/script/dom/mod.rs
index 0650a9004..f53ef704e 100644
--- a/script/dom/mod.rs
+++ b/script/dom/mod.rs
@@ -156,6 +156,20 @@
//! }
//! ```
//!
+//! Adding a new DOM interface
+//! ==========================
+//!
+//! Adding a new interface `Foo` requires at least the following:
+//!
+//!... | 1 | 14 | 0 |
f99cb48a6a3ff2e07b011aeed9157db14192a2ce | Ms2ger | 2015-02-09T04:00:43 | servo: Merge #4869 - Various layout cleanup (from Ms2ger:layout-unsafe); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1a47f176ffb059a7a3f29f94485859163cb1284b | diff --git a/layout/context.rs b/layout/context.rs
index 29a96358f..96925bbc5 100644
--- a/layout/context.rs
+++ b/layout/context.rs
@@ -4,6 +4,8 @@
//! Data needed by the layout task.
+#![allow(unsafe_blocks)]
+
use css::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache};
use geom::{Rect, Siz... | 12 | 30 | 15 |
8e5056cdfb063e13b7068a229ff7da9c898d3696 | Glenn Watson | 2015-02-08T15:51:43 | servo: Merge #4859 - Fix page being removed too early. Fixes #3986 (intermittent failure) (from glennw:fix-3986); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 13b49ddf446871e7c544bd0b5d6457168c84de46 | diff --git a/script/script_task.rs b/script/script_task.rs
index 0c0377adf..0f3f5c1b5 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -753,9 +753,10 @@ impl ScriptTask {
}
// otherwise find just the matching page and exit all sub-pages
- match page.remove(id) {
+ matc... | 1 | 6 | 4 |
16a79302da79fc55c0e6253a489191f76f0fa172 | Manish Goregaokar | 2015-02-07T16:09:43 | servo: Merge #4864 - Gonk upgrade (from Manishearth:gonkup1); r=larsbergstrom
This does a rustup to our current rustc.
Gonk now compiles, but doesn't run. Trying to fix this, but thought I'd PR my progress.
This needs a couple of things to work:
- An override of time (https://github.com/rust-lang/time/commit/7f10... | diff --git a/servo/Cargo.toml b/servo/Cargo.toml
index c5fa8e2c2..406150555 100644
--- a/servo/Cargo.toml
+++ b/servo/Cargo.toml
@@ -30,7 +30,7 @@ path = "../../tests/contenttest.rs"
harness = false
[features]
-default = ["window"]
+default = ["glutin_app", "window"]
window = ["glutin_app/window"]
headless = ["gl... | 1 | 2 | 1 |
e53c0d15d59d99e67357d0307e16047396d37efe | Simon Sapin | 2015-02-07T00:21:42 | servo: Merge #4856 - Use the ToCss trait instead of Show for CSSOM serialization (from servo:tocss); r=jdm
r? @jdm
The in-progress Rust upgrade will go on top of this.
Source-Repo: https://github.com/servo/servo
Source-Revision: f5cb1690bfa20c1eccffe2f94a2155d2321e69fa | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 51f41bda4..5764e27cd 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -133,7 +133,7 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.2.0"
-source = "git+https://github.com/servo/rust-cssparser#42714934cbe83dab349190695503a09ae23f9528"
+sour... | 2 | 321 | 95 |
67548473cfaca568925fb1b31694fc7db7008f8a | Ms2ger | 2015-02-06T12:18:44 | servo: Merge #4862 - Cleanup script_task.rs (from Ms2ger:script_task); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 5436922169c79ea4cabcfabb195c7b732df8e74b | diff --git a/script/script_task.rs b/script/script_task.rs
index 11245f59d..2b2b472f7 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -622,7 +622,7 @@ impl ScriptTask {
ScriptMsg::DOMMessage(..) =>
panic!("unexpected message"),
ScriptMsg::WorkerDispatchErrorE... | 1 | 40 | 40 |
ab3c52ef6b80791015f872a13500acc7393806d6 | Ms2ger | 2015-02-06T10:06:44 | servo: Merge #4860 - Fix warnings introduced in #4852 (from Ms2ger:warnings-4852); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 63f6601c133fcee9c598c474695e3c740a02820d | diff --git a/devtools/actors/tab.rs b/devtools/actors/tab.rs
index 062ec02af..005009ebc 100644
--- a/devtools/actors/tab.rs
+++ b/devtools/actors/tab.rs
@@ -100,7 +100,7 @@ impl Actor for TabActor {
let console_actor = registry.find::<ConsoleActor>(self.console.as_slice());
console_act... | 1 | 2 | 2 |
c546a55016e13a2a228b0839543fd4ceb8a0c90c | Shing Lyu | 2015-02-06T03:30:45 | servo: Merge #4702 - Bug #3219 - Assign hostfile using the HOST_FILE environment variable (from shinglyu:bug3219); r=jdm
This is a fix for bug #3219 . This patch allows the user to specify a disposiable hostfile using the `HOST_FILE` environment variable. Therefore, we can run tests on test servers without actually ch... | diff --git a/net/resource_task.rs b/net/resource_task.rs
index 14aacc5d4..70d871eeb 100644
--- a/net/resource_task.rs
+++ b/net/resource_task.rs
@@ -25,6 +25,31 @@ use url::Url;
use std::borrow::ToOwned;
use std::sync::mpsc::{channel, Receiver, Sender};
use std::thunk::Invoke;
+use std::collections::HashMap;
+use st... | 2 | 102 | 2 |
803b194ae6baeef143464d407fff32661cb5320b | Adenilson Cavalcanti | 2015-02-06T00:33:42 | servo: Merge #4855 - Using the color helpers in CanvasPaintTask (from Adenilson:colorHelpersCanvas01); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d1c13ea1bc94fe9383da684c6ee0e22851750ec | diff --git a/canvas/Cargo.toml b/canvas/Cargo.toml
index 8aba12c4b..b00687e3c 100644
--- a/canvas/Cargo.toml
+++ b/canvas/Cargo.toml
@@ -14,4 +14,7 @@ git = "https://github.com/servo/rust-azure"
git = "https://github.com/servo/rust-geom"
[dependencies.util]
-path = "../util"
\ No newline at end of file
+path = "../... | 4 | 11 | 4 |
c277d8d691bf3e14b49680ff7e3d5c56cf946592 | Shreya Bastikar | 2015-02-05T22:27:44 | servo: Merge #4854 - Support firing error events from a dedicated worker at the containing wo (from jdm:workererr); r=jdm
...rker object.
Rebased from #4537.
Source-Repo: https://github.com/servo/servo
Source-Revision: c360b75e1640d5329068cfdbaa560b63ed03b35f | diff --git a/script/dom/dedicatedworkerglobalscope.rs b/script/dom/dedicatedworkerglobalscope.rs
index cbabe7711..d906e570e 100644
--- a/script/dom/dedicatedworkerglobalscope.rs
+++ b/script/dom/dedicatedworkerglobalscope.rs
@@ -5,6 +5,7 @@
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::De... | 3 | 42 | 3 |
252bc4fd8cfbb75ba16c3fcf07d70a806457ab81 | Sagar Muchhal | 2015-02-05T21:45:45 | servo: Merge #4853 - Add console message support to devtools. Does not actually cause logging (from jdm:consoleapicall); r=jdm
... to occur in the remote console.
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d560806f8fd621c2744429ae534e93e1f2563cb | diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
index d7bd8e25f..23b7bf5fe 100644
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -14,4 +14,7 @@ path = "../devtools_traits"
path = "../msg"
[dependencies.util]
-path = "../util"
\ No newline at end of file
+path = "../util"
+
+[dependencies]
+time = "*"... | 7 | 112 | 16 |
18fc2c868dbbbfe665328bd27c2af4f22d4bd8a8 | Sagar Muchhal | 2015-02-05T19:36:45 | servo: Merge #4852 - Add flag to send live updates to devtools (from jdm:buffermessages); r=jdm
Rebased and squashed version of #4191.
Source-Repo: https://github.com/servo/servo
Source-Revision: 0a2bde1b6ea97b68dfa0e62440dc92ef80fb1fd2 | diff --git a/devtools/actors/tab.rs b/devtools/actors/tab.rs
index 69450cd4b..062ec02af 100644
--- a/devtools/actors/tab.rs
+++ b/devtools/actors/tab.rs
@@ -8,6 +8,7 @@
use actor::{Actor, ActorRegistry};
use actors::console::ConsoleActor;
+use devtools_traits::WantsLiveNotifications;
use protocol::JsonPacketStream... | 5 | 17 | 1 |
e82eaf224b4692c0f307a6d407b8b84e8565c739 | Keith Yeung | 2015-02-05T18:54:48 | servo: Merge #4845 - Moved Location object from Window to Document (from KiChjang:location-in-doc); r=jdm
Fixes #4840
Source-Repo: https://github.com/servo/servo
Source-Revision: 5c02f8956d37d39f4482c570621ffa1c61a3f41c | diff --git a/script/dom/document.rs b/script/dom/document.rs
index 682d2dcd9..c38cd80dd 100644
--- a/script/dom/document.rs
+++ b/script/dom/document.rs
@@ -9,7 +9,6 @@ use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, Documen
use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandl... | 2 | 10 | 5 |
ca294f5923c513f8cf170a90b37a5eec5f3e15df | Ms2ger | 2015-02-05T17:51:50 | servo: Merge #4850 - Remove the Deref implementation for Root (from Ms2ger:root-deref); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d439c0d16d6ea1449d207858705d124e191ecc13 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index 02a6c4304..216c38604 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -584,7 +584,7 @@ pub struct Root<T> {
/// List that ensures correct dynamic root ordering
root_list: &'static RootCollection,
/// Referen... | 8 | 73 | 67 |
2c808b3b4791f2465894cad65f9c973bd06cf04b | Josh Matthews | 2015-02-05T15:27:50 | servo: Merge #4848 - Fix devtools implementation of downcastable actors. Fixes #4844 (from jdm:devtoolsoops); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: a938bdf9711e5e54d78b74c9446980f76b576958 | diff --git a/compositing/Cargo.toml b/compositing/Cargo.toml
index 194e07ba7..39c00d314 100644
--- a/compositing/Cargo.toml
+++ b/compositing/Cargo.toml
@@ -25,9 +25,6 @@ path = "../net"
[dependencies.util]
path = "../util"
-[dependencies.devtools]
-path = "../devtools"
-
[dependencies.devtools_traits]
path = "..... | 3 | 59 | 12 |
74f429f26bb594a623addb4a30db367982d7096e | Ms2ger | 2015-02-05T13:42:48 | servo: Merge #4804 - Document the DOM (from Ms2ger:dom-docs); r=jdm
Please review carefully.
Source-Repo: https://github.com/servo/servo
Source-Revision: aae9bc2071966b3090e3dba96a8c5d4b6a93fc2c | diff --git a/script/dom/bindings/conversions.rs b/script/dom/bindings/conversions.rs
index d7182f899..4b66acd0e 100644
--- a/script/dom/bindings/conversions.rs
+++ b/script/dom/bindings/conversions.rs
@@ -3,6 +3,31 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
//! Conversions of Rust values to a... | 4 | 208 | 1 |
09049cdb5d0e4f3022d09b6632e228da23de9e8f | Prabhjyot Singh Sodhi | 2015-02-04T23:06:46 | servo: Merge #4838 - Parsing sandbox attribute on iframe elements (from psdh:local); r=jdm
#4601
Source-Repo: https://github.com/servo/servo
Source-Revision: 40c59724b2638fee3b9932eba1aa9f6ebd77b0cd | diff --git a/script/dom/htmliframeelement.rs b/script/dom/htmliframeelement.rs
index ec1008844..871413f10 100644
--- a/script/dom/htmliframeelement.rs
+++ b/script/dom/htmliframeelement.rs
@@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::attr::Attr;
+use dom::attr::AttrValue;
... | 1 | 9 | 0 |
aa479cf634ed7714e309ef5015270d457f4f836a | Glenn Watson | 2015-02-04T22:24:50 | servo: Merge #4811 - Implement window.parent for iframes (from glennw:window_parent); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0beb070d482323889556276b122624a2b14cd08b | diff --git a/compositing/constellation.rs b/compositing/constellation.rs
index 6b71bcc1c..0a92cb856 100644
--- a/compositing/constellation.rs
+++ b/compositing/constellation.rs
@@ -393,11 +393,13 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
fn new_pipeline(&mut self,
... | 6 | 48 | 17 |
de1cbe756143d629f32b9e4d5181ce5fe62a8121 | Keith Yeung | 2015-02-04T17:06:56 | servo: Merge #4822 - Modified constellation key event handler to deal with missing frames (from KiChjang:constellation-frame-handling); r=jdm
Attempt at fixing #4795. Code has been written to check for the existence for the current frame, but it seems to pass the condition every time.
Source-Repo: https://github.com/... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index e9e0f6bf8..7ece8277d 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -358,8 +358,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}
}
- (Msg::KeyEvent(key, modified), Shu... | 3 | 17 | 11 |
afcde341d37e839ebda9f9cb4b818af1d041aafd | Adenilson Cavalcanti | 2015-02-04T11:21:49 | servo: Merge #4832 - Implementing transparent_black() (from Adenilson:transparentBlack01); r=jdm
This patch set will implement a new helper function for transparent black, while changing the behavior of helper black() function returning opaque black by default.
It will also use the new Color equality operator to stre... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index f09eb6b51..e9e0f6bf8 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -508,7 +508,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
epoch: Epoch(0),
id: LayerId::null(),
rect: R... | 4 | 12 | 11 |
388b66fcea15cdad6f8f805a21c4a267ad66376f | Gilles Leblanc | 2015-02-04T10:39:49 | servo: Merge #4706 - Initialize trusted-ness of DOM events properly (from gilles-leblanc:issue-3740); r=jdm
Fixes #3740
Source-Repo: https://github.com/servo/servo
Source-Revision: e0d4fd35947d5ba80df26a4157c920b7b226d53d | diff --git a/script/dom/activation.rs b/script/dom/activation.rs
index 9bd7d4d8f..842b776e4 100644
--- a/script/dom/activation.rs
+++ b/script/dom/activation.rs
@@ -7,7 +7,7 @@ use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast};
use dom::bindings::js::{JSRef, Temporary, OptionalRootable};
use dom:... | 11 | 34 | 33 |
abe3b60d6a42a32d8c19ccd35e5841b8e0098773 | Ms2ger | 2015-02-04T00:57:51 | servo: Merge #4823 - Fix build warnings (from Ms2ger:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1e72608f5c1d96cfcabdd993d973f4580e2fdb54 | diff --git a/gfx/text/glyph.rs b/gfx/text/glyph.rs
index 763e85172..37da641fd 100644
--- a/gfx/text/glyph.rs
+++ b/gfx/text/glyph.rs
@@ -11,7 +11,7 @@ use std::ops::{Add, Sub, Mul, Neg, Div, Rem, BitAnd, BitOr, BitXor, Shl, Shr, No
use std::u16;
use std::vec::Vec;
use util::geometry::Au;
-use util::range::{mod, Rang... | 3 | 3 | 4 |
6792cab661c799f30f53b431749d80e9891ec4ec | Arpad Borsos | 2015-02-04T00:09:53 | servo: Merge #4815 - Lowercase DOM getters at compile time, fixes #4728 (from Swatinem:lowercasegetters); r=Manishearth
The implementation was copied directly from
https://github.com/rust-lang/rust/pull/16636
and updated for rust changes, so the credit goes to @Manishearth
Source-Repo: https://github.com/servo/servo
... | diff --git a/plugins/casing.rs b/plugins/casing.rs
new file mode 100644
index 000000000..374290f3c
--- /dev/null
+++ b/plugins/casing.rs
@@ -0,0 +1,60 @@
+/* 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 obta... | 3 | 70 | 7 |
9a9f3b2efffe5c7c325c05a333e42057d65890fa | Martin Robinson | 2015-02-03T23:12:54 | servo: Merge #4829 - Revert "Using Color equality operators to streamline code" (from servo:revert-4825-usingColorOperators01); r=jdm
Reverts servo/servo#4825
I merged this incorrectly via the big green button and busted the tree pretty badly. @Adenilson has committed to fixing the issue in rust-azure and then reland... | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index b68d7de6a..7a304bfb4 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -730,7 +730,8 @@ impl<'a> PaintContext<'a> {
let mut lighter_color;
let mut darker_color = color::black();;
- if color != darker_color {
+ ... | 2 | 8 | 3 |
079d94ebf09712f60a8cc43fe796dfddb9371965 | Adenilson Cavalcanti | 2015-02-03T19:12:44 | servo: Merge #4825 - Using Color equality operators to streamline code (from Adenilson:usingColorOperators01)
Source-Repo: https://github.com/servo/servo
Source-Revision: 728f723753da49261c03e8061b748432f4a00182 | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index 7a304bfb4..b68d7de6a 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -730,8 +730,7 @@ impl<'a> PaintContext<'a> {
let mut lighter_color;
let mut darker_color = color::black();;
- // TODO(Savago): Use equality opera... | 2 | 3 | 8 |
6aeb6c67d702d13faf970343282f1658123d2b69 | Alexandru Cojocaru | 2015-02-03T18:24:53 | servo: Merge #4820 - add `unwrap` to `send/recv` calls (from servo:send-recv); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 8e6dcc7c26d88bb0452226ff8c34539e368e03d9 | diff --git a/gfx/font_cache_task.rs b/gfx/font_cache_task.rs
index 782c68dd4..5e48eabb4 100644
--- a/gfx/font_cache_task.rs
+++ b/gfx/font_cache_task.rs
@@ -120,11 +120,11 @@ impl FontCache {
Command::GetFontTemplate(family, descriptor, result) => {
let family = LowercaseString::ne... | 29 | 99 | 99 |
9213b5c75870d73d7c7af893510ee6b0303c6b53 | Ms2ger | 2015-02-03T16:39:53 | servo: Merge #4818 - Use JS<Node> rather than TrustedNodeAddress in the HTML parser (from Ms2ger:tna-parser); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 45ebcf1df7b2b320502136731ae429eb5498fa43 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index f062eb8cf..02a6c4304 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -187,17 +187,6 @@ impl <T> Clone for LayoutJS<T> {
}
}
-impl JS<Node> {
- /// Create a new JS-owned value wrapped from an address known to be... | 3 | 33 | 43 |
129ebd5826c72ac48e70e43c4c6a7519a594bb23 | Ms2ger | 2015-02-03T13:21:53 | servo: Merge #4814 - Correct the documentation comment syntax in layout_interface.rs (from Ms2ger:layout_interface-doc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 32a807da82f93c8b4311f4b53d8252618ed425e9 | diff --git a/script/layout_interface.rs b/script/layout_interface.rs
index 4dfa9ac65..416b9c8be 100644
--- a/script/layout_interface.rs
+++ b/script/layout_interface.rs
@@ -2,9 +2,9 @@
* 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/. */... | 1 | 3 | 3 |
a8768895e8e18bf2ae5cac3e76940be8d451ba9a | Matthew Rasmus | 2015-02-03T00:45:50 | servo: Merge #4783 - Fix 'inline-block' sizing issues (from mttr:inline_block_percentage); r=mbrubeck
The first commit fixes #3624, and the second commit fixes a bug uncovered by the first fix and caught by a reftest (according to CSS 2.1, inline-blocks should have the shrink-to-fit algorithm run on them when size is ... | diff --git a/layout/block.rs b/layout/block.rs
index f7f7dde2b..167e3d99d 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -2153,7 +2153,7 @@ pub trait ISizeAndMarginsComputer {
/// available_inline-size
/// where available_inline-size = CB inline-size - (horizontal border + padding)
fn solve_block_... | 2 | 17 | 7 |
f91fe691d0a7395cba8996db312c70729e7c8fdb | Martin Robinson | 2015-02-02T23:57:51 | servo: Merge #4809 - Update to latest rust-layers (from mrobinson:rust-layers-update); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 6eac20d84da2b5f0741a91b5af3907af56b009b0 | diff --git a/gfx/Cargo.toml b/gfx/Cargo.toml
index 36db9e1d1..4f9395a68 100644
--- a/gfx/Cargo.toml
+++ b/gfx/Cargo.toml
@@ -56,9 +56,13 @@ git = "https://github.com/servo/rust-core-graphics"
[dependencies.core_text]
git = "https://github.com/servo/rust-core-text"
+[dependencies.skia]
+git = "https://github.com/ser... | 4 | 19 | 13 |
558c41ec96148dffdef0c32af15ac62fed2523b8 | Adenilson Cavalcanti | 2015-02-02T22:54:52 | servo: Merge #4808 - Using color helpers in Compositor and PaintContext (from Adenilson:usingColorHelpers01); r=pcwalton
Using color helpers in Compositor and PaintContext (plus added TODO related to equality operators).
Source-Repo: https://github.com/servo/servo
Source-Revision: 99600726f3c25ed205b86a27c764887e0cc1... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index c427e4e4a..f09eb6b51 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -11,13 +11,13 @@ use scrolling::ScrollingTimerProxy;
use windowing;
use windowing::{MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg};
... | 2 | 10 | 8 |
6862b5d57695b2be451eeee155edd12c212e452e | Adenilson Cavalcanti | 2015-02-02T21:03:57 | servo: Merge #4790 - Implements 2 helper functions for Color type (white() and black()) (from Adenilson:colorOperatorsHelpers01); r=jdm
Implements 2 helper functions for Color type (white() and black()) plus uses the new equality operators implemented in rust-azure.
Source-Repo: https://github.com/servo/servo
Source-... | diff --git a/gfx/color.rs b/gfx/color.rs
index 20be79164..f1f589ef4 100644
--- a/gfx/color.rs
+++ b/gfx/color.rs
@@ -21,3 +21,13 @@ pub fn rgb(r: u8, g: u8, b: u8) -> AzColor {
pub fn rgba(r: AzFloat, g: AzFloat, b: AzFloat, a: AzFloat) -> AzColor {
AzColor { r: r, g: g, b: b, a: a }
}
+
+#[inline]
+pub fn black... | 2 | 17 | 4 |
859e616391762b1e29af6c431d9728ddd686030d | Ms2ger | 2015-02-02T09:24:49 | servo: Merge #4799 - Mark HTMLAreaElement and KeyboardEvent as DOM structs (from Ms2ger:dom-structs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3286d2812a083aa4a081d888a40e86b0b12b5c20 | diff --git a/script/dom/htmlareaelement.rs b/script/dom/htmlareaelement.rs
index 85ccb270c..0a88f6153 100644
--- a/script/dom/htmlareaelement.rs
+++ b/script/dom/htmlareaelement.rs
@@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::HTMLAreaElementBinding::HTMLAreaElementMet
use dom::bindings::codegen::InheritTypes:... | 2 | 4 | 19 |
566cbe7a91c0c7a518214b8e3efe67b4ae58647a | Glenn Watson | 2015-02-02T08:30:50 | servo: Merge #4798 - Remove the glfw port (it doesn't compile since last rustup anyway) (from glennw:remove-glfw); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 896cdcb96a98d4b4858d24806ee67db6f63c9fb1 | diff --git a/compositing/platform/mod.rs b/compositing/platform/mod.rs
deleted file mode 100644
index 5d8a8cba4..000000000
--- a/compositing/platform/mod.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 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 distribute... | 5 | 3 | 65 |
bcbce50591b6c7c0a1fa46517943ca7df142629e | Ms2ger | 2015-02-01T08:36:49 | servo: Merge #4797 - Create mod.rs files for the dom and dom::bindings modules (from Ms2ger:mods); r=saneyuki
This gives us a better place to put DOM documentation, which I'd like to start
adding.
Source-Repo: https://github.com/servo/servo
Source-Revision: ccdf0bd65e415eff024e034519f733eeded32812 | diff --git a/script/dom/bindings/mod.rs b/script/dom/bindings/mod.rs
new file mode 100644
index 000000000..54d564965
--- /dev/null
+++ b/script/dom/bindings/mod.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 with ... | 3 | 184 | 175 |
342bc1c1dcb7ce7acebb4a4c0c882aaea101afae | Manish Goregaokar | 2015-01-31T10:42:48 | servo: Merge #4741 - Basic certificate verification (from Manishearth:cert-checking); r=jdm
For now, this can only be tested by replacing `resources/certs` with `resources/cert-google-only` (an Equifax certificate -- will work for Google but not Wikipedia or Stack Exchange)
I can replace the error page with something... | diff --git a/net/Cargo.toml b/net/Cargo.toml
index dcc044399..dcf7bdf47 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -25,4 +25,5 @@ git = "https://github.com/servo/rust-stb-image"
[dependencies]
url = "0.2.16"
-time = "0.1.12"
\ No newline at end of file
+time = "0.1.12"
+openssl="0.2.15"
\ No newline at end... | 4 | 41 | 11 |
3692831cc136bce6d53d4875e44197934fda24b6 | Manish Goregaokar | 2015-01-31T01:18:49 | servo: Merge #4779 - Specific instances of activatable elements may not be activatable (fixes #4765) (from Manishearth:more-activation); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7b1e5c3199bc08e238641e20480752a06f19ea | diff --git a/script/dom/activation.rs b/script/dom/activation.rs
index 78e3d6cd4..9bd7d4d8f 100644
--- a/script/dom/activation.rs
+++ b/script/dom/activation.rs
@@ -17,6 +17,9 @@ use std::borrow::ToOwned;
pub trait Activatable : Copy {
fn as_element(&self) -> Temporary<Element>;
+ // Is this particular insta... | 3 | 22 | 2 |
2cf3002d8f23df918c89c62e14e026c0b2b4f7fb | Josh Matthews | 2015-01-31T00:36:50 | servo: Merge #4788 - Lock crates.io dependencies to specific versions (from jdm:cargodeps); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 66384dfcfd4c38595985cd3fac12fa616a2ba94f | diff --git a/compositing/Cargo.toml b/compositing/Cargo.toml
index 6c8864b4e..194e07ba7 100644
--- a/compositing/Cargo.toml
+++ b/compositing/Cargo.toml
@@ -53,5 +53,5 @@ git = "https://github.com/servo/rust-core-text"
git = "https://github.com/servo/gleam"
[dependencies]
-url = "*"
-time = "*"
\ No newline at end ... | 10 | 16 | 16 |
31f1de27457653a4c57bc5eab7e4451769570a52 | Diego Marcos | 2015-01-30T23:06:52 | servo: Merge #4777 - Adds borrow_for_script_deallocation and unsafe_mut_js_info method to avo (from dmarcos:issue4692); r=jdm
...id 'DOMRefCell already mutably borrowed' messages. This is just a temporary fix until the Rust standard library allows borrowing already-borrowed RefCell values during unwinding.
It also re... | diff --git a/script/dom/bindings/cell.rs b/script/dom/bindings/cell.rs
index 41ebf76f4..fc0a845b7 100644
--- a/script/dom/bindings/cell.rs
+++ b/script/dom/bindings/cell.rs
@@ -41,6 +41,13 @@ impl<T> DOMRefCell<T> {
&*self.value.as_unsafe_cell().get()
}
+ /// Borrow the contents for the purpose of sc... | 4 | 17 | 10 |
2d427e481e5d497fe7ecebfa7e24a818dabaf1aa | Ms2ger | 2015-01-30T21:42:52 | servo: Merge #4787 - Use NonZero to reduce the size of DOM smart pointers (from Ms2ger:NonZero); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 49dc60cac1ef014621379bedf1fb41aeac34820e | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index 1eef7548b..3c9eba389 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -53,6 +53,8 @@ use layout_interface::TrustedNodeAddress;
use script_task::STACK_ROOTS;
use util::smallvec::{SmallVec, SmallVec16};
+
+use core::nonz... | 3 | 19 | 15 |
01b2b474d8ea5ce5a55c1957ac24950a7bd24771 | Wojciech "Zarazek" Wiśniewski | 2015-01-30T21:00:54 | servo: Merge #4776 - PNG library upgrade (from zarazek:master); r=glennw
Update to new version of PNG library. See earlier pull reqest for PNG lib: https://github.com/servo/rust-png/pull/57
Source-Repo: https://github.com/servo/servo
Source-Revision: 06cedc8317663a71c06f0a2a482f2b4c3759b6be | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 66267664a..2a42bb391 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -646,7 +646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "png"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-png#2804379427c... | 1 | 2 | 2 |
ea72dcb0ad293c8695307bdbf5c4a08ec91dcf7b | Patrick Walton | 2015-01-30T20:00:54 | servo: Merge #4785 - layout: Fix warnings (from pcwalton:fix-warnings); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 6c2bbe442a13a8520e6175064c665f1ab9e3c2c6 | diff --git a/gfx/text/glyph.rs b/gfx/text/glyph.rs
index 76a0c73e3..763e85172 100644
--- a/gfx/text/glyph.rs
+++ b/gfx/text/glyph.rs
@@ -723,7 +723,7 @@ impl<'a> GlyphStore {
for index in range.each_index() {
// TODO(pcwalton): Handle spaces that are detailed glyphs -- these are uncommon but
... | 2 | 4 | 4 |
8116c67d1bb59c51ea3e4ba25966129cf8d07472 | Glenn Watson | 2015-01-29T22:54:50 | servo: Merge #4775 - Switch glutin to use servo fork, which contains a crash fix for XCloseDisplay in some X11 drivers (from glennw:fix-x11-crash); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f58a129251068a6e63b40d0bc46805a60398433a | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 3488655ce..66267664a 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -365,7 +365,7 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.4-pre"
-source = "git+https://github.com/tomaka/glutin#1d6b863cd454839b8e3cf1e296cbf8f31fb70029"
+source = "... | 1 | 2 | 2 |
f18b2fa29e4784060ebdb7c98614c81449f99934 | Glenn Watson | 2015-01-29T15:24:48 | servo: Merge #4764 - Add layout support and tests for inline iframes. Fixes #1697 (from glennw:inline-iframes); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 7f9256e87b44125779002719a734ca412444e40e | diff --git a/layout/construct.rs b/layout/construct.rs
index 58fe265d5..eb241630d 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -1306,6 +1306,7 @@ impl<'ln> NodeUtils for ThreadSafeLayoutNode<'ln> {
None |
Some(NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::H... | 2 | 81 | 31 |
f599bb005f90e0e49e883206b5c7367ca3d8d596 | Patrick Walton | 2015-01-29T04:18:53 | servo: Merge #4458 - layout: Implement floated list items (from pcwalton:floated-lists); r=mbrubeck
This patch also makes Servo not crash when
`generated_containing_block_rect()` is called on a list item (as, for
example, GitHub does), and for good measure I added the fix to other
flows as well.
r? @mbrubeck
Source-... | diff --git a/layout/construct.rs b/layout/construct.rs
index 421f4e25f..58fe265d5 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -860,8 +860,8 @@ impl<'a> FlowConstructor<'a> {
/// Builds a flow for a node with `display: table`. This yields a `TableWrapperFlow` with
/// possibly other `TableC... | 6 | 59 | 12 |
c04b5f567ff9892a3ae4bf890a8896e28143296e | Martin Robinson | 2015-01-28T22:24:51 | servo: Merge #4759 - Update to the latest rust-layers (from mrobinson:layers); r=glennw
Fixes #4754.
Source-Repo: https://github.com/servo/servo
Source-Revision: 9fac4837616fbfe375cea5d2c862b3de64d21302 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index bfa744ca8..3488655ce 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -474,7 +474,7 @@ source = "git+https://github.com/bjz/gl-rs.git#230e6c9ed611cddfcb6682dee9686471d
[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/r... | 1 | 1 | 1 |
a0029a8c7c0b629eb3bc87e1a3ab7db964c7e43b | Ms2ger | 2015-01-28T20:15:53 | servo: Merge #4756 - Fix various build warnings (from Ms2ger:warnings); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 88b781421aa78a2f466e6d170f89d13a870643cd | diff --git a/canvas/lib.rs b/canvas/lib.rs
index 8280c530d..4992df458 100644
--- a/canvas/lib.rs
+++ b/canvas/lib.rs
@@ -5,6 +5,7 @@
#![deny(unused_imports)]
#![deny(unused_variables)]
#![allow(missing_copy_implementations)]
+#![allow(unstable)]
extern crate azure;
extern crate geom;
diff --git a/devtools_traits... | 9 | 10 | 4 |
49e5c8ec2bd791abbd64034c45d544ba207a2da2 | Deokjin Kim | 2015-01-28T18:51:53 | servo: Merge #4660 - Support 'font-style: oblique' (from deokjinkim:font_style); r=jdm
'oblique' font-style is not supported now.
When I checked freetype.h, same macro is used for italic and oblique.
/* FT_STYLE_FLAG_ITALIC :: */
/* Indicates that a given face st... | diff --git a/gfx/font_context.rs b/gfx/font_context.rs
index e439d482f..34e92b215 100644
--- a/gfx/font_context.rs
+++ b/gfx/font_context.rs
@@ -140,7 +140,7 @@ impl FontContext {
// so they will never be released. Find out a good time to drop them.
let desc = FontTemplateDescriptor::new(style.font_... | 1 | 1 | 1 |
de06e02df10357a0433c1416a395929f0dbf393c | Ms2ger | 2015-01-28T18:03:53 | servo: Merge #4752 - Update xlib (from Ms2ger:update-xlib); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 95f71eea5c4d5c220abd3307b08f48bf86504eca | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 92cb9b9f0..bfa744ca8 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -829,7 +829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "xlib"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#58ec3847b... | 1 | 1 | 1 |
0b4a034ad6876528346f86efb199b27a635f3c2a | Peter Reid | 2015-01-28T17:18:52 | servo: Merge #4656 - Handle overlapping border-radius corners (from PeterReid:issue4125); r=mbrubeck
Fixes #4125
Conforming to section 5.5 (Rounded Corners/Overlapping Curves) of "CSS Background and Borders Module Level 3", border radii on elements whose border curves would have overlapped are uniformly scaled down t... | diff --git a/layout/display_list_builder.rs b/layout/display_list_builder.rs
index 44d9a286b..1c81e6545 100644
--- a/layout/display_list_builder.rs
+++ b/layout/display_list_builder.rs
@@ -40,7 +40,7 @@ use servo_msg::constellation_msg::Msg as ConstellationMsg;
use servo_msg::constellation_msg::ConstellationChan;
use... | 1 | 33 | 3 |
6cc1c5b01da7e992918456d875ba8a8b6ff51481 | Akos Kiss | 2015-01-28T16:36:53 | servo: Merge #4740 - Update dependencies in lock files (from akosthekiss:pr-deps); r=metajack
* openssl
* glfw
* gleam
* skia
* mozjs
Source-Repo: https://github.com/servo/servo
Source-Revision: d59743216750a397f03da2e4c58d6ccee00856f1 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 1666258cd..92cb9b9f0 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -103,7 +103,7 @@ name = "cookie"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "openssl 0.2.15 (registry+https://github.com/rust-... | 1 | 9 | 9 |
c938910a50f92ab4478e570f433ec10108ec7309 | Ms2ger | 2015-01-28T13:51:53 | servo: Merge #4751 - Don't shadow lifetimes in layout (from Ms2ger:shadowing-layout); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0f81e7088225d03b363e337a9d1da5ab36c44064 | diff --git a/layout/construct.rs b/layout/construct.rs
index b877d4245..9e14e2244 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -222,8 +222,8 @@ pub struct FlowConstructor<'a> {
impl<'a> FlowConstructor<'a> {
/// Creates a new flow constructor.
- pub fn new<'a>(layout_context: &'a LayoutConte... | 3 | 6 | 6 |
c67f16143392dabacb216daa4b3e53cf3ea26721 | Ms2ger | 2015-01-28T13:09:51 | servo: Merge #4750 - Don't shadow lifetimes in script (from Ms2ger:shadowing); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 4a3e4032fe9ce33d52f36d77fc388b38de214fdf | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index 2551b5178..f4c76dd4b 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -636,7 +636,7 @@ impl<'a, T: Reflectable> JSRef<'a, T> {
}
impl<'a, T: Reflectable> Reflectable for JSRef<'a, T> {
- fn reflector<'a>(&'a self) -... | 29 | 30 | 30 |
191980254e5d6757f543c4c4aec0f0422be07de8 | Ms2ger | 2015-01-28T11:54:51 | servo: Merge #4743 - Update layers to master (from Ms2ger:update-layers); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: cc2523eed5bdddd054ce6918e7d2d1d7d22d9286 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index b93de4d34..1666258cd 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -36,7 +36,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#2cc22b161a93f4016457f680b3966d879606d06d"
+source = "git+... | 1 | 2 | 2 |
386347d5a11cd97826ae4472eb48cf877a95377e | Manish Goregaokar | 2015-01-28T09:27:50 | servo: Merge #4739 - Fix some warnings (from Manishearth:warning-patrol); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: d373f8dc26239310dec8d2fd66ed72385548cf6f | diff --git a/devtools/actors/console.rs b/devtools/actors/console.rs
index d8e88cdba..246357a42 100644
--- a/devtools/actors/console.rs
+++ b/devtools/actors/console.rs
@@ -15,7 +15,7 @@ use servo_msg::constellation_msg::PipelineId;
use collections::BTreeMap;
use core::cell::RefCell;
-use serialize::json::{mod, Jso... | 34 | 50 | 53 |
952a9ae83d2d17e999cb3283c4a2e7344b0172e6 | Ms2ger | 2015-01-28T08:48:52 | servo: Merge #4717 - Document proxyhandler.rs, and related changes (from Ms2ger:doc-proxy); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 1a2a08aa501dd0da8bcdf362b55acb31093f5c9c | diff --git a/script/dom/bindings/callback.rs b/script/dom/bindings/callback.rs
index 3bfc0c107..5df336d3f 100644
--- a/script/dom/bindings/callback.rs
+++ b/script/dom/bindings/callback.rs
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozi... | 13 | 23 | 32 |
49930c825cca2b02304b2e37d3d6f9694f380c37 | Ms2ger | 2015-01-24T15:48:48 | servo: Merge #4713 - Return *const T from JS::unsafe_get() (fixes #4712) (from Ms2ger:unsafe_get-const); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ff8cbff81016c157373c1675f3eee69dd70ae544 | diff --git a/layout/wrapper.rs b/layout/wrapper.rs
index 94b536e1a..6b8db9b1b 100644
--- a/layout/wrapper.rs
+++ b/layout/wrapper.rs
@@ -369,10 +369,8 @@ impl<'ln> TNode<'ln, LayoutElement<'ln>> for LayoutNode<'ln> {
None => panic!("not an element")
};
- let element = &*elem.u... | 2 | 5 | 7 |
7fe54d3acc697e21d6d1902fa48e06654fb68a13 | Ms2ger | 2015-01-24T15:03:47 | servo: Merge #4711 - Don't call transmute_copy in JS::unsafe_get (from Ms2ger:transmute); r=jdm
It hasn't had borrow flags for quite a while.
Source-Repo: https://github.com/servo/servo
Source-Revision: 4c9d7ce5d071efe1ffac9f2fbb2b08bca2ca7158 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index c56618d2a..e220f181a 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -308,11 +308,11 @@ impl<T: Reflectable> MutNullableJS<T> {
}
impl<T: Reflectable> JS<T> {
- /// Returns an unsafe pointer to the interior of this... | 1 | 4 | 4 |
606554f4f52514b5b07eadd22eaf03c03f8a2050 | Josh Matthews | 2015-01-24T11:57:48 | servo: Merge #4710 - Make UntrustedNodeAddress a newtype (from servo:untrusted); r=Manishearth
This will allow us to make it Send after the Rust upgrade.
Source-Repo: https://github.com/servo/servo
Source-Revision: d9c2bfae8764d9f7813a6b6e9267102625e3d7b8 | diff --git a/layout/layout_task.rs b/layout/layout_task.rs
index 56db9d816..6d91a303e 100644
--- a/layout/layout_task.rs
+++ b/layout/layout_task.rs
@@ -159,7 +159,7 @@ impl ImageResponder<UntrustedNodeAddress> for LayoutImageResponder {
let f: proc(ImageResponseMsg, UntrustedNodeAddress):Send =
p... | 5 | 7 | 5 |
e9fe653476c85de2e1ac774dd3bd9f01cfc6f069 | Glenn Watson | 2015-01-22T21:48:48 | servo: Merge #4707 - Change glutin headless mode to be a build config, as it breaks some Linux distros linking to both (from glennw:split-headless); r=larsbergstrom
The majority of this change is simply re-arranging the code in the glutin port so that the windowed/headless code is configured at build time rather than ... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index eebb40319..166ab14a3 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -335,7 +335,7 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.2"
-source = "git+https://github.com/servo/glutin?ref=servo#db27370a1cbafcbfcaeee52a44076a61b3e0573c"
+sourc... | 3 | 4 | 22 |
043655dff0fb009d7d6f1854b89d00587df17218 | Ms2ger | 2015-01-22T15:06:50 | servo: Merge #4708 - Prepare for the rust upgrade (from Ms2ger:rustup-prepare); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 55fbf1f2b6924c50cff6e4ddf359289654f4858a | diff --git a/gfx/font.rs b/gfx/font.rs
index 708a6f4b9..653eff5e5 100644
--- a/gfx/font.rs
+++ b/gfx/font.rs
@@ -157,7 +157,7 @@ impl Font {
Some(glyphs) => return (*glyphs).clone(),
}
- let mut glyphs = GlyphStore::new(text.char_len() as int,
+ let mut glyphs = GlyphStore::new(tex... | 31 | 112 | 320 |
c20292d2bad5fdd5c97559f1dd8571625d990562 | Ms2ger | 2015-01-21T19:09:56 | servo: Merge #4705 - Encapsulate to-be-cleaned-up refcounted pointers (from Ms2ger:refcounted); r=larsbergstrom
This will allow us to make them Send in the future.
Source-Repo: https://github.com/servo/servo
Source-Revision: ad328fda65e6b7180de8b47f0964fe2f94c505a9 | diff --git a/script/dom/bindings/refcounted.rs b/script/dom/bindings/refcounted.rs
index adf7d71fd..05dd4fb43 100644
--- a/script/dom/bindings/refcounted.rs
+++ b/script/dom/bindings/refcounted.rs
@@ -39,6 +39,9 @@ use std::sync::{Arc, Mutex};
thread_local!(pub static LIVE_REFERENCES: Rc<RefCell<Option<LiveDOMReferenc... | 2 | 9 | 5 |
59b7b6fd29cf6f49339977328f098ef4ba40f53d | Ms2ger | 2015-01-21T10:48:49 | servo: Merge #4703 - Pass a String to spawn_named (from servo:task); r=saneyuki
IntoString has been removed from Rust, and named() will take a String, so
there is no good reason to do otherwise here.
Source-Repo: https://github.com/servo/servo
Source-Revision: 8df0ee2bb5d40e4b22db1666982e2e5ea36513f6 | diff --git a/canvas/canvas_paint_task.rs b/canvas/canvas_paint_task.rs
index 6f9898c4c..b5cdd3be7 100644
--- a/canvas/canvas_paint_task.rs
+++ b/canvas/canvas_paint_task.rs
@@ -8,6 +8,7 @@ use geom::rect::Rect;
use geom::size::Size2D;
use servo_util::task::spawn_named;
+use std::borrow::ToOwned;
use std::comm;
... | 15 | 36 | 25 |
4c560e69880414a264fd066646b1fbfa45e341e6 | Ms2ger | 2015-01-20T14:21:48 | servo: Merge #4678 - Document structuredclone.rs (from Ms2ger:doc-clone); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 89645391bf42edd9977ed1b6f9b430ad786f209e | diff --git a/script/dom/bindings/structuredclone.rs b/script/dom/bindings/structuredclone.rs
index f426c6f46..85f813cda 100644
--- a/script/dom/bindings/structuredclone.rs
+++ b/script/dom/bindings/structuredclone.rs
@@ -2,6 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You ... | 1 | 10 | 0 |
398a7d74a9e860fc1ed3f65d00bdd16372009104 | Ms2ger | 2015-01-20T13:00:47 | servo: Merge #4679 - Stop calling is_not_null (from Ms2ger:is_not_null); r=larsbergstrom
It has been removed from Rust.
Source-Repo: https://github.com/servo/servo
Source-Revision: 2d5b0e085571594e7da2ee519605dd6fac2caa54 | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index 4866a7aed..fc8834c52 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -1149,7 +1149,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
let target = rctx.get_draw_target();
let pattern = ColorPattern::new(color);
... | 5 | 25 | 27 |
f80dd195065a61df945553a5c6938eb7459c367b | Ms2ger | 2015-01-20T11:13:01 | servo: Merge #4674 - Document js.rs (from Ms2ger:doc-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 2629445748b047434db01bee15273576e229d802 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index ac8da0f8b..40230e919 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -42,9 +42,10 @@
//! - `OptionalRootable` and `OptionalRootedRootable`: make rooting `Option` values easy via a `root` method
//! - `ResultRootable`: m... | 5 | 40 | 17 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.