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 |
|---|---|---|---|---|---|---|---|
29447c6579e2c47252d83ef8c95e710fda846bcb | Glenn Watson | 2015-01-20T07:09:45 | servo: Merge #4676 - Fix change of src attributes on iframe (prevents SetLayerOrigin crash) (from glennw:iframe-src-fix); r=mrobinson
Source-Repo: https://github.com/servo/servo
Source-Revision: 0c87faae64ff450caa30b3d050a0e2f0498f0915 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index df0d505ad..d10e0c297 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -555,6 +555,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
root_layer.clear_all_tiles(self);
root_layer.children().clear();
... | 1 | 3 | 0 |
2c9611832155316594c70f090af1cbe5f10a3ded | Martin Robinson | 2015-01-20T03:33:45 | servo: Merge #4668 - Fix set_ids naming in Constellation (from mrobinson:constellation-cleanup); r=glennw
The set_ids name is a holdover from a previous design and no longer
reflects what this method does. Instead move the content into
grant_paint_permission and rename it to
send_frame_tree_and_grant_paint_permission.... | diff --git a/compositing/constellation.rs b/compositing/constellation.rs
index fca671550..febc1f884 100644
--- a/compositing/constellation.rs
+++ b/compositing/constellation.rs
@@ -872,7 +872,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
for frame in destination_frame.iter... | 1 | 27 | 27 |
ae46d5ecbba616b9e83114ca3467cef5515e8f94 | Glenn Watson | 2015-01-19T23:30:47 | servo: Merge #4672 - Switch the default windowing system to glutin. See below for details (from glennw:make-glutin-default); r=larsbergstrom
This change makes glutin the default windowing system on mac/linux.
If you run into any issues with the glutin system, you can temporarily
build the GLFW system with the followi... | diff --git a/servo/Cargo.toml b/servo/Cargo.toml
index 52bdb2b6f..f42178bb9 100644
--- a/servo/Cargo.toml
+++ b/servo/Cargo.toml
@@ -27,8 +27,8 @@ path = "../../tests/contenttest.rs"
harness = false
[features]
-default = ["glfw_app"]
-glutin = ["glutin_app"]
+default = ["glutin_app"]
+glfw = ["glfw_app"]
[depend... | 2 | 4 | 4 |
1614ba731ec778588ece60787e98a8f3f80ede87 | Ms2ger | 2015-01-19T15:33:48 | servo: Merge #4662 - Disallow lines that span more than 160 columns (from Ms2ger:overlong); r=larsbergstrom
The Rust style guide suggests 100, but we have too many violations in the
tree already. This check can be tightened over time.
Source-Repo: https://github.com/servo/servo
Source-Revision: ee94b3e8bf659c847bda96... | diff --git a/devtools/protocol.rs b/devtools/protocol.rs
index be27eed2e..df9078c7b 100644
--- a/devtools/protocol.rs
+++ b/devtools/protocol.rs
@@ -2,7 +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/. */
-/// Low-level wire p... | 4 | 42 | 10 |
cb111d280244d5d727805c619151af1131b21dcd | Ms2ger | 2015-01-19T03:48:48 | servo: Merge #4654 - Document some more bindings code (from Ms2ger:bindings-docs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 58c1b121a73c80d6857bc5c6453ef95b6db7909f | diff --git a/script/dom/bindings/error.rs b/script/dom/bindings/error.rs
index 0e887a89e..2d02dc08e 100644
--- a/script/dom/bindings/error.rs
+++ b/script/dom/bindings/error.rs
@@ -4,6 +4,8 @@
//! Utilities to throw exceptions from Rust bindings.
+#![deny(missing_docs)]
+
use dom::bindings::conversions::ToJSValCo... | 2 | 30 | 2 |
6d7f3b5063149d8dcc331adc5d4910265e6ab67f | Peter Reid | 2015-01-18T16:39:48 | servo: Merge #4648 - Fix TextInput's edit point after set_content: #4622 (from PeterReid:issue4662); r=jdm
Fixes #4622
Previously, when the edit point was being clamped leftward by a shortened
line, it would be placed one one character too far to the left instead of
at the very end.
The "if" removed here was introdu... | diff --git a/script/textinput.rs b/script/textinput.rs
index 809fc56de..15dc23d67 100644
--- a/script/textinput.rs
+++ b/script/textinput.rs
@@ -357,13 +357,7 @@ impl TextInput {
vec!(content)
};
self.edit_point.line = min(self.edit_point.line, self.lines.len() - 1);
-
- if self.cu... | 1 | 2 | 9 |
1375393dda00a6e82988b87353440592f332c681 | Tetsuharu OHZEKI | 2015-01-16T20:51:43 | servo: Merge #4540 - Make script load event asynchronous for internal scripts (from saneyuki:internal); r=jdm
Fix #4504
Source-Repo: https://github.com/servo/servo
Source-Revision: 2a9acdcb73685f2c5c14b51f33b741690b60cb23 | diff --git a/script/dom/htmlscriptelement.rs b/script/dom/htmlscriptelement.rs
index 5d290200b..c2af3ae9f 100644
--- a/script/dom/htmlscriptelement.rs
+++ b/script/dom/htmlscriptelement.rs
@@ -15,6 +15,7 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCas
use dom::bindings::codegen::Inh... | 1 | 36 | 3 |
3b67b08851e9b9440e534ff1913919e002c371ef | Martin Robinson | 2015-01-16T19:57:44 | servo: Merge #4625 - Update to latest rust-azure and rust-layers (from mrobinson:surface-refactor); r=jdm
We no longer need to implement from_azure_surface in Servo, now that
rust-layers is handling more of the glue between rust-layers and Azure.
Source-Repo: https://github.com/servo/servo
Source-Revision: efae66bccb... | diff --git a/compositing/compositor_layer.rs b/compositing/compositor_layer.rs
index 9afb50cb0..1510ea51f 100644
--- a/compositing/compositor_layer.rs
+++ b/compositing/compositor_layer.rs
@@ -16,7 +16,6 @@ use gfx::paint_task::Msg as PaintMsg;
use layers::color::Color;
use layers::geometry::LayerPixel;
use layers::... | 8 | 14 | 116 |
56641377a15bcc570f8933fdbcbde4bb193930ae | Martin Robinson | 2015-01-16T18:09:46 | servo: Merge #4643 - Disable util crate doctests (from mrobinson:disable-util-doctests); r=jdm
Because of bug in rustdoc, a new rust-layers dependency on rust-azure
will cause linking issues. See
https://github.com/rust-lang/rust/issues/21246 for details.
Source-Repo: https://github.com/servo/servo
Source-Revision: 6... | diff --git a/util/Cargo.toml b/util/Cargo.toml
index 87969f90a..c418d0b28 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -7,6 +7,14 @@ authors = ["The Servo Project Developers"]
name = "util"
path = "lib.rs"
+# Disable doctests, because of linking issues with rustdoc. rustdoc compiles
+# documentation tests ... | 1 | 8 | 0 |
fa2c87647c44ea159db796fe73c48d248e7dd72b | donaldpipowitch | 2015-01-16T15:18:46 | servo: Merge #4569 - added unit tests for TextInput - fixes #4352 (from donaldpipowitch:add-unit-tests-for-textinput); r=jdm
Please bear with me. This is the first Rust code I've ever written and the first systems programming language I've ever used.
I've added unit tests for all methods of TextInput ( - except `hand... | diff --git a/script/textinput.rs b/script/textinput.rs
index 03f8f95b4..809fc56de 100644
--- a/script/textinput.rs
+++ b/script/textinput.rs
@@ -130,7 +130,7 @@ impl TextInput {
fn replace_selection(&mut self, insert: String) {
let (begin, end) = self.get_sorted_selection();
- self.selection_begi... | 1 | 165 | 3 |
643489c545d0287d75a9c5a6d7f030bca1a18fa5 | Gilles Leblanc | 2015-01-16T01:06:48 | servo: Merge #4568 - Write a macro or syntax extension to generate OpenType tags (from gilles-leblanc:issue-4556); r=Manishearth
Fixes #4556
Source-Repo: https://github.com/servo/servo
Source-Revision: 9fd675c266a85317198e89f9eb0e917af5a405d0 | diff --git a/gfx/text/shaping/harfbuzz.rs b/gfx/text/shaping/harfbuzz.rs
index c86336b2e..cc328ca4f 100644
--- a/gfx/text/shaping/harfbuzz.rs
+++ b/gfx/text/shaping/harfbuzz.rs
@@ -47,13 +47,17 @@ use std::mem;
use std::cmp;
use std::ptr;
+macro_rules! hb_tag {
+ ($t1:expr, $t2:expr, $t3:expr, $t4:expr) => (
+ ... | 2 | 8 | 18 |
54406e2c77f2dda5a2db8c0de52a444b2c115456 | Glenn Watson | 2015-01-15T22:09:47 | servo: Merge #4641 - Update harfbuzz module (from glennw:update-hb); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 31627bdc9d698a31db1bcd47279d43de397298f1 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index f351b1677..7cb2cb25e 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -371,7 +371,7 @@ dependencies = [
[[package]]
name = "harfbuzz"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-harfbuzz#0489e7da24497f9ec17255fa72b90d6072f0c6d8"
+source... | 1 | 1 | 1 |
5f4048c2c346c7e8bec477188a4a85277fb148f3 | Akos Kiss | 2015-01-15T16:48:48 | servo: Merge #4638 - Update to use latest mozjs-sys (from akosthekiss:pr-update-mozjs); r=jdm
As requested in https://github.com/servo/mozjs/pull/26
Source-Repo: https://github.com/servo/servo
Source-Revision: 772570d06b8a75f376cfb50b334de7dbaa5c0382 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index d999706c7..f351b1677 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -496,7 +496,7 @@ source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebc
[[package]]
name = "mozjs-sys"
version = "0.0.0"
-source = "git+https://github.com/serv... | 1 | 1 | 1 |
6da92b413e08b8e5960f91efb46e7a4d7ff896cb | Edit Balint | 2015-01-15T15:39:45 | servo: Merge #4637 - Use DrawTarget::new instead of DrawTarget::new_with_data in CanvasPaintTask (from ebalint:canvas); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d9d7fdf75989cad5b57e0e1522953a574b814de6 | diff --git a/canvas/canvas_paint_task.rs b/canvas/canvas_paint_task.rs
index f2e8323d6..6f9898c4c 100644
--- a/canvas/canvas_paint_task.rs
+++ b/canvas/canvas_paint_task.rs
@@ -9,7 +9,6 @@ use geom::size::Size2D;
use servo_util::task::spawn_named;
use std::comm;
-use std::sync::Arc;
#[deriving(Clone)]
pub enum ... | 2 | 11 | 15 |
04e3fd76d24dde3fc7003299d7bfc0f461377ae7 | Josh Matthews | 2015-01-14T23:24:46 | servo: Merge #4635 - Use latest mozjs (from jdm:updatemozjs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ddf77a1cff3b55cf316fa08164e2bb262b618d02 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index d9769c32e..d999706c7 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -496,7 +496,7 @@ source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebc
[[package]]
name = "mozjs-sys"
version = "0.0.0"
-source = "git+https://github.com/serv... | 1 | 1 | 1 |
0c59976ca6a94a4d93938ab17488080f8a31f3e3 | Josh Matthews | 2015-01-14T19:30:49 | servo: Merge #4632 - Add handling for unreported exceptions when invoking callback objects (from jdm:reporterr); r=Ms2ger
Rebased version of #4399 that addresses points 2 & 5 from https://critic.hoppipolla.co.uk/showcomment?chain=9848 . Introduction of an AutoJSAPI equivalent and setting the error reporter to null wil... | diff --git a/script/dom/bindings/callback.rs b/script/dom/bindings/callback.rs
index c9718b6e0..6b8fcc09e 100644
--- a/script/dom/bindings/callback.rs
+++ b/script/dom/bindings/callback.rs
@@ -9,19 +9,20 @@
use dom::bindings::global::global_object_for_js_object;
use dom::bindings::js::JSRef;
use dom::bindings::utils... | 5 | 32 | 16 |
7d763dd9b37bb7c08a847c63dc77d403cdeff0d4 | Glenn Watson | 2015-01-14T00:48:46 | servo: Merge #4626 - Update glutin and add hidpi methods (from glennw:hidpi); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 221275267e61870ca2bac904149c0b14c63c3ebe | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 792d32138..7be6dbf80 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#47d4e815c063f1ebff534e759e02e887006ae74f"
+sourc... | 1 | 1 | 1 |
5f5c21b3b070967a5d6d606ce72841c05e48313a | Glenn Watson | 2015-01-13T21:06:48 | servo: Merge #4616 - Update png/harfbuzz, use prefixed symbol names (from glennw:update-png-hb); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 432b89f60f1dd7f9dc8d8a0621f4f6acec474a74 | diff --git a/gfx/text/shaping/harfbuzz.rs b/gfx/text/shaping/harfbuzz.rs
index 813e4aa33..c86336b2e 100644
--- a/gfx/text/shaping/harfbuzz.rs
+++ b/gfx/text/shaping/harfbuzz.rs
@@ -13,32 +13,32 @@ use text::util::{float_to_fixed, fixed_to_float};
use geom::Point2D;
use harfbuzz::{HB_MEMORY_MODE_READONLY, HB_DIRECTI... | 2 | 59 | 58 |
16585fe6ecbcfc9bfcca4a907dc28cbeeb3a873e | Matthew Rasmus | 2015-01-13T20:24:48 | servo: Merge #4598 - table_wrapper.rs: Fix for percentage widths (from mttr:table_percentage); r=pcwalton
Fixes #4421
Source-Repo: https://github.com/servo/servo
Source-Revision: 62d1761d2a93368893d4c1cb242b511b3ceda48f | diff --git a/layout/table_wrapper.rs b/layout/table_wrapper.rs
index 5a856db73..d696de85d 100644
--- a/layout/table_wrapper.rs
+++ b/layout/table_wrapper.rs
@@ -28,7 +28,7 @@ use servo_util::geometry::Au;
use std::cmp::{max, min};
use std::fmt;
use style::{ComputedValues, CSSFloat};
-use style::computed_values::tabl... | 1 | 13 | 3 |
aedb43e8f3588d4b0dbf075f15e4174d49b0c437 | Matt Brubeck | 2015-01-12T23:12:46 | servo: Merge #4619 - Remove unused Flow method (from mbrubeck:dead-top-margin); r=Ms2ger
Added in #1988 but never used. r? @pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 8103bba19bca3b85f2d8afa435fbb650b15d704f | diff --git a/layout/flow.rs b/layout/flow.rs
index bffdb7565..bbfb698a2 100644
--- a/layout/flow.rs
+++ b/layout/flow.rs
@@ -35,7 +35,7 @@ use flow_ref::FlowRef;
use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo};
use incremental::{RECONSTRUCT_FLOW, REFLOW, REFLOW_OUT_OF_FLOW, RestyleDamage};
... | 1 | 1 | 7 |
5b4ccf34a513dd2ffb0a104af0d6b8d3a9cf32ab | Bruno de Oliveira Abinader | 2015-01-12T21:42:47 | servo: Merge #4618 - Check quirks mode in {Document,Element}::getElementsByClassName (from brunoabinader:getElementsByClassName-quirksMode); r=Ms2ger
Fixes #4604.
Source-Repo: https://github.com/servo/servo
Source-Revision: 151343cf3f423e3e4ac6961a0009781caa962aa6 | diff --git a/script/dom/element.rs b/script/dom/element.rs
index df99f4dc9..129756c15 100644
--- a/script/dom/element.rs
+++ b/script/dom/element.rs
@@ -55,6 +55,8 @@ use style::{IntegerAttribute, LengthAttribute, ParserContext, matches};
use servo_util::namespace;
use servo_util::str::{DOMString, LengthOrPercentageO... | 1 | 14 | 3 |
ae450c9f08f7ba842f8e7236feaae99da9792939 | Tom Schuster | 2015-01-12T16:45:47 | servo: Merge #4594 - Implement most of the important WindowProxy traps (from evilpie:window-proxy); r=jdm
After this patch somebody just needs to implement the new IndexedGetter (and probably frames/length) on window to fix #4589.
Source-Repo: https://github.com/servo/servo
Source-Revision: a227faa41610cdc826da4ec8d2... | diff --git a/script/dom/browsercontext.rs b/script/dom/browsercontext.rs
index 9cc2a94fd..959c021b4 100644
--- a/script/dom/browsercontext.rs
+++ b/script/dom/browsercontext.rs
@@ -2,14 +2,27 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MP... | 3 | 123 | 11 |
0197a2e4b3cd96221fbefe26527c9c273663497d | Ashish Sharma | 2015-01-12T15:24:47 | servo: Merge #4615 - remove unused function with_layout_node #4572 (from kartaa:master); r=jdm
Update wrapper.rs for Issue #4572 in servo/servo.
Source-Repo: https://github.com/servo/servo
Source-Revision: b020a015d91a0e67f1a526927b91bb07da0f5140 | diff --git a/layout/wrapper.rs b/layout/wrapper.rs
index 98567dbce..1dd4be422 100644
--- a/layout/wrapper.rs
+++ b/layout/wrapper.rs
@@ -225,14 +225,6 @@ impl<'ln> TLayoutNode for LayoutNode<'ln> {
}
impl<'ln> LayoutNode<'ln> {
- /// Creates a new layout node, scoped to the given closure.
- pub unsafe fn with... | 1 | 0 | 8 |
dc1e66cdd83c0f4461699c459226335785adce7e | Ms2ger | 2015-01-11T16:15:45 | servo: Merge #4612 - Fix the documentation comment for the devtools library (from Ms2ger:devtools-doc); r=saneyuki
Also removed a duplicated feature gate.
Source-Repo: https://github.com/servo/servo
Source-Revision: 3897547bc2ef85b8c1797ae6c915121c36873cac | diff --git a/devtools/lib.rs b/devtools/lib.rs
index cda1af619..7e09a53c6 100644
--- a/devtools/lib.rs
+++ b/devtools/lib.rs
@@ -2,6 +2,11 @@
* 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/. */
+//! An actor-based remote devtools serv... | 1 | 5 | 5 |
65dc16d5bbb8dc302df56a263b8938b3c63f7007 | Ms2ger | 2015-01-10T17:30:44 | servo: Merge #4609 - Make Runnable::handler take self by value (from Ms2ger:runnable-self-by-value); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 879af966b3c18d9405b6f5837b39a28039db1eb3 | diff --git a/script/dom/bindings/structuredclone.rs b/script/dom/bindings/structuredclone.rs
index 843b7bea3..f426c6f46 100644
--- a/script/dom/bindings/structuredclone.rs
+++ b/script/dom/bindings/structuredclone.rs
@@ -15,11 +15,9 @@ use js::jsval::{JSVal, UndefinedValue};
use libc::size_t;
use std::ptr;
-#[allow... | 4 | 10 | 10 |
6748efc0b5b13f6419d6f2f878ffd97ba0e3328c | Ms2ger | 2015-01-10T16:51:44 | servo: Merge #4608 - Rewrite ReverseChildrenIterator to return Temporary (from Ms2ger:ReverseChildrenIterator); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e17d390714c576f4a0667c2c431ab6da84c6eb4d | diff --git a/script/dom/node.rs b/script/dom/node.rs
index f92e29626..bc44aeda8 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -398,7 +398,7 @@ impl<'a> Iterator<JSRef<'a, Node>> for QuerySelectorIterator<'a> {
pub trait NodeHelpers<'a> {
fn ancestors(self) -> AncestorIterator<'a>;
fn children(s... | 1 | 12 | 10 |
ca9abb084bba2ed731cc927c2e7a096b9021e736 | Ms2ger | 2015-01-10T16:18:45 | servo: Merge #4607 - Consolidate structured cloning code (from Ms2ger:clone); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a07c3eadb33eca1fbb2209d168c63c5ec3db23df | diff --git a/script/dom/bindings/structuredclone.rs b/script/dom/bindings/structuredclone.rs
new file mode 100644
index 000000000..843b7bea3
--- /dev/null
+++ b/script/dom/bindings/structuredclone.rs
@@ -0,0 +1,54 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy ... | 5 | 76 | 65 |
6fb52a573237ae989dc35a6e9464b3f39886e461 | Ms2ger | 2015-01-10T14:39:44 | servo: Merge #4606 - Move the documentation comment for the devtools_traits crate to have it picked up (from Ms2ger:devtools-comment); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 1834359f1661fe504e5b8ff3ee2bc0cb8d744d21 | diff --git a/devtools_traits/lib.rs b/devtools_traits/lib.rs
index 4fdbe2240..158a01272 100644
--- a/devtools_traits/lib.rs
+++ b/devtools_traits/lib.rs
@@ -2,6 +2,10 @@
* 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/. */
+//! This mo... | 1 | 4 | 4 |
01a5c3907bc97d9803a2ece60f85221056684067 | Martin Robinson | 2015-01-10T00:51:44 | servo: Merge #4314 - More work on iframes updated via script (from mrobinson:iframes-2); r=jdm
iframes added or loaded via script are not reflected visibly in the content of a page. The next step in making this happen is to have compositor layers accurately reflect newly recreated or loaded iframes. This change allows... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index a2d86d9d5..df0d505ad 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -5,7 +5,7 @@
use compositor_layer::{CompositorData, CompositorLayer, WantsScrollEventsFlag};
use compositor_task::{CompositorEventListener, Compositor... | 7 | 212 | 128 |
794f696a905c9674af36053ba4b511f22fc0e4ea | Martin Robinson | 2015-01-09T22:39:44 | servo: Merge #4578 - Fix compositor timing issues (from mrobinson:fix-compositor-timing-issues); r=larsbergstrom
Clean up compositor data structures and fix timing issues that cause Compositor panics.
Source-Repo: https://github.com/servo/servo
Source-Revision: c1d218cf0260da4e0642e2ea5b73823de79aa2c7 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index f9cd4f100..a2d86d9d5 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -19,7 +19,7 @@ use geom::rect::{Rect, TypedRect};
use geom::size::TypedSize2D;
use geom::scale_factor::ScaleFactor;
use gfx::paint_task::Msg as Paint... | 2 | 171 | 122 |
59ad36fb54a9ebe1d760fc970ab033ce04fbc51f | Jim Hoskins | 2015-01-09T21:27:45 | servo: Merge #4596 - Store HTMLIFrameElement sandbox attr as TokenList (from jimrhoskins:sandbox-tokenlist); r=jdm
Fixes #3758
Store the sandbox attribute of HTMLIFrameElement as a TokenList
internally. Use .tokens() to iterate over the tokens instead of
splitting on the string value.
The external interface for sand... | diff --git a/script/dom/htmliframeelement.rs b/script/dom/htmliframeelement.rs
index aeb480bdf..683c18c67 100644
--- a/script/dom/htmliframeelement.rs
+++ b/script/dom/htmliframeelement.rs
@@ -167,7 +167,7 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> {
fn SetSandbox(self, sandbox: DOMStr... | 1 | 13 | 11 |
230b937da4fa24b94dfa6942812ebba70a7481d9 | Tetsuharu OHZEKI | 2015-01-09T20:54:47 | servo: Merge #4532 - Make DOMContentLoaded and load asynchronous with using Runnable (from saneyuki:event); r=jdm
Fix #4505
Source-Repo: https://github.com/servo/servo
Source-Revision: 21fd1120c3c18a8ccc3d95f8d53b5f2875c77c97 | diff --git a/script/script_task.rs b/script/script_task.rs
index 976c2b780..1c4af1203 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -18,7 +18,7 @@ use dom::bindings::conversions::StringificationBehavior;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, Temporary, OptionalRo... | 1 | 63 | 12 |
52dce18499d3fb7322d031ecf53cb47976cc2aaf | Edit Balint | 2015-01-09T19:06:47 | servo: Merge #4137 - CanvasRenderTask connected to Layout (from ebalint:canvas); r=jdm
Content of the canvas is drawn, tests/html/test_canvas.html now works.
Source-Repo: https://github.com/servo/servo
Source-Revision: da400a7a453eacf6f3089cc07e5dc61f385a0909 | diff --git a/canvas/canvas_paint_task.rs b/canvas/canvas_paint_task.rs
index 2f0c36fd4..f2e8323d6 100644
--- a/canvas/canvas_paint_task.rs
+++ b/canvas/canvas_paint_task.rs
@@ -9,13 +9,15 @@ use geom::size::Size2D;
use servo_util::task::spawn_named;
use std::comm;
+use std::sync::Arc;
-#[deriving(Copy)]
+#[derivi... | 9 | 357 | 128 |
d1520547995801012ff1f96863b8f1ce6d75ad52 | Ms2ger | 2015-01-09T16:42:48 | servo: Merge #4588 - Some cleanup in layout (from Ms2ger:layout-cleanup); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 43e34d6d1050227eecc8fa293f9faec066f173a1 | diff --git a/layout/context.rs b/layout/context.rs
index dd88741ae..b329a2022 100644
--- a/layout/context.rs
+++ b/layout/context.rs
@@ -99,24 +99,24 @@ impl<'a> LayoutContext<'a> {
#[inline(always)]
pub fn font_context<'a>(&'a self) -> &'a mut FontContext {
unsafe {
- let cached_context =... | 2 | 10 | 14 |
79dd0b911fdb9a8b17efb18ba5d13877b40686cb | Martin Robinson | 2015-01-09T15:24:48 | servo: Merge #4553 - Make initialize_layers a PaintTask method (from mrobinson:paint-task-cleanup); r=larsbergstrom
This simplifies calling it substantially. Also avoid unnecessarily
changing the PaintTask epoch when we don't have paint permission.
Source-Repo: https://github.com/servo/servo
Source-Revision: 0b06aeeb... | diff --git a/gfx/paint_task.rs b/gfx/paint_task.rs
index ddd44f9e7..ed18277fb 100644
--- a/gfx/paint_task.rs
+++ b/gfx/paint_task.rs
@@ -135,42 +135,6 @@ macro_rules! native_graphics_context(
)
)
-fn initialize_layers<C>(compositor: &mut C,
- pipeline_id: PipelineId,
- ... | 1 | 42 | 50 |
725ca1be9613b47f831f9d400b0d404b95ace63a | Ms2ger | 2015-01-09T14:48:49 | servo: Merge #4585 - Remove the NavigatorInfo struct (from Ms2ger:NavigatorInfo); r=jdm
It serves no purpose.
Source-Repo: https://github.com/servo/servo
Source-Revision: 6b3c05cdd229dd50161ab3cf957f6fc7a8dcb97e | diff --git a/script/dom/navigator.rs b/script/dom/navigator.rs
index 3eb688de6..7ecee34f4 100644
--- a/script/dom/navigator.rs
+++ b/script/dom/navigator.rs
@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JSRef, Te... | 3 | 33 | 37 |
e974459c53048cbc55aea159169a3469af1e2e9f | Ms2ger | 2015-01-09T14:15:52 | servo: Merge #4584 - Deny unsafe blocks in script (from Ms2ger:unsafe); r=jdm
As a first start, this allows them indiscriminately where used.
Source-Repo: https://github.com/servo/servo
Source-Revision: f74d5360ba30ec7aaa12f675eb267fd11053d8a8 | diff --git a/script/dom/browsercontext.rs b/script/dom/browsercontext.rs
index 2c7ba17c6..9cc2a94fd 100644
--- a/script/dom/browsercontext.rs
+++ b/script/dom/browsercontext.rs
@@ -47,6 +47,7 @@ impl BrowserContext {
self.window_proxy
}
+ #[allow(unsafe_blocks)]
fn create_window_proxy(&mut self)... | 14 | 27 | 0 |
06ebf73b716cfc6175f298b5c58e0d5c1de5deaa | Arpad Borsos | 2015-01-09T12:57:51 | servo: Merge #4586 - Fix assertion trying to remove a Node that has no parent (from Swatinem:noderemove); r=Ms2ger
fixes #4562
Source-Repo: https://github.com/servo/servo
Source-Revision: c338dbe947660c1647fa8c2eb4f2f57b0c4fadc3 | diff --git a/script/dom/node.rs b/script/dom/node.rs
index 849f912bf..6d13220bd 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -1478,6 +1478,7 @@ impl Node {
// Step 1.
match child.parent_node() {
Some(ref node) if node != &Temporary::from_rooted(parent) => return Err(NotFoun... | 1 | 1 | 0 |
a425e8075d80dc9778dd7a55127bddc1255bb984 | Matt McCoy | 2015-01-09T12:24:50 | servo: Merge #4579 - Replaces the boolean argument of functions in TextInput with enum (from mattnenterprise:textinput-select-refactor); r=jdm
Fixes #4573 Replaces the boolean argument of TextInput::adjust[horizontal | vertical] with enum to self document the code
Source-Repo: https://github.com/servo/servo
Source-Re... | diff --git a/script/textinput.rs b/script/textinput.rs
index 066dbd10e..03f8f95b4 100644
--- a/script/textinput.rs
+++ b/script/textinput.rs
@@ -13,6 +13,12 @@ use std::cmp::{min, max};
use std::default::Default;
use std::num::SignedInt;
+#[deriving(Copy, PartialEq)]
+enum Selection {
+ Selected,
+ NotSelecte... | 1 | 24 | 11 |
6fb85e9f5d0701aab2534e0f7f163cd6a5b006fc | Glenn Watson | 2015-01-08T23:39:51 | servo: Merge #4580 - Update glutin for hidpi tests on mac (from glennw:glutin-hidpi); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 94a4a553324c35ce179f4065fac9ba511a6f4e6d | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 9e9c8231e..4d285bbf5 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#447b6e4132b09018bbfabe5035e4ab932a5c24be"
+sourc... | 1 | 1 | 1 |
c7a2f9c280ecc6199dd400e8fe5035774e365872 | Matthew Rasmus | 2015-01-08T23:03:55 | servo: Merge #4575 - Post-rustup warning fixes (from mttr:warnings); r=jdm
Notes:
* This adds `#![allow(missing_copy_implementations)]` to components/*/lib.rs. I'm not sure how to approach the missing Copy warnings (are there things for which Copy should NOT be implemented, and how can I tell?) so I stuck this in to ... | diff --git a/canvas/lib.rs b/canvas/lib.rs
index 2604c28af..8280c530d 100644
--- a/canvas/lib.rs
+++ b/canvas/lib.rs
@@ -4,6 +4,7 @@
#![deny(unused_imports)]
#![deny(unused_variables)]
+#![allow(missing_copy_implementations)]
extern crate azure;
extern crate geom;
diff --git a/compositing/lib.rs b/compositing/l... | 36 | 88 | 74 |
ca3927b24eeaefe69cca56f104156170b2ab6f3a | Glenn Watson | 2015-01-08T22:27:54 | servo: Merge #4546 - Add ability to explicitly set static resources path, used by cef-linux (from glennw:cef-resources); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 1699864f5339aaf463df5e2cf1d80193c3675e58 | diff --git a/util/opts.rs b/util/opts.rs
index 59642a43b..8ee877bd9 100644
--- a/util/opts.rs
+++ b/util/opts.rs
@@ -113,6 +113,9 @@ pub struct Opts {
pub validate_display_list_geometry: bool,
pub render_api: RenderApi,
+
+ /// A specific path to find required resources (such as user-agent.css).
+ pub... | 2 | 27 | 13 |
db229f251cd6ee98eec600d1d20910933b300b23 | Ms2ger | 2015-01-08T21:42:53 | servo: Merge #4574 - Remove if_let feature gates (from Ms2ger:if_let); r=Manishearth
This feature is now supported unconditionally.
Source-Repo: https://github.com/servo/servo
Source-Revision: 4cd9eb1253a764e8794f004a96112f4127687708 | diff --git a/compositing/lib.rs b/compositing/lib.rs
index 05e405f6a..0b1b66e0b 100644
--- a/compositing/lib.rs
+++ b/compositing/lib.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#![feature(globs, phase, mac... | 6 | 6 | 6 |
a6fc06fb4e3d66b93e4777b165a823419ec08a64 | Martin Robinson | 2015-01-08T19:36:53 | servo: Merge #4558 - Improve Compositor message names (from mrobinson:compositor-message-renames); r=zwarich
These names no longer reflect what the messages do, so rename them to
SetFrameTree, AssignPaintedBuffers, and CreateOrUpdateBaseLayer.
Source-Repo: https://github.com/servo/servo
Source-Revision: 1458709247586... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 134b7ee0a..f9cd4f100 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -113,8 +113,8 @@ pub struct IOCompositor<Window: WindowMethods> {
/// many times for a single page.
got_load_complete_message: bool,
- //... | 6 | 63 | 63 |
ad0b952d7e0556937085e734464fd63dac1e650a | Glenn Watson | 2015-01-05T21:36:57 | servo: Merge #4552 - Update cocoa/glutin for mac mouse events fix (from glennw:update-glutin-cocoa); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 3c45973238eab6f85fcc5184e3edf7ad010428f8 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index b92f7ea77..c9e983909 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -59,7 +59,7 @@ dependencies = [
[[package]]
name = "cocoa"
version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#8f47f126fe534d4dad86aa1f5b2da46a0581a232"
+source = "git+... | 1 | 2 | 2 |
ee806cfe5c0a5cfefc40e96450914260421d38a7 | Ms2ger | 2015-01-05T15:09:53 | servo: Merge #4550 - Rename MouseWindowEvent variants (from Ms2ger:MouseWindowEvent); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ca876edc051c9b105747252155d0f11c31189646 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index b4dd37a29..40d0f56df 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -797,9 +797,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
fn on_mouse_window_event_class(&self, mouse_window_event: MouseWindowEvent) {... | 3 | 9 | 9 |
02469e72198c89d726711cf03360c8a3d1adeb7e | Ms2ger | 2015-01-05T08:27:48 | servo: Merge #4548 - Various cleanup (from Ms2ger:cleanup); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 65ee8166bd64e911502e29a050258b70d9f263aa | diff --git a/gfx/paint_task.rs b/gfx/paint_task.rs
index 5fdacfa83..99e1454e9 100644
--- a/gfx/paint_task.rs
+++ b/gfx/paint_task.rs
@@ -224,7 +224,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send {
debug!("paint_task: shutdown_chan send");
shutdown_chan.send(());
- }, Constell... | 7 | 10 | 21 |
0dd1a6a7617f43422f7d4c603cf6cfbc599dd396 | Bharath M R | 2015-01-04T13:21:50 | servo: Merge #4533 - Issue 4497 Fix: Converts WorkerPostMessage into a Runnable (from catchmrbharath:4497); r=jdm
A lot of tests were failing when I ran `./mach test tests/wpt/web-platform-tests/workers --processes=4` and
`./mach test tests/wpt/web-platform-tests/XMLHttpRequest --processes=4` on master. So I could not... | diff --git a/script/dom/dedicatedworkerglobalscope.rs b/script/dom/dedicatedworkerglobalscope.rs
index b095cd7b1..0257f8edc 100644
--- a/script/dom/dedicatedworkerglobalscope.rs
+++ b/script/dom/dedicatedworkerglobalscope.rs
@@ -16,7 +16,7 @@ use dom::bindings::refcounted::LiveDOMReferences;
use dom::bindings::utils::... | 3 | 24 | 11 |
4b7d960ba0ee7c382c4c7ea4ded4319a949435c6 | Ms2ger | 2015-01-03T17:39:48 | servo: Merge #4538 - Remove obsolete attributes (from Ms2ger:attributes); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d8b6cec722e67f1fd39f154f4f0a298f2227501f | diff --git a/compositing/lib.rs b/compositing/lib.rs
index ea0405a30..2c2ccdcb7 100644
--- a/compositing/lib.rs
+++ b/compositing/lib.rs
@@ -2,9 +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/. */
-#![comment = "The Servo Para... | 10 | 0 | 30 |
1e78fc09ff4ffb8ec0f34626eae4bdf203809cad | Martin Robinson | 2015-01-03T03:21:47 | servo: Merge #4536 - Stall PaintTask exit until it can release all buffers (from mrobinson:pixmap); r=pcwalton
It is possible for a PaintTask to start exiting soon after sending new
buffers to the compositor. In that case, the compositor should return
the now unnecessary buffers to the PaintTask so that it can properl... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 0e5294ae2..71a37ddbc 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -129,6 +129,9 @@ pub struct IOCompositor<Window: WindowMethods> {
/// Pending scroll events.
pending_scroll_events: Vec<ScrollEvent>,
+
+ ... | 13 | 180 | 103 |
a48e30d5feb681ea2327e87210f04a6607af5c09 | Ms2ger | 2015-01-01T20:27:43 | servo: Merge #4527 - Remove spurious spaces from lints/mod.rs (from Ms2ger:indentation-plugins); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: f41324c2a1e7625075389fabb4cfd636c5617cb1 | diff --git a/plugins/lints/mod.rs b/plugins/lints/mod.rs
index af7083e5b..b40e59e44 100644
--- a/plugins/lints/mod.rs
+++ b/plugins/lints/mod.rs
@@ -2,8 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- pub mod inheritance... | 1 | 5 | 5 |
b2fe320b0603967b5859043a7de40eea13077b5f | Rohan Prinja | 2015-01-01T08:33:41 | servo: Merge #4521 - break up lints.rs into separate files (from ajnirp:separate-lints); r=Manishearth
for #4509
Source-Repo: https://github.com/servo/servo
Source-Revision: 685dec1abc61402ab22db93f4a362a58f8377d68 | diff --git a/plugins/lib.rs b/plugins/lib.rs
index 6cf75aae7..5a4a7554a 100644
--- a/plugins/lib.rs
+++ b/plugins/lib.rs
@@ -44,11 +44,11 @@ pub fn plugin_registrar(reg: &mut Registry) {
reg.register_syntax_extension(intern("dom_struct"), Modifier(box jstraceable::expand_dom_struct));
reg.register_syntax_exte... | 9 | 430 | 378 |
9fdd4b9a50f0224305e25fceb8727c7d68816791 | Ms2ger | 2014-12-31T14:33:46 | servo: Merge #4520 - Use or_init for HTMLCanvasElement::GetContext (from Ms2ger:or_init); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 841f1b6f2559e7a33a1517fba53c12bbd67ed44f | diff --git a/script/dom/htmlcanvaselement.rs b/script/dom/htmlcanvaselement.rs
index 0c3d8df0e..890e17ac4 100644
--- a/script/dom/htmlcanvaselement.rs
+++ b/script/dom/htmlcanvaselement.rs
@@ -9,7 +9,7 @@ use dom::bindings::codegen::Bindings::HTMLCanvasElementBinding::HTMLCanvasElemen
use dom::bindings::codegen::Inher... | 1 | 4 | 6 |
60081d7ff1083902981ad6bf556c276bc0fead4f | Ms2ger | 2014-12-30T16:03:45 | servo: Merge #4487 - Re-enable two transform_text unit tests (from Ms2ger:gfx-test); r=jdm
Note that I had to change some expectations to make them pass.
Source-Repo: https://github.com/servo/servo
Source-Revision: 5d8ec549597de4af1008ee1395f89adbcf40fdb8 | diff --git a/gfx/text/util.rs b/gfx/text/util.rs
index d39119935..9fc60084d 100644
--- a/gfx/text/util.rs
+++ b/gfx/text/util.rs
@@ -144,147 +144,160 @@ fn test_true_type_tag() {
#[test]
fn test_transform_compress_none() {
- let test_strs = vec!(
+ let test_strs = [
" foo bar",
"foo bar ",... | 1 | 119 | 106 |
9581ee84fb1b1f1ef6dac4edc1554b513a8437cf | Benjamin Peterson | 2014-12-30T01:48:41 | servo: Merge #4512 - use geom::num::Zero rather than the deprecated num::Zero trait from std (from benjaminp:zero-warning); r=jdm
This fixes the following warning:
```
display_list/mod.rs:735:20: 735:30 warning: use of deprecated item: Use `Int::zero()` or `Float::zero()`., #[warn(deprecated)] on by default
display_li... | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index c6ad40c64..4ac959679 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -27,6 +27,7 @@ use text::TextRun;
use azure::azure::AzFloat;
use collections::dlist::{mod, DList};
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D}... | 1 | 1 | 1 |
545c23ddcf885dac8b2c51dc754cead3c957d7aa | Josh Matthews | 2014-12-29T18:57:45 | servo: Merge #4057 - Enable refcounting arbitrary DOM types (from jdm:refcountdom); r=Ms2ger
This replaces the specialized TrustedXHRAddress and TrustedWorkerAddress code that was used for the same purpose. A non-zero refcount pins the given DOM object's reflector and prevents it from being GCed even when there are no... | diff --git a/script/dom/bindings/global.rs b/script/dom/bindings/global.rs
index 4efeb7aaf..38e018fe2 100644
--- a/script/dom/bindings/global.rs
+++ b/script/dom/bindings/global.rs
@@ -10,7 +10,7 @@
use dom::bindings::conversions::FromJSValConvertible;
use dom::bindings::js::{JS, JSRef, Root};
use dom::bindings::uti... | 13 | 422 | 253 |
7c702c94ff4373d434d34fe3d637cfd07e8bd520 | Ms2ger | 2014-12-29T16:54:45 | servo: Merge #4501 - Simplify some code in handle_click_event (from Ms2ger:script_task); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1539051896c5c4093e7a7bb5a52939b31bb0d7da | diff --git a/script/script_task.rs b/script/script_task.rs
index ce4d8e917..26b566596 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -1107,14 +1107,14 @@ impl ScriptTask {
node::from_untrusted_node_address(
self.js_runtime.ptr, node_address).root(... | 1 | 5 | 6 |
189098913fa9a6ae488318d67720db9b526224a9 | Ms2ger | 2014-12-27T19:27:46 | servo: Merge #4490 - Remove some transmute calls (from Ms2ger:transmutes); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: dbb10747828b08f5dc9bcaea251e1f2d16f554fd | diff --git a/layout/css/matching.rs b/layout/css/matching.rs
index 656d08bcb..e4d6b767c 100644
--- a/layout/css/matching.rs
+++ b/layout/css/matching.rs
@@ -460,7 +460,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> {
};
let parent_layout_data: &Option<LayoutDataWrapper> = unsafe {
- ... | 2 | 3 | 3 |
f805a381da86eacb8970d0d70f47d2fa749313a3 | Manish Goregaokar | 2014-12-27T16:10:02 | servo: Merge #4489 - plugins: Fix transmute lint message (from Manishearth:transmute-lint-fix); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: b139574cdc3ce622568253e0ff9d2e1750128b26 | diff --git a/plugins/lints.rs b/plugins/lints.rs
index d5891cc9c..5bb2767a0 100644
--- a/plugins/lints.rs
+++ b/plugins/lints.rs
@@ -56,7 +56,7 @@ impl LintPass for TransmutePass {
&& args.len() == 1 {
let tcx = cx.tcx();
cx.span_lint... | 1 | 1 | 1 |
a7c3ba554f6d0b9dfc650a48a0400a819e126195 | Josh Matthews | 2014-12-24T18:15:45 | servo: Merge #4478 - Fix HTTPS fetches (from jdm:hyperssl); r=larsbergstrom
This just updates rust-openssl and hyper to use cherry-picked commits that fix this particular issue. I think it's worth it because the experience of trying Servo for the first time right now is pretty terrible.
Source-Repo: https://github.co... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index b5831595e..6ef9522ae 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -388,7 +388,7 @@ source = "git+https://github.com/servo/html5ever#e6f8d83de9fffe63a825d95d957ba6b
[[package]]
name = "hyper"
version = "0.0.1"
-source = "git+https://github.com/servo/hy... | 1 | 3 | 3 |
20a71d9766969b8286fd65bef5868f5769ae5f5d | thiagopnts | 2014-12-24T17:45:45 | servo: Merge #4477 - Use a descriptive enum instead of a bool in Element::update_inline_style (from thiagopnts:descriptive-enum); r=jdm
refs #4472
Source-Repo: https://github.com/servo/servo
Source-Revision: c35a18e81f943ae09db50afdf54a03dece153615 | diff --git a/script/dom/cssstyledeclaration.rs b/script/dom/cssstyledeclaration.rs
index cacb5afb1..7d4feeb40 100644
--- a/script/dom/cssstyledeclaration.rs
+++ b/script/dom/cssstyledeclaration.rs
@@ -9,7 +9,7 @@ use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, OptionalRootedRootable, Temporary... | 2 | 15 | 7 |
44f070aa7ccb285d7b8f25a09d7ee988fb2e376d | thiagopnts | 2014-12-24T10:45:44 | servo: Merge #4474 - Replace XHR events for generic ones in ScriptTask (from thiagopnts:generic-msgs); r=jdm
This refs #3735. As discussed in the issue, I did it cloning when I couldn't dereference an attribute. The trait method should be on `&self` for object-safety reasons.
Source-Repo: https://github.com/servo/ser... | diff --git a/script/dom/bindings/error.rs b/script/dom/bindings/error.rs
index 961ba959b..4cfdd3a06 100644
--- a/script/dom/bindings/error.rs
+++ b/script/dom/bindings/error.rs
@@ -19,7 +19,7 @@ use libc;
use std::ptr;
/// DOM exceptions that can be thrown by a native DOM method.
-#[deriving(Show)]
+#[deriving(Show... | 4 | 43 | 21 |
508d30ffc59b8666bfa5ad59babd3592423c9b60 | James Moughan | 2014-12-24T06:45:45 | servo: Merge #4457 - Select all input text on ctr+a #4411 (from jamougha:master); r=jdm
Fixes #4411.
I didn't find any tests for the text control functionality so I didn't write any for this, let me know if I should.
Source-Repo: https://github.com/servo/servo
Source-Revision: 71b9f17b6b1695c08036f688249b486fa58c25... | diff --git a/script/textinput.rs b/script/textinput.rs
index 8e984fe60..2b357b793 100644
--- a/script/textinput.rs
+++ b/script/textinput.rs
@@ -64,6 +64,19 @@ enum DeleteDir {
Backward
}
+
+/// Was the keyboard event accompanied by the standard control modifier,
+/// i.e. cmd on Mac OS or ctrl on other platfor... | 1 | 28 | 0 |
10892e82d3196f9afcd341f2147befb370e115c9 | Matt McCoy | 2014-12-24T06:15:47 | servo: Merge #4453 - This will fix #4259. Dispatch mousemove when the mouse is moved (from mattnenterprise:dispatch-mousemove); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fb59e7929998facb292ed606255a665c74cf9416 | diff --git a/script/script_task.rs b/script/script_task.rs
index dd5a3385e..696d0e10f 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -23,6 +23,7 @@ use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable};
use dom::uievent::UIEvent;
use dom::eventtarget::{EventTarget, EventTargetHelpers... | 1 | 28 | 0 |
c1ec1fc288bb5d7fe549183e1b2f13f22e0d09ee | Glenn Watson | 2014-12-23T00:57:46 | servo: Merge #4461 - Use event polling instead of blocking when outputting to a file (from glennw:glutin-tests); r=larsbergstrom
This stops some ref tests on linux blocking while waiting for
user input events and never outputting the file.
Also mark vertical writing test as flaky on all platforms. Due
to unrelated ti... | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 068350ccd..b5831595e 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -329,7 +329,7 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.2"
-source = "git+https://github.com/servo/glutin?ref=servo#936519a44f77f6b646c504eff38fe7d57a17b1f4"
+sourc... | 1 | 1 | 1 |
9c1efdf362e3ba39f75b9ce170b1393cc4b9cc67 | Glenn Watson | 2014-12-22T21:33:45 | servo: Merge #4442 - glutin - Add support for waking up blocked event loop, and smooth resize on mac (from glennw:glutin-events-resize); r=larsbergstrom,larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 20b961493ac73abbb5260f93f550692cb9ef8fec | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 27781ede2..068350ccd 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -59,7 +59,7 @@ dependencies = [
[[package]]
name = "cocoa"
version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#19d6f6977dcedbf29000b65d83df66cf589c20c3"
+source = "git+... | 1 | 5 | 5 |
9885ffca669c5a143bfc12d5189e48fa756ffe6b | Emanuel Rylke | 2014-12-21T14:24:44 | servo: Merge #4456 - On left/right keydown place edit_point correctly when there is a selection in TextInput (from ema-fox:textinput_selection); r=jdm
Fixes #4447
Source-Repo: https://github.com/servo/servo
Source-Revision: bde6c39192faaab3c6e77fd5ea81605673477bac | diff --git a/script/textinput.rs b/script/textinput.rs
index 843838933..8e984fe60 100644
--- a/script/textinput.rs
+++ b/script/textinput.rs
@@ -97,15 +97,20 @@ impl TextInput {
self.replace_selection(ch.to_string());
}
- fn replace_selection(&mut self, insert: String) {
- let begin = self.sel... | 1 | 15 | 5 |
dff36d31dcbca7a45a289d9943c4a28dc3b0aff9 | Ms2ger | 2014-12-20T23:57:43 | servo: Merge #4451 - Require documentation for ByteString (from Ms2ger:bytestring-doc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b4025f167f0a4a64a22eb308984c18446537bec2 | diff --git a/script/dom/bindings/str.rs b/script/dom/bindings/str.rs
index 0882b3538..19cf7bc20 100644
--- a/script/dom/bindings/str.rs
+++ b/script/dom/bindings/str.rs
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */... | 1 | 2 | 0 |
67f5be5ee936d1defcff465fa21672a1672d3249 | Ms2ger | 2014-12-20T15:36:43 | servo: Merge #4450 - Document DOMRefCell (from Ms2ger:domrefcell-doc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 661144d28546dc287cba6a76325855c0efac9551 | diff --git a/script/dom/bindings/cell.rs b/script/dom/bindings/cell.rs
index 76219b799..9df1e448c 100644
--- a/script/dom/bindings/cell.rs
+++ b/script/dom/bindings/cell.rs
@@ -2,6 +2,10 @@
* 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 | 45 | 3 |
dc4d8ed50b2c84ccf37d7b8b8f105480de1862e2 | Josh Matthews | 2014-12-19T16:18:46 | servo: Merge #4401 - Create a replacement for Cell<SM primitive>. Fixes #4337 (from jdm:heapsm2); r=Manishearth
We still will need a lint to ban any further uses, but that can be a followup.
Source-Repo: https://github.com/servo/servo
Source-Revision: c17d5330af88eb919195ac39d7795548f6683541 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index c9f3e157b..1f3cb7814 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -45,11 +45,13 @@
//! - `OptionalSettable`: allows assigning `Option` values of `JSRef`/`Temporary` to fields of `Option<JS<T>>`
//! - `RootedReference... | 4 | 45 | 13 |
ddfe77bf916a97fb1b0783ada9fcb61a06923f59 | Ms2ger | 2014-12-19T15:09:48 | servo: Merge #4444 - Simplify some code in ScriptTask::load (from Ms2ger:load-simplify); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b9edc2243a98f2d71408430fe68716bdbbd015d7 | diff --git a/script/script_task.rs b/script/script_task.rs
index 2f2bb5f0b..dd5a3385e 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -828,11 +828,8 @@ impl ScriptTask {
// Kick off the initial reflow of the page.
debug!("kicking off initial reflow of {}", final_url);
- {
- ... | 1 | 2 | 5 |
cfe2516a37cd5c9a57579c662a21007c20025905 | Ms2ger | 2014-12-19T11:33:46 | servo: Merge #4443 - Make the argument to dispatch_event_with_target non-optional (from Ms2ger:dispatch_event_with_target); r=Manishearth
The name of the method makes it clear it's supposed to be used with a target
override, so we might as well enforce that.
Source-Repo: https://github.com/servo/servo
Source-Revision... | diff --git a/script/dom/eventtarget.rs b/script/dom/eventtarget.rs
index 3b353bf27..3293a0992 100644
--- a/script/dom/eventtarget.rs
+++ b/script/dom/eventtarget.rs
@@ -108,7 +108,7 @@ impl EventTarget {
pub trait EventTargetHelpers {
fn dispatch_event_with_target(self,
- target... | 2 | 5 | 5 |
3bf35d1cc20fb438cb42a6131ffdbe96d38b587d | Eduard Burtescu | 2014-12-19T05:27:44 | servo: Merge #4326 - Handle onload correctly and trigger the load event for <script> (from eddyb:script-onload); r=jdm
Without this, facebook.com pages (with their custom module loading system and React.js) silently fail to make progress loading content, forever waiting on load events on the initial set of `<script>` ... | diff --git a/script/dom/htmlelement.rs b/script/dom/htmlelement.rs
index 8fb0f2c4b..e38ab5ff5 100644
--- a/script/dom/htmlelement.rs
+++ b/script/dom/htmlelement.rs
@@ -94,7 +94,8 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> {
let win = window_from_node(self).root();
win.GetOnload... | 2 | 17 | 2 |
df34f7c896174330e6230d1615179b6b5d960841 | Adenilson Cavalcanti | 2014-12-18T23:24:54 | servo: Merge #4437 - Fix inset/outset when border is black (from Adenilson:fixInsetOutsetBlack03); r=jdm
Freshly rebased.
Source-Repo: https://github.com/servo/servo
Source-Revision: 4ac8b6a723fe0ce6a80ce03e1e4e2082961f1319 | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index 96de5a82a..7dea4896d 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -642,11 +642,22 @@ impl<'a> PaintContext<'a> {
};
// original bounds as a Rect<f32>
let original_bounds = self.get_scaled_bounds(bounds, border, ... | 1 | 16 | 5 |
181f9ea105605b6bdd13535669803ea286b58a8d | Simon Sapin | 2014-12-18T22:31:28 | servo: Merge #4425 - Fix some writing mode mismatch assertions errors (from SimonSapin:mixed-writing-modes); r=mbrubeck
The rendering is still wrong beause of #2795, but at least we get a rendering.
(This test change is just for readability, it should be equivalent to before.)
r? @mbrubeck
Source-Repo: https://gith... | diff --git a/layout/block.rs b/layout/block.rs
index 744ba0853..122fd0a82 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1783,9 +1783,9 @@ impl Flow for BlockFlow {
if !flow::base(kid).flags.contains(IS_ABSOLUTELY_POSITIONED) {
let kid_base = flow::mut_base(kid);
k... | 2 | 12 | 5 |
4634d509596af320f6f709baf2feeff13e37585c | Patrick Walton | 2014-12-18T21:39:50 | servo: Merge #4403 - script: Fix double borrow error when going back. Closes #4402 (from pcwalton:back-borrow); r=jdm
I have verified that back and forward work once again.
Sorry about this one. r? @jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 8626be6ab00d966cb4abed2a2fef691d286df32d | diff --git a/script/script_task.rs b/script/script_task.rs
index dfb4e7d26..4229da005 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -729,15 +729,24 @@ impl ScriptTask {
message for a layout channel that is not associated with this script task. This
is a bug.");
- l... | 1 | 17 | 8 |
434fb4dc53dbd59b5ce8ecc9b47b6ee77cb66b14 | Tetsuharu OHZEKI | 2014-12-18T20:21:55 | servo: Merge #4423 - net: Remove glob imports added in #4405 (from saneyuki:glob_net); r=jdm
#4406
Source-Repo: https://github.com/servo/servo
Source-Revision: 4ccecd8dca406a4f0d62ac50f461b09816786ec5 | diff --git a/net/fetch/cors_cache.rs b/net/fetch/cors_cache.rs
index 70ae8af3f..23a6a8450 100644
--- a/net/fetch/cors_cache.rs
+++ b/net/fetch/cors_cache.rs
@@ -9,9 +9,6 @@
//! This library will eventually become the core of the Fetch crate
//! with CORSRequest being expanded into FetchRequest (etc)
-use self::CORS... | 8 | 172 | 194 |
0b06e73c5be898efc01ac50b5b19e4a72a450e8f | Tetsuharu OHZEKI | 2014-12-18T19:52:01 | servo: Merge #4418 - gfx: Remove glob imports added in #4405 (from saneyuki:glob_gfx); r=jdm
#4406
Source-Repo: https://github.com/servo/servo
Source-Revision: a425bb528957fd77cf8300b17e153f8fc3777483 | diff --git a/gfx/display_list/mod.rs b/gfx/display_list/mod.rs
index 1d81f39f6..62c19a03c 100644
--- a/gfx/display_list/mod.rs
+++ b/gfx/display_list/mod.rs
@@ -357,7 +357,7 @@ impl StackingContext {
continue
}
match *item {
- BorderDisplayItemCl... | 6 | 113 | 125 |
74d7520b7b9974887f084160a9c179488eaea3ef | Tetsuharu OHZEKI | 2014-12-18T18:03:55 | servo: Merge #4424 - style: Remove glob imports added in #4405 (from saneyuki:glob_style); r=SimonSapin
#4406
Source-Repo: https://github.com/servo/servo
Source-Revision: 1f342638c46d6b43bca4cfbd405aceedc0465a85 | diff --git a/layout/css/matching.rs b/layout/css/matching.rs
index f8d4a3f72..4251769de 100644
--- a/layout/css/matching.rs
+++ b/layout/css/matching.rs
@@ -559,10 +559,10 @@ impl<'ln> MatchMethods for LayoutNode<'ln> {
// In terms of `SimpleSelector`s, these two functions will insert and remove:
- // - `... | 7 | 53 | 58 |
29b76268b40bafe6b13fce692e0ad349807e7038 | Matt McCoy | 2014-12-18T16:39:56 | servo: Merge #4416 - Merge request for #4407. Removes the cloning because it wasn't necessary (from mattnenterprise:fire-timer-clone); r=jdm
I tested that it worked correctly by using running './mach run tests/html/test_timeout.html' and making sure the timers went off.
Source-Repo: https://github.com/servo/servo
Sou... | diff --git a/script/dom/window.rs b/script/dom/window.rs
index 8142b455f..27e852a6a 100644
--- a/script/dom/window.rs
+++ b/script/dom/window.rs
@@ -357,7 +357,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
}
fn handle_fire_timer(self, timer_id: TimerId) {
- self.timers.fire_timer(timer_id, self... | 2 | 2 | 2 |
3df616ff76e0f8de599e8d3c73d5845594f928c5 | Matt Brubeck | 2014-12-18T15:06:54 | servo: Merge #4412 - Update layer bounds on resize (from mbrubeck:fixed-layer-resize); r=mrobinson
This fixes a bug where fixed-position layers are not repositioned when the
window is resized. This can be reproduced with any `position: fixed` element with a `right` or `bottom` position. I'm not sure how to reftest t... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 59ceaea49..0e5294ae2 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -499,7 +499,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
let need_new_root_layer = !self.update_layer_if_exists(layer_properties);
... | 2 | 6 | 6 |
69cd1961a806a576bbeeff02ae94c593c3f19c9f | Chris Paris | 2014-12-18T04:12:48 | servo: Merge #4415 - Use `parse_html` in DOMParser (from ChrisParis:parse_html); r=jdm
For https://github.com/servo/servo/issues/4362. This is a simple fix that avoids redesigning task_state. This doesn't track nesting depth, but it wasn't clear what would use the nesting depth if we tracked it. Maybe this is enough.
... | diff --git a/script/dom/domparser.rs b/script/dom/domparser.rs
index 91d340aa7..601af0493 100644
--- a/script/dom/domparser.rs
+++ b/script/dom/domparser.rs
@@ -14,9 +14,8 @@ use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object};
use dom::document::{Docu... | 2 | 12 | 10 |
9ad67281169afc4e0bc2b38b11781950056b323c | Glenn Watson | 2014-12-17T03:18:44 | servo: Merge #4398 - Update gleam, clear initial framebuffer under glutin (from glennw:glutin-clear); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b8900782b0fcb409f37189bdc08eb7f8b3564a5f | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 9865d6680..b0ee31419 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -263,7 +263,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.0.1"
-source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
+source = "git+htt... | 1 | 1 | 1 |
f50b9a57fe0377346cd26cc5fd9753b623c1f9e2 | Adenilson Cavalcanti | 2014-12-17T00:03:43 | servo: Merge #4393 - Inset and outset border coloring is incorrect on left side border (from Adenilson:fixInsetOutsetColor01); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: df4c3ff28441884217333eb13c18b944b81f1a3a | diff --git a/gfx/paint_context.rs b/gfx/paint_context.rs
index 0748b3db9..f34b62559 100644
--- a/gfx/paint_context.rs
+++ b/gfx/paint_context.rs
@@ -642,8 +642,7 @@ impl<'a> PaintContext<'a> {
let original_bounds = self.get_scaled_bounds(bounds, border, 0.0);
// select and scale the color appropriatel... | 1 | 1 | 2 |
39b1b34b0c398ef473964e7c76dd19d642059376 | Jerry Shih | 2014-12-16T23:03:45 | servo: Merge #4397 - Handle null when evaluating JS value. Fixes #4235 (from jdm:issue_4235); r=jdm
Rebased from #4241.
Source-Repo: https://github.com/servo/servo
Source-Revision: 03666f31051562453a6be789f9d350db9c3fa6a2 | diff --git a/script/devtools.rs b/script/devtools.rs
index 8d7a5d35b..a829a6829 100644
--- a/script/devtools.rs
+++ b/script/devtools.rs
@@ -37,9 +37,11 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r
} else if rval.is_string() {
//FIXME: use jsstring_to_str when jsval ... | 1 | 3 | 1 |
ae323fa8b5553ed03080936ac523430b75ada909 | Matthew Rasmus | 2014-12-16T19:09:50 | servo: Merge #4380 - Makes layout respect <textarea> rows and cols attributes (from mttr:textarea_rows_and_cols); r=jdm
...with a bit of a caveat: sizing has the same problem as seen in #4378, and it is _significantly_ more noticeable when using `rows`.
Fixes #4291
Source-Repo: https://github.com/servo/servo
Source-... | diff --git a/script/dom/element.rs b/script/dom/element.rs
index 3d7a6a861..c3c0b9fcb 100644
--- a/script/dom/element.rs
+++ b/script/dom/element.rs
@@ -19,7 +19,7 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, ElementDerived, EventTar
use dom::bindings::codegen::InheritTypes::{HTMLBodyElementDerived, HTML... | 4 | 93 | 7 |
1d044a3f787ee4d00cb5832e2dd0d4a039e25b9c | Ms2ger | 2014-12-16T16:22:02 | servo: Merge #4390 - Remove some manual deref() / deref_mut() calls (from Ms2ger:derefs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 905c30d69739fcacfe67cb2605eb9f669ae9a82f | diff --git a/layout/flow_ref.rs b/layout/flow_ref.rs
index eb2b4e03c..e46c42d48 100644
--- a/layout/flow_ref.rs
+++ b/layout/flow_ref.rs
@@ -55,7 +55,7 @@ impl Drop for FlowRef {
if self.object.vtable.is_null() {
return
}
- if flow::base(self.deref()).ref_count().fe... | 2 | 6 | 6 |
6c89192f40ab2f75975e3e997889af84c5b395f6 | Ms2ger | 2014-12-16T15:54:51 | servo: Merge #4389 - Fix bogus transmute (from Ms2ger:transmute); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 508924771e8f0f60700931ebd88aebf8c8889e44 | diff --git a/layout/flow.rs b/layout/flow.rs
index 20645e701..c7ce0275e 100644
--- a/layout/flow.rs
+++ b/layout/flow.rs
@@ -657,15 +657,7 @@ pub struct DescendantIter<'a> {
impl<'a> Iterator<&'a mut Flow + 'a> for DescendantIter<'a> {
fn next(&mut self) -> Option<&'a mut Flow + 'a> {
- match self.iter.n... | 1 | 1 | 9 |
03cdffc34a85eef0d4bb224e6dd6c0660804fa10 | Glenn Watson | 2014-12-16T15:24:49 | servo: Merge #4386 - Update cocoa (needed for newer glutin) (from glennw:update-cocoa); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: cd1ccacf5e803281ead0168c3ac1ba5f64dc9343 | diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index edede8178..9865d6680 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -58,7 +58,7 @@ dependencies = [
[[package]]
name = "cocoa"
version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#084f8e1baf40391eb12819d16765af25ca96c7ec"
+source = "git+... | 1 | 1 | 1 |
1f4a1e8795b23206e58f29dd6d3967e078a4c151 | thiagopnts | 2014-12-16T13:36:47 | servo: Merge #4374 - Add auxiliary method to EventTargetHelpers for events without target (from thiagopnts:dispatch-event); r=Ms2ger
servo/pull/4369 with the right commit.
Source-Repo: https://github.com/servo/servo
Source-Revision: 746b262ff4e23db11586f74ef1a03e98cb12bb52 | diff --git a/script/dom/activation.rs b/script/dom/activation.rs
index e4a54112e..97bc66f53 100644
--- a/script/dom/activation.rs
+++ b/script/dom/activation.rs
@@ -49,7 +49,7 @@ pub trait Activatable : Copy {
0, None).root();
let event: JSRef<Event> = EventCast::from_ref(*... | 7 | 21 | 15 |
11b25cb623aab4207bf128e8c2f8e70059b31af4 | Patrick Walton | 2014-12-16T03:54:44 | servo: Merge #4385 - script: Fix double-borrow error (from pcwalton:page-double-borrow); r=jdm
This was my fault. It comes up on almost any page after scrolling a bit.
r? @jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fb5c1bef6fe48b7bd2c1dd9e73069d5b00b20aad | diff --git a/script/script_task.rs b/script/script_task.rs
index 9a20afe4a..383de5e03 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -495,7 +495,7 @@ impl ScriptTask {
let page = self.page.borrow_mut();
let inner_page = page.find(id).expect("Page rect message... | 1 | 1 | 1 |
49da938266ecd63bf15f98d5979cd63479839712 | Manish Goregaokar | 2014-12-16T03:00:53 | servo: Merge #4381 - Fix window.performance.now() (from Manishearth:performancenow); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e0ec21e814f07601fa3e5e2ec04de7c7a0fd7893 | diff --git a/script/dom/performance.rs b/script/dom/performance.rs
index 60f5abfec..3fc094eeb 100644
--- a/script/dom/performance.rs
+++ b/script/dom/performance.rs
@@ -47,9 +47,10 @@ impl<'a> PerformanceMethods for JSRef<'a, Performance> {
Temporary::new(self.timing.clone())
}
+ // https://dvcs.w3.o... | 2 | 4 | 3 |
72e2b4b1fbfaa340fe5085a7ace73916399e7487 | Patrick Walton | 2014-12-16T02:09:49 | servo: Merge #4371 - layout: Make line breaking able to restart from any position (from pcwalton:line-breaking-improvements); r=mbrubeck
This commit removes the "merge-fragments" pass from inline reflow,
instead merging "on the fly". This ended up being simpler, as well as
more fine grained. Additionally, this patch m... | diff --git a/layout/inline.rs b/layout/inline.rs
index 89b65b22f..370d7e325 100644
--- a/layout/inline.rs
+++ b/layout/inline.rs
@@ -169,7 +169,9 @@ bitflags! {
struct LineBreaker {
/// The floats we need to flow around.
floats: Floats,
+ /// The resulting fragment list for the flow, consisting of possibl... | 1 | 88 | 68 |
22419e44816e72b5f33ca7ff41d4bb37b62bfc7c | Patrick Walton | 2014-12-15T22:31:21 | servo: Merge #3844 - script: Improve dirty propagation and fix script-layout synchronization (from pcwalton:script-layout-synchronization); r=jdm
This fixes race conditions whereby layout and script could be running
simultaneously.
r? @jdm
cc @cgaebel
Source-Repo: https://github.com/servo/servo
Source-Revision: 5f26... | diff --git a/layout/layout_task.rs b/layout/layout_task.rs
index 995742cd7..deda7d481 100644
--- a/layout/layout_task.rs
+++ b/layout/layout_task.rs
@@ -590,6 +590,8 @@ impl LayoutTask {
requested_node: TrustedNodeAddress,
layout_root: &mut... | 11 | 254 | 278 |
b00c8c2c91a519a7c289e8173ddad95f0bdf9068 | Ms2ger | 2014-12-15T20:16:05 | servo: Merge #4373 - Correctly set the BlobType for File objects (from Ms2ger:blob-type); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 4e187af2f17339df25fb1dfaf91821d0f53cba5e | diff --git a/script/dom/blob.rs b/script/dom/blob.rs
index b0d0b1558..cbe98b13a 100644
--- a/script/dom/blob.rs
+++ b/script/dom/blob.rs
@@ -30,10 +30,11 @@ pub struct Blob {
}
impl Blob {
- pub fn new_inherited(global: &GlobalRef, bytes: Option<Vec<u8>>) -> Blob {
+ pub fn new_inherited(global: &GlobalRef, t... | 2 | 8 | 8 |
ecf80df2c34a14147973f8ad427b8f4eebac06cc | thiagopnts | 2014-12-15T09:15:51 | servo: Merge #4372 - Make ErrorEvent::new take cancelable and bubbling enums (from thiagopnts:errorevent); r=Ms2ger
Fixes #4174.
Source-Repo: https://github.com/servo/servo
Source-Revision: 1bc2c8a6397382b4db8fb09582434f4798d43868 | diff --git a/script/dom/errorevent.rs b/script/dom/errorevent.rs
index a05a13188..ce7eb7184 100644
--- a/script/dom/errorevent.rs
+++ b/script/dom/errorevent.rs
@@ -13,7 +13,7 @@ use js::jsapi::JSContext;
use dom::bindings::trace::JSTraceable;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
... | 1 | 9 | 5 |
d9d1c37162493d981701258c2b792ef861b51599 | Chris Paris | 2014-12-13T19:30:45 | servo: Merge #4297 - Make DOMParser::ParseFromString actually parse the string (from ChrisParis:parse); r=Ms2ger
Addresses https://github.com/servo/servo/issues/3756. I've tested this code with a new test that I've submitted to https://github.com/w3c/web-platform-tests.
Source-Repo: https://github.com/servo/servo
Sou... | diff --git a/script/dom/domparser.rs b/script/dom/domparser.rs
index 663bb2395..fe543162d 100644
--- a/script/dom/domparser.rs
+++ b/script/dom/domparser.rs
@@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+use dom:... | 1 | 19 | 7 |
9ecb2f6b98954383b67033fb75be365dbb9ab273 | Ms2ger | 2014-12-13T17:15:45 | servo: Merge #4363 - Never include the root node in live HTMLCollections (from Ms2ger:collectionfilter); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 29c9975a835d7304055f1dec22d674846bb2dfa9 | diff --git a/script/dom/htmlcollection.rs b/script/dom/htmlcollection.rs
index 91034fd44..86f977c84 100644
--- a/script/dom/htmlcollection.rs
+++ b/script/dom/htmlcollection.rs
@@ -10,12 +10,13 @@ use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::trace::JSTraceable;
use dom::bindings::utils::{Reflecta... | 2 | 28 | 42 |
40266e91e0a3771c6fa19db25d0c740e1b0a5a10 | Patrick Walton | 2014-12-13T09:00:52 | servo: Merge #4357 - compositing: Translate clip rects into the coordinate systems of child layers when doing hit tests (from pcwalton:compositor-hit-test-clipping); r=mrobinson
Fixes clicking on links on the second page of Hacker News.
r? @mrobinson
Source-Repo: https://github.com/servo/servo
Source-Revision: 251db... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index befa0fce6..21cfcfdcd 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -1125,9 +1125,12 @@ impl<Window: WindowMethods> IOCompositor<Window> {
let child_point = point - layer_bounds.origin;
for child in l... | 1 | 9 | 4 |
8f415c3ffbdb4146ebb842cc6f7011c5baf31ab0 | Gilbert Röhrbein | 2014-12-13T00:30:47 | servo: Merge #4356 - refactor script_task.rs fn handle_msgs (from servo:msgs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ea39b878ac619e68907e27c486660dd4bc3fc618 | diff --git a/script/script_task.rs b/script/script_task.rs
index e0b6025d2..d44bec8e2 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -533,35 +533,11 @@ impl ScriptTask {
// Process the gathered events.
for msg in sequential.into_iter() {
match msg {
- // ... | 1 | 73 | 29 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.