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 |
|---|---|---|---|---|---|---|---|
5608d79fec2d15f7342430d38c6affd08b077619 | Patrick Walton | 2014-10-13T21:54:41 | servo: Merge #3604 - layout: Make content of `display: inline-block; overflow: hidden` visible (from pcwalton:inline-block-overflow-hidden); r=glennw
Makes lots of GitHub appear.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: a92e55597e03d6a7b71e8178cf4a7a6d760f94be | diff --git a/layout/block.rs b/layout/block.rs
index b38595289..d36f4b873 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1097,7 +1097,8 @@ impl BlockFlow {
DList::new()));
}
- accumulator.finish(&mut *self, display_list);
+ accumulator.finis... | 3 | 18 | 14 |
f9fc20983e6fbafec87aaf9710c5ed25d713e739 | Simon Sapin | 2014-10-13T18:21:44 | servo: Merge #3635 - Rewrite the user-agent stysheet(s) (from SimonSapin:ua-stylesheet); r=pcwalton
Based on https://html.spec.whatwg.org/multipage/rendering.html rather than http://dev.w3.org/csswg/css2/grammar.html
Fixes #3629.
r? @pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 6e3c77638723... | diff --git a/style/selector_matching.rs b/style/selector_matching.rs
index 6c5ed1e10..39e0fb73e 100644
--- a/style/selector_matching.rs
+++ b/style/selector_matching.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/. */... | 2 | 58 | 23 |
c274952d325d8bae85a781b17815d06374708270 | Martin Robinson | 2014-10-13T16:48:45 | servo: Merge #3618 - Include leading margin in inline block size (from mrobinson:layer-sizing); r=pcwalton
Extra size from margins should be included in block size, so that
layers are large enough to include the entire block. This is typically
hidden by large tile sizes (512x512), but fitted tiles makes the issue
a lo... | diff --git a/layout/block.rs b/layout/block.rs
index 158a6e6bd..b38595289 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1041,8 +1041,7 @@ impl BlockFlow {
let info = PlacementInfo {
size: LogicalSize::new(
self.fragment.style.writing_mode,
- self.base.posit... | 1 | 10 | 9 |
17d157d4afb2609330bb16cbb9202ed6ee58a4e9 | Patrick Walton | 2014-10-13T05:45:45 | servo: Merge #3615 - layout: Make `box-sizing` only affect explicitly-specified or percentage sizes, not automatically computed ones (from pcwalton:box-sizing-fix); r=glennw
Improves GitHub significantly.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: c87f34f877ab4acfb19c48f924068ab1964d397c | diff --git a/layout/block.rs b/layout/block.rs
index ae4f8753d..158a6e6bd 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -26,7 +26,6 @@ use model::{Auto, IntrinsicISizes, MarginCollapseInfo, MarginsCollapse};
use model::{MarginsCollapseThrough, MaybeAuto, NoCollapsibleMargins, Specified, specified};
use model:... | 2 | 59 | 57 |
f28bce4a58f52670638048cc7f42f87802fe991f | Patrick Walton | 2014-10-11T02:27:39 | servo: Merge #3639 - Use Gecko's simpler Bloom filter instead of one based on hash (from pcwalton:rewrite-bloom-filter); r=zwarich
stretching.
This preserves the usage of the Bloom filter throughout style recalc,
but the implementation is rewritten. Provides a 15% improvement on
Guardians of the Galaxy.
Source-Repo:... | diff --git a/layout/css/matching.rs b/layout/css/matching.rs
index d618851a1..2c5207e7f 100644
--- a/layout/css/matching.rs
+++ b/layout/css/matching.rs
@@ -19,7 +19,6 @@ use servo_util::str::DOMString;
use std::mem;
use std::hash::{Hash, sip};
use std::slice::Items;
-use style;
use style::{After, Before, ComputedV... | 10 | 311 | 333 |
39347fab6e3d26b9c9c5568673d9067a81a24c09 | Clark Gaebel | 2014-10-10T23:08:49 | servo: Merge #3638 - Factors out DOM traversal, keeping the code in `parallel` free of traversal-specific logic (from cgaebel:parallel-dom-traversal)
Source-Repo: https://github.com/servo/servo
Source-Revision: be6cde93224c3ad266f5f98c4f4e670062146124 | diff --git a/layout/layout_task.rs b/layout/layout_task.rs
index b2653496a..d252b856f 100644
--- a/layout/layout_task.rs
+++ b/layout/layout_task.rs
@@ -16,6 +16,7 @@ use flow_ref::FlowRef;
use layout_debug;
use parallel::UnsafeFlow;
use parallel;
+use traversal;
use util::{LayoutDataAccess, LayoutDataWrapper, Opaq... | 5 | 501 | 403 |
24bce5ce3b74d60878f27ef62028ac61956f6d7a | Matt Brubeck | 2014-10-10T20:12:37 | servo: Merge #3563 - Move windowing code out of compositor, take 2. r=larsberg (from mbrubeck:app2)
Source-Repo: https://github.com/servo/servo
Source-Revision: 205067f10bc412608827e9a314a760acfb2ae15e | diff --git a/compositing/Cargo.toml b/compositing/Cargo.toml
index e306ae8fd..83a4bbee5 100644
--- a/compositing/Cargo.toml
+++ b/compositing/Cargo.toml
@@ -40,10 +40,6 @@ git = "https://github.com/servo/rust-azure"
[dependencies.geom]
git = "https://github.com/servo/rust-geom"
-[dependencies.glfw]
-git = "https://... | 7 | 22 | 761 |
d2c9e86589d4077ca5e8add6dd708a2034b54dd1 | Manish Goregaokar | 2014-10-09T22:00:34 | servo: Merge #3626 - Allow passing a method, request body, and headers to the pipeline in LoadUrlMsg (from Manishearth:form-prep); r=jdm
Framework for form submission
Source-Repo: https://github.com/servo/servo
Source-Revision: 2f9808e1306a6468dea0de8657a4fa5868e1a126 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 954fc072d..af19496be 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -39,7 +39,7 @@ use png;
use servo_msg::compositor_msg::{Blank, Epoch, FinishedLoading, IdleRenderState, LayerId};
use servo_msg::compositor_msg::{Read... | 9 | 74 | 35 |
a72baa5637184975c6cbf303f7fd611d69901dea | Patrick Walton | 2014-10-09T06:06:32 | servo: Merge #3600 - layout: Mark the styles of elements with pseudos as unshareable (from pcwalton:pseudo-unshareable); r=mbrubeck
Makes multiple `<br>` elements work, since those are implemented via
`before` pseudos.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 15b508ac10d0e98ba10474b6... | diff --git a/layout/css/matching.rs b/layout/css/matching.rs
index 2484127fb..4ff49518e 100644
--- a/layout/css/matching.rs
+++ b/layout/css/matching.rs
@@ -8,7 +8,8 @@ use css::node_style::StyledNode;
use construct::FlowConstructor;
use context::LayoutContext;
use util::{LayoutDataAccess, LayoutDataWrapper};
-use w... | 3 | 13 | 7 |
a89efd8e7426742a50d46af5da4ef268fad9f12f | Martin Robinson | 2014-10-08T23:27:33 | servo: Merge #3617 - Position layers using their absolute position (from mrobinson:layer-positioning); r=pcwalton
Layers are currently all children of the root layer, so instead of
using coordinates relative to the parent flow we should use coordinates
relative to the page.
Fixes #2061.
Source-Repo: https://github.c... | diff --git a/layout/block.rs b/layout/block.rs
index 9981771e8..eff98e273 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1251,8 +1251,9 @@ impl BlockFlow {
let layer_rect = self.base.position.union(&self.base.overflow);
let size = Size2D(layer_rect.size.inline.to_nearest_px() as uint,
... | 1 | 3 | 2 |
076ff3680f88fa6409f087b826307938528a6cbe | Tim Taubert | 2014-10-08T19:15:32 | servo: Merge #3577 - Use HashMap::find_with_or_insert_with in DocumentHelpers::register_named_element (fixes #3193) (from ttaubert:issue/3193-named-element-mangle); r=jdm
Should probably use HashMap::entry() but that doesn't seem to be available with servo's current rust snapshot.
r? @Ms2ger
Source-Repo: https://git... | diff --git a/script/dom/document.rs b/script/dom/document.rs
index e2c95bf56..e23130aae 100644
--- a/script/dom/document.rs
+++ b/script/dom/document.rs
@@ -241,11 +241,9 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
let mut idmap = self.idmap.borrow_mut();
- // FIXME https://github.com/... | 1 | 4 | 10 |
d39b828dd9049faae65dcd4d97d287f551235fbc | Robin Stocker | 2014-10-08T14:24:36 | servo: Merge #3612 - Allow to specify port with --devtools option (fixes #3597) (from robinst:devtools-port-option); r=jdm
Note that using `servo --devtools http://example.org` doesn't work. In
that case either the port must be specified or the option moved to the
end. But this is the same for other such options, e.g.... | diff --git a/devtools/lib.rs b/devtools/lib.rs
index 064ecd18f..e747bbf95 100644
--- a/devtools/lib.rs
+++ b/devtools/lib.rs
@@ -58,20 +58,19 @@ mod actors {
}
mod protocol;
-/// Spin up a devtools server that listens for connections. Defaults to port 6000.
-/// TODO: allow specifying a port
-pub fn start_server() ... | 2 | 17 | 13 |
6a9f26df4cc89fb9495c6b3d23f6ab17d2bcbe9b | Tim Taubert | 2014-10-08T09:12:34 | servo: Merge #3584 - Support [*|attr], attribute selectors in any namespace (fixes #1558) (from ttaubert:issue/1558-attr-ns-selectors); r=Manishearth
This implements basic support for attribute selectors with namespace prefixes. I would have added a more sophisticated test covering various selectors but it seems that ... | diff --git a/layout/wrapper.rs b/layout/wrapper.rs
index 40a779351..c9f9df91b 100644
--- a/layout/wrapper.rs
+++ b/layout/wrapper.rs
@@ -310,8 +310,10 @@ impl<'ln> TNode<'ln, LayoutElement<'ln>> for LayoutNode<'ln> {
element.get_attr(ns, name)
.map_or(false, |attr| test(attr))
... | 4 | 52 | 9 |
0d4816a8dcdd621e1c20b714ac25d67266df867a | Patrick Walton | 2014-10-08T07:15:36 | servo: Merge #3603 - layout: `white_space::pre` should not yield ignorable whitespace (from pcwalton:pre-ignorable-whitespace); r=mbrubeck
Improves the Google home page.
r? @mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: c628d11e6f8defbdaa4438f990b566272a3b0eff | diff --git a/layout/fragment.rs b/layout/fragment.rs
index dbf56c86b..244aa34b2 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1501,10 +1501,17 @@ impl Fragment {
}
}
- /// Returns true if this fragment is an unscanned text fragment that consists entirely of whitespace.
- pub fn is_w... | 2 | 13 | 5 |
5f4f730405e5c37f8fa033a2bcc10c8d8b9107e7 | Cameron Zwarich | 2014-10-07T10:57:29 | servo: Merge #3592 - Remove trailing whitespace (from zwarich:trailing-whitespace); r=Manishearth
The Mach test runner doesn't actually make these failures yet, which is
tracked by #3482.
Source-Repo: https://github.com/servo/servo
Source-Revision: ae946a9b762d66f01f669ff526eff5c0eaaa3404 | diff --git a/layout/fragment.rs b/layout/fragment.rs
index f0c87eae0..dbf56c86b 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1537,7 +1537,7 @@ impl Fragment {
match self.specific {
InlineAbsoluteHypotheticalFragment(ref mut info) => {
let block_flow = info.flow_ref... | 2 | 2 | 2 |
28d053029c06ff0024d62c520322964111187367 | Glenn Watson | 2014-10-07T05:21:32 | servo: Merge #3565 - Add cmd line option to set user agent. Improves github when used (from glennw:user-agent); r=mbrubeck
Fixes #3455
Source-Repo: https://github.com/servo/servo
Source-Revision: 3e8aa0592154a3ec5cc8e1167e17bd70b8c7144b | diff --git a/net/resource_task.rs b/net/resource_task.rs
index 1b6e17735..4a148876b 100644
--- a/net/resource_task.rs
+++ b/net/resource_task.rs
@@ -164,24 +164,26 @@ pub fn load_whole_resource(resource_task: &ResourceTask, url: Url)
pub type ResourceTask = Sender<ControlMsg>;
/// Create a ResourceTask
-pub fn new_... | 2 | 16 | 6 |
8418da81dae18afc2a3ef655a131f818af135078 | Cameron Zwarich | 2014-10-07T00:24:32 | servo: Merge #3593 - Cleanup some code formatting in compositing/compositor.rs (from zwarich:compositor-cleanup); r=mrobinson
Source-Repo: https://github.com/servo/servo
Source-Revision: 0549ed3c675d1cc7a8832128e90b7886e3c1710c | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index b751ef1d2..954fc072d 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -314,13 +314,11 @@ impl IOCompositor {
chan.send(Some(azure_hl::current_graphics_metadata()));
}
- ... | 1 | 2 | 4 |
a1ffc3be27b1b36b08ed674a99f5dd7c4e139838 | Ms2ger | 2014-10-06T18:21:30 | servo: Merge #3571 - Cleanup URL handling in ScriptTask::load a bit (from Ms2ger:rewrite-js-url); r=jdm
This should make it clearer that we always pass a URL to Document::new, and
avoids an unnecessary unwrap() call.
Source-Repo: https://github.com/servo/servo
Source-Revision: 06489fcc426ca65e807ea13d0d8fcf23bee3ca75 | diff --git a/script/script_task.rs b/script/script_task.rs
index 6520e0f25..f3168e3e3 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -732,16 +732,16 @@ impl ScriptTask {
self.compositor.dup(),
self.image_cache_task.clone()).root();
... | 1 | 7 | 7 |
2dd15c128c1041880fd4d07326c40892d44b9fec | Manish Goregaokar | 2014-10-06T17:51:32 | servo: Merge #3573 - Remove unused mutable variable (from Manishearth:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ae4c9be536bcf386db5b6ad2603ecf874566f6ef | diff --git a/layout/block.rs b/layout/block.rs
index 293d2fee4..9981771e8 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1337,7 +1337,7 @@ impl BlockFlow {
for (i, kid) in self.base.child_iter().enumerate() {
{
- let mut kid_base = flow::mut_base(kid);
+ let... | 1 | 1 | 1 |
0aaf8edc51b3a743ac98be8396bc25d7b7a84da6 | Ms2ger | 2014-10-06T17:24:31 | servo: Merge #3572 - Remove the managed_boxes feature (from Ms2ger:gc); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 8c858b4575b602f0392b2f07b2c53c44be4e2f45 | diff --git a/net/lib.rs b/net/lib.rs
index 32f78840d..0a963a8f4 100644
--- a/net/lib.rs
+++ b/net/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/. */
-# is now in the Rust core, so we can leverage that instead of writing an implementation.
Source-Repo: https:/... | diff --git a/devtools/actor.rs b/devtools/actor.rs
index 99222d3e1..792caa09d 100644
--- a/devtools/actor.rs
+++ b/devtools/actor.rs
@@ -4,9 +4,10 @@
/// General actor system infrastructure.
-use std::any::{Any, AnyRefExt, AnyMutRefExt};
+use std::any::{AnyPrivate, AnyRefExt, AnyMutRefExt};
use std::collections::... | 1 | 7 | 9 |
b737489c9a7c64da219943d9ea4f035f05a48f69 | Martin Robinson | 2014-10-01T18:06:28 | servo: Merge #3544 - No longer consider window size when scrolling (from mrobinson:simplify-scrolling); r=zwarich
Now that scrolling roots are properly sized, we can simply look at the
scrolling root layer size when deciding the extents of layer scrolling.
This simplifies things a bit and further codifies the current ... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index a747aeac9..b751ef1d2 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -564,13 +564,11 @@ impl IOCompositor {
layer_id: LayerId,
origin: TypedPoint2D<LayerPixel, f32>)
... | 3 | 14 | 24 |
ed438dca8315b74e029b042e72b79c6b911b07b5 | Josh Matthews | 2014-10-01T15:09:28 | servo: Merge #3531 - Implement MutNullableJS for mutable, nullable member pointers to DOM objects (from Ms2ger:MutNullableJS); r=Ms2ger
Extracted from #3527.
Source-Repo: https://github.com/servo/servo
Source-Revision: bae5440689c67f425f94ec27bf0f61ff955dc290 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index a0521b175..14f717f74 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -54,6 +54,7 @@ use layout_interface::TrustedNodeAddress;
use script_task::StackRoots;
use std::cell::{Cell, RefCell};
+use std::default::Default;
u... | 11 | 171 | 109 |
ed864b1e826fedb9369281ed4fedeafef0c167e8 | Cameron Zwarich | 2014-10-01T10:03:29 | servo: Merge #3542 - Remove extra lifetime parameters (from zwarich:more-jsref); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: a840fed78a493a481683ef73dae923190d87ba6c | diff --git a/script/dom/node.rs b/script/dom/node.rs
index 7e9ce5ec9..9c805b0bd 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -364,11 +364,11 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
}
}
-pub trait NodeHelpers<'m, 'n> {
- fn ancestors(self) -> AncestorIterator<'n>;
- fn children(... | 2 | 36 | 36 |
eb75f2d1270dd2b60524fec344cb884995025275 | Cameron Zwarich | 2014-10-01T08:51:27 | servo: Merge #3541 - Convert the NodeHelpers trait to use self methods (from zwarich:more-jsref); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: f73e5088219cd6deeea0d4f0612cad750fc532a9 | diff --git a/script/dom/node.rs b/script/dom/node.rs
index b533b5254..7e9ce5ec9 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -365,73 +365,73 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
}
pub trait NodeHelpers<'m, 'n> {
- fn ancestors(&self) -> AncestorIterator<'n>;
- fn children(&self)... | 1 | 94 | 94 |
d43045b65d09f630651dbad406345e30c8237e5c | Cameron Zwarich | 2014-10-01T04:36:28 | servo: Merge #3540 - Convert TNode / TElement to use self parameters rather than &self (from zwarich:more-jsref); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 09e9abc047e03b81b8a4aa90d13efa184d0a732f | diff --git a/layout/wrapper.rs b/layout/wrapper.rs
index 4fdec6123..18fd74fca 100644
--- a/layout/wrapper.rs
+++ b/layout/wrapper.rs
@@ -213,8 +213,14 @@ impl<'ln> LayoutNode<'ln> {
/// Returns an iterator over this node's children.
pub fn children(&self) -> LayoutNodeChildrenIterator<'ln> {
+ // FIX... | 4 | 140 | 81 |
aa3e9f77393042641450a0e708f4522ec02d098e | Martin Robinson | 2014-10-01T00:57:26 | servo: Merge #3537 - Use LayerPixel for Layer bounds and most arguments (from mrobinson:scale); r=zwarich
When interacting with Layers it is simpler to use LayerPixels, which
are unscaled pixels in the Layer coordinate system. This removes a lot
of room for error and makes things simpler.
Source-Repo: https://github.... | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 4103b0ca6..a747aeac9 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -29,7 +29,7 @@ use geom::rect::{Rect, TypedRect};
use geom::size::TypedSize2D;
use geom::scale_factor::ScaleFactor;
use gfx::render_task::{RenderChan... | 3 | 53 | 85 |
4d7c3aed03c4b0fdb086534ce339348ab96f0e52 | Cameron Zwarich | 2014-10-01T00:39:27 | servo: Merge #3536 - Convert a method from &JSRef to JSRef (from zwarich:more-jsref); r=Manishearth
This also removes the unnecessary formation of a trait object.
Source-Repo: https://github.com/servo/servo
Source-Revision: 93e259227a969dbea1319d4d3ce92bc5706c6b06 | diff --git a/script/dom/element.rs b/script/dom/element.rs
index bf5f9014f..c734ad891 100644
--- a/script/dom/element.rs
+++ b/script/dom/element.rs
@@ -238,7 +238,7 @@ impl LayoutElementHelpers for JS<Element> {
}
pub trait ElementHelpers {
- fn html_element_in_html_document(&self) -> bool;
+ fn html_element... | 2 | 4 | 5 |
5909974c64b1a194738cfd6838758c535ab7f1b7 | Glenn Watson | 2014-09-30T23:45:29 | servo: Merge #3535 - Refactor background image, fix fixed attachment. Improve acid2 (from glennw:fixed-bg); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: a63155b564b64825d292953983117c0df4b34e91 | diff --git a/layout/fragment.rs b/layout/fragment.rs
index b8006535e..59c256022 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -250,6 +250,18 @@ impl ImageFragmentInfo {
Some(max_size) => Au::min(size, max_size),
})
}
+
+ /// Tile an image
+ pub fn tile_image(position: &mut... | 1 | 59 | 69 |
61e424887f6742a00fe7e831244db919b41de426 | Martin Robinson | 2014-09-29T23:48:25 | servo: Merge #3526 - Mask root layer rectangles to their boundaries (from mrobinson:masks-to-bounds); r=zwarich
This prevents iframes contents from overflowing their root layers.
Source-Repo: https://github.com/servo/servo
Source-Revision: 4be0a07585b019d45dd83849818854566c5e118b | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 0eff68b45..4103b0ca6 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -456,6 +456,7 @@ impl IOCompositor {
match frame_rect {
Some(ref frame_rect) => {
+ *root_layer.masks_to_bounds.b... | 1 | 1 | 0 |
964748802443882db4bf18b660edcfeea7cac538 | Matt Brubeck | 2014-09-29T23:03:26 | servo: Merge #3525 - Pass a viewport to the rendering code (from mbrubeck:viewport); r=zwarich
Updates to the latest rust-layers and rust-geom to pick up
servo/rust-layers#114. r? @zwarich
Source-Repo: https://github.com/servo/servo
Source-Revision: 01b4100756ec0ae1ff61d0bee5ea065396bed855 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 2db05967a..0eff68b45 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -20,9 +20,9 @@ use windowing::{QuitWindowEvent, RefreshWindowEvent, ResizeWindowEvent, ScrollWi
use windowing::{WindowEvent, WindowMethods, WindowNavig... | 1 | 9 | 3 |
b812bb8392702ce2137b16362183612dfc3e45a0 | Glenn Watson | 2014-09-29T21:36:26 | servo: Merge #3523 - Add support for <super> and <sup> tags. Fixes equations on wikipedia (from glennw:wiki-equations); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b2ff320aecab80b06aeedad440c28b23b2dc3824 | diff --git a/layout/inline.rs b/layout/inline.rs
index f3d34d45f..a683c8574 100644
--- a/layout/inline.rs
+++ b/layout/inline.rs
@@ -35,6 +35,10 @@ use style::computed_values::{text_align, vertical_align, white_space};
use style::ComputedValues;
use sync::Arc;
+// From gfxFontConstants.h in Firefox
+static FONT_SUB... | 1 | 12 | 15 |
9e9dfffd53d8b3236dc115f238e7247f779a71c6 | Bruno de Oliveira Abinader | 2014-09-29T18:27:26 | servo: Merge #3491 - CSS selector :enabled no longer matches Anchor, Area & Link elements (from brunoabinader:css-selector-enabled-remove-anchor-area-link-elems); r=Ms2ger
HTML spec has been modified [1] to disable support for :enabled CSS
selector on Anchor, Area & Link elements, after discussion on W3C
Bugzilla [2].... | diff --git a/script/dom/htmlanchorelement.rs b/script/dom/htmlanchorelement.rs
index c73cb01a8..72a473aa4 100644
--- a/script/dom/htmlanchorelement.rs
+++ b/script/dom/htmlanchorelement.rs
@@ -19,7 +19,6 @@ use dom::htmlelement::HTMLElement;
use dom::node::{Node, NodeHelpers, ElementNodeTypeId};
use dom::virtualmetho... | 4 | 1 | 87 |
93889f26c836410929f040f2d9cf56962b8b5d52 | Ms2ger | 2014-09-29T15:57:27 | servo: Merge #3522 - Don't move the data when extracting the bytes in XMLHttpRequest::Send (from Ms2ger:xhr-send-uaf); r=SimonSapin
The data is used later to set the Content-Type header. Current rustc
(4d2af3861) does not detect this use-after-move, but treats the later use as
if the data was None. It will, however, d... | diff --git a/script/dom/xmlhttprequest.rs b/script/dom/xmlhttprequest.rs
index 4f310a894..49a8b8613 100644
--- a/script/dom/xmlhttprequest.rs
+++ b/script/dom/xmlhttprequest.rs
@@ -450,7 +450,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
Get | Head => None, // Step 3
_ =>... | 1 | 1 | 1 |
462e1cf66d32b83c99ace7b142695eaa862a86cf | Glenn Watson | 2014-09-29T01:42:27 | servo: Merge #3517 - Revert "Set default resolution to 1280x1024 now that reftests render to (from glennw:revert-res-change); r=metajack
...FBO."
This reverts commit c74798bb6bcb98d2d6af998e2ab0f08e79097147.
Source-Repo: https://github.com/servo/servo
Source-Revision: 132ade0fce514ffeb56f34669967913d9015f035 | diff --git a/util/opts.rs b/util/opts.rs
index 57e7b9745..677adba25 100644
--- a/util/opts.rs
+++ b/util/opts.rs
@@ -125,7 +125,7 @@ pub fn from_cmdline_args(args: &[String]) -> Option<Opts> {
getopts::optflag("", "disable-text-aa", "Disable antialiasing for text rendering."),
getopts::optflag("", "tr... | 1 | 2 | 2 |
5c483d994ec98249368a7bdd97b9371dd5b37218 | Glenn Watson | 2014-09-28T23:42:31 | servo: Merge #3513 - Set default resolution to 1280x1024 now that reftests render to FBO (from glennw:default-res)
Reviewed-by: metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 276ca5f2e976fa6c9ce56d98ec2b70efd9c54cdd | diff --git a/util/opts.rs b/util/opts.rs
index 677adba25..57e7b9745 100644
--- a/util/opts.rs
+++ b/util/opts.rs
@@ -125,7 +125,7 @@ pub fn from_cmdline_args(args: &[String]) -> Option<Opts> {
getopts::optflag("", "disable-text-aa", "Disable antialiasing for text rendering."),
getopts::optflag("", "tr... | 1 | 2 | 2 |
4f39a9bd8aec8c2629f05ab493ace93faaabedfb | Ms2ger | 2014-09-28T13:45:27 | servo: Merge #3509 - Fix indentation in is_htmliframeelement (from Ms2ger:indentation-iframe)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 6184c13f9515caa2277c5ad4e997824d8cee171e | diff --git a/script/dom/htmliframeelement.rs b/script/dom/htmliframeelement.rs
index 7fe653e99..828ba9784 100644
--- a/script/dom/htmliframeelement.rs
+++ b/script/dom/htmliframeelement.rs
@@ -51,7 +51,7 @@ pub struct HTMLIFrameElement {
impl HTMLIFrameElementDerived for EventTarget {
fn is_htmliframeelement(&s... | 1 | 1 | 1 |
1657a8acc32692d9af3e43094900754789d53247 | Rohan Prinja | 2014-09-28T05:21:28 | servo: Merge #3508 - trace keys as well (from wenderen:JSTraceable.key)
Reviewed-by: Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 42205675b31db21b1b8ef04bf4def912ecac69b5 | diff --git a/script/dom/bindings/trace.rs b/script/dom/bindings/trace.rs
index 5f2d9e524..0d87892ae 100644
--- a/script/dom/bindings/trace.rs
+++ b/script/dom/bindings/trace.rs
@@ -211,10 +211,11 @@ impl<T: JSTraceable> JSTraceable for Option<T> {
}
}
-impl<K: Eq+Hash, V: JSTraceable> JSTraceable for HashMap<K,... | 1 | 2 | 1 |
9d3b7c2119e9b0cdede99c40fa6bde3fe4e9e322 | Cameron Zwarich | 2014-09-27T23:09:28 | servo: Merge #3501 - Remove the 'static lifetime parameters from TElement methods (from zwarich:telement-lifetimes)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c9c8d63727560ab88a8b739f5ac305b8a02410d2 | diff --git a/layout/construct.rs b/layout/construct.rs
index a95caed9c..30df9591f 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -1077,9 +1077,9 @@ impl<'ln> NodeUtils for ThreadSafeLayoutNode<'ln> {
}
/// Methods for interacting with HTMLObjectElement nodes
-trait ObjectElement {
+trait ObjectElemen... | 6 | 52 | 46 |
9d5cd55e6846eb4736da20033eb28d2bbeecce61 | Ms2ger | 2014-09-27T19:39:27 | servo: Merge #3503 - Simplify the Page URL handling in handle_resize_inactive_msg (from Ms2ger:page-url)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1b5fac5bdeb855a0c41ca3dce82db70b19c094aa | diff --git a/script/script_task.rs b/script/script_task.rs
index 33f7c8eb7..b0c40c6ee 100644
--- a/script/script_task.rs
+++ b/script/script_task.rs
@@ -651,10 +651,9 @@ impl ScriptTask {
let page = page.find(id).expect("Received resize message for PipelineId not associated
with a page in the page... | 1 | 3 | 4 |
5556794d327078c3be51d57038f31686874a7b6b | Patrick Walton | 2014-09-27T19:12:30 | servo: Merge #3498 - Stop double-counting stuff in inline-block (from pcwalton:border-box-double-counting)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: b7345796bc696bd0e7bc00384a71a30c676a3456 | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 455941e40..35537fae4 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -706,6 +706,11 @@ impl Fragment {
/// Returns true if this element can be split. This is true for text fragments.
pub fn can_split(&self) -> bool {
+ self.is_sca... | 1 | 81 | 45 |
017de21af1f986ad1fed631e0490906ddcac1039 | Cameron Zwarich | 2014-09-27T18:48:30 | servo: Merge #3497 - Add an extended_deref method to JSRef (from zwarich:extended-deref)
Reviewed-by: Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: c10948736f1f7a8e6d6dcb1987a92818fb1f4003 | diff --git a/script/dom/attr.rs b/script/dom/attr.rs
index fe1a57c44..eaab52635 100644
--- a/script/dom/attr.rs
+++ b/script/dom/attr.rs
@@ -147,14 +147,14 @@ impl<'a> AttrMethods for JSRef<'a, Attr> {
}
}
-pub trait AttrHelpers {
+pub trait AttrHelpers<'a> {
fn set_value(self, set_type: AttrSettingType, v... | 3 | 21 | 13 |
db8f4d2a905d7fa7f3ffe32c19fdfe37fe799faf | Glenn Watson | 2014-09-27T18:21:31 | servo: Merge #3474 - When rendering to PNG, draw to an FBO rather than default framebuffer (from glennw:reftest-fbo)
Reviewed-by: mrobinson
Source-Repo: https://github.com/servo/servo
Source-Revision: 6fb8eb32f2fb071c1e656542960d9dda7d86f69d | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index d8313c6cb..2db05967a 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -943,6 +943,31 @@ impl IOCompositor {
}
fn composite(&mut self) {
+ let output_image = self.opts.output_file.is_some() &&
+ ... | 1 | 32 | 9 |
5acda633ec7f6b5ea1e529348df6a92d81bd735d | Glenn Watson | 2014-09-27T05:09:31 | servo: Merge #3500 - Fix some mutable variable warnings (from glennw:warning-fix)
Reviewed-by: pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: f7e5d295188a885027ff8cd5a6d7421581050ccf | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 8e51058a2..455941e40 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -540,7 +540,7 @@ impl Fragment {
/// `border_padding`. Other consumers of this information should simply consult that field.
#[inline]
fn border_width(&self) -> Logi... | 1 | 2 | 2 |
861b8737a5122ea49bd725f5535b27acb6c11900 | Patrick Walton | 2014-09-27T04:24:32 | servo: Merge #3492 - layout: Support any `display` property in generated content, and allow (from pcwalton:clear-generated-content-table)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 33e2a7b3625c82e83c7767e81266c2a23f509bed | diff --git a/layout/construct.rs b/layout/construct.rs
index 3d023c009..a95caed9c 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -45,7 +45,7 @@ use table_cell::TableCellFlow;
use text::TextRunScanner;
use util::{LayoutDataAccess, OpaqueNodeMethods};
use wrapper::{PostorderNodeMutTraversal, TLayoutNode... | 4 | 67 | 50 |
ee2dcc13ace76b1842a8ea8493c84d9d4cdfb97b | Cameron Zwarich | 2014-09-27T02:24:33 | servo: Merge #3496 - Convert &JSRef -> JSRef in DisabledStateHelpers (from zwarich:disabled-state-helpers-jsref)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a35212410ae78a19db99d284d63a00d1a72dbd79 | diff --git a/script/dom/node.rs b/script/dom/node.rs
index 06c88c00d..b9436a0d1 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -2091,17 +2091,17 @@ impl<'a> style::TNode<JSRef<'a, Element>> for JSRef<'a, Node> {
}
pub trait DisabledStateHelpers {
- fn check_ancestors_disabled_state_for_form_control(... | 1 | 8 | 8 |
b5a03b992a80582906dd12222d57ef4cd454523a | Cameron Zwarich | 2014-09-27T01:57:33 | servo: Merge #3493 - Improve the correctness of Root lifetimes (from zwarich:root-lifetimes)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 86eec63a02161de84f2404ff2292d3a8d1273784 | diff --git a/script/dom/bindings/js.rs b/script/dom/bindings/js.rs
index 3fff9445c..e91f5b9fd 100644
--- a/script/dom/bindings/js.rs
+++ b/script/dom/bindings/js.rs
@@ -375,7 +375,7 @@ impl RootCollection {
/// Create a new stack-bounded root that will not outlive this collection
#[allow(unrooted_must_root)... | 1 | 4 | 4 |
ed0e347fcad0de4603c3362cb9e0d200188e8a66 | Gilles Leblanc | 2014-09-27T01:00:35 | servo: Merge #3432 - Handle dynamic addition of attributes (from gilles-leblanc:issue-3361)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1e5770a138b39683e28763b878b354c317bc0322 | diff --git a/script/dom/htmllinkelement.rs b/script/dom/htmllinkelement.rs
index 94a0b7ace..58dcf5fea 100644
--- a/script/dom/htmllinkelement.rs
+++ b/script/dom/htmllinkelement.rs
@@ -48,6 +48,21 @@ impl HTMLLinkElement {
}
}
+fn get_attr(element: JSRef<Element>, name: &str) -> Option<String> {
+ let elem =... | 1 | 33 | 19 |
9d86f754d0b04bc83d23ff9aad74af80d20290e2 | Cameron Zwarich | 2014-09-27T00:36:38 | servo: Merge #3495 - Convert &JSRef -> JSRef for the PrivateNodeHelpers trait (from zwarich:private-node-helpers-jsref)
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1da014a13d4c8dee3d580cee3d75e1c879f37d3e | diff --git a/script/dom/node.rs b/script/dom/node.rs
index 1a0c17ef6..06c88c00d 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -248,17 +248,17 @@ pub enum NodeTypeId {
}
trait PrivateNodeHelpers {
- fn node_inserted(&self);
- fn node_removed(&self, parent_in_doc: bool);
- fn add_child(&self, n... | 1 | 14 | 14 |
ca7399d66ba2e88ec6eaa2914e9f59e975130365 | Patrick Walton | 2014-09-26T07:42:27 | servo: Merge #3483 - layout: Block formatting contexts should contain all their floats (from pcwalton:block-formatting-contexts-containing-floats)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: ab17d31bbf8c6884f858381f3d5b7e62c4de87c6 | diff --git a/layout/block.rs b/layout/block.rs
index ed442ece5..c92c79122 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -978,13 +978,15 @@ impl BlockFlow {
// root element as having `overflow: scroll` and use the layers-based scrolling
// infrastructure to make it scrollable.
let mut ... | 1 | 4 | 2 |
c5279bc5d329598c75c233dc508ba5aea53cc3ee | Patrick Walton | 2014-09-26T01:24:30 | servo: Merge #3467 - layout: Enhance the heuristic that guesses the inline size of block formatting contexts (from pcwalton:enhance-block-formatting-context-guess)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 20f5fdd000408867ac2d3a90ad9a8b55cfb8bc9e | diff --git a/layout/block.rs b/layout/block.rs
index 64056147b..ed442ece5 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -510,9 +510,13 @@ pub struct BlockFlow {
/// Static y offset of an absolute flow from its CB.
pub static_b_offset: Au,
- /// The inline-size of the last float prior to this bloc... | 1 | 64 | 30 |
498615a2d0c3f761876bbb96bed73141aa9e75be | Glenn Watson | 2014-09-26T00:27:38 | servo: Merge #3398 - Allow resolution to be configured on command line. Default to 1280x1024 (from glennw:config-res)
Reviewed-by: SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 177127e5974e30b35632b206f995659e8b663803 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index 730db1519..d8313c6cb 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -143,7 +143,15 @@ impl IOCompositor {
constellation_chan: ConstellationChan,
time_profiler_chan: TimeProfilerChan,
... | 6 | 36 | 9 |
8ee6e4ff914a2254cc915972b463392bdc2327f2 | Patrick Walton | 2014-09-25T23:48:35 | servo: Merge #3472 - layout: Unify the block-size computation for blocks and floats (from pcwalton:unify-block-and-float-layout)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 9fb47b7636ca79c64acbf73a2c55cc6bf5cd4917 | diff --git a/layout/block.rs b/layout/block.rs
index 8a935a203..64056147b 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -38,7 +38,6 @@ use gfx::display_list::{RootOfStackingContextLevel};
use gfx::render_task::RenderLayer;
use servo_msg::compositor_msg::{FixedPosition, LayerId, Scrollable};
use servo_util::g... | 2 | 64 | 139 |
a614122ccbf3c4658491d13c8a7609f9adbc796f | Cameron Zwarich | 2014-09-25T23:24:33 | servo: Merge #3478 - Remove use of deprecated get_mut_ref (from zwarich:get-mut-ref)
Reviewed-by: metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: d9c13352c1ecfefc3a5f07871421c5d24f02c7e7 | diff --git a/layout/table_wrapper.rs b/layout/table_wrapper.rs
index eb08d3aa0..669200e9a 100644
--- a/layout/table_wrapper.rs
+++ b/layout/table_wrapper.rs
@@ -282,7 +282,7 @@ impl Flow for TableWrapperFlow {
// Now compute the real value.
let containing_block_inline_size = self.block_flow.base.posit... | 1 | 1 | 1 |
aaa5dc9f03dec5ebd71896c477aadd53ce8adb29 | Cameron Zwarich | 2014-09-25T23:00:34 | servo: Merge #3480 - Fix trailing whitespace tidy errors (from zwarich:trailing-whitespace)
Reviewed-by: larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: c2d6d8084c7afc2b865a09cb4847fb1a815ef607 | diff --git a/layout/table.rs b/layout/table.rs
index d5d327b5d..d48b845bc 100644
--- a/layout/table.rs
+++ b/layout/table.rs
@@ -295,7 +295,7 @@ impl Flow for TableFlow {
_ => {}
}
- // As tables are always wrapped inside a table wrapper, they are never impacted by floats.
+ // As... | 4 | 8 | 5 |
2d00fbb4eda2df4987cb852ee0b0c4ea5ad01dc0 | Cameron Zwarich | 2014-09-25T20:47:19 | servo: Merge #3479 - Add the MPL back to components/plugs/lints.rs; r=Manishearth (from zwarich:lints-license)
Source-Repo: https://github.com/servo/servo
Source-Revision: b3b9051ebc65132a9454041040cd3f5ff138de6e | diff --git a/plugins/lints.rs b/plugins/lints.rs
index 4a1bbb85f..e0278906a 100644
--- a/plugins/lints.rs
+++ b/plugins/lints.rs
@@ -1,3 +1,7 @@
+/* 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 obtain one at... | 1 | 4 | 0 |
faf930b4cdd6583107d6123b55a3098983358b6e | Patrick Walton | 2014-09-25T16:36:33 | servo: Merge #3434 - layout: Float table wrappers directly instead of generating a block (from pcwalton:directly-floated-tables)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 1fba32af9ff68db73768b4732d003ea7aad09b28 | diff --git a/layout/block.rs b/layout/block.rs
index ca61c3c43..8a935a203 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -555,6 +555,21 @@ impl BlockFlow {
}
}
+ pub fn float_from_node_and_fragment(node: &ThreadSafeLayoutNode,
+ fragment: Fragment,
+ ... | 6 | 217 | 209 |
8905b12ebd46040db619c4ad3821b583f8ff5c5d | Martin Robinson | 2014-09-25T15:41:51 | servo: Merge #3464 - Allow iframes to scroll their contents (from mrobinson:scroll_offset)
Source-Repo: https://github.com/servo/servo
Source-Revision: 0951936abbe4ee4c71b76c14fe073d09236f89fc | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index cec9c2b74..730db1519 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -9,6 +9,7 @@ use compositor_task::{SetLayerOrigin, Paint, ScrollFragmentPoint, LoadComplete};
use compositor_task::{ShutdownComplete, ChangeRenderState... | 3 | 93 | 41 |
5ae1355c6ccae32aad0d45036d53c487e32f29b0 | Patrick Walton | 2014-09-25T06:26:42 | servo: Merge #3475 - layout: Consider relatively positioned blocks as possible block (from pcwalton:block-formatting-context-fixes)
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: e9a7b44f688dacd46ce4971a2a79e42d6a80a8fe | diff --git a/layout/block.rs b/layout/block.rs
index 0d8d4b290..ca61c3c43 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -865,9 +865,9 @@ impl BlockFlow {
margin_collapse_info.current_float_ceiling();
propagate_layer_flag_from_child(&mut layers_needed_for_descendants, kid);
... | 1 | 26 | 17 |
5f98629ce3a21f8d79c870df941e69fe652cd7e7 | Ms2ger | 2014-09-24T14:30:13 | servo: Merge #3465 - Handle null strings in Namespace::new (from Ms2ger:ns)
Source-Repo: https://github.com/servo/servo
Source-Revision: c7a575e79338c84652cc0d0cb2f85b1c438819b2 | diff --git a/script/dom/document.rs b/script/dom/document.rs
index 8ce297164..722609ebf 100644
--- a/script/dom/document.rs
+++ b/script/dom/document.rs
@@ -57,7 +57,7 @@ use layout_interface::{DocumentDamageLevel, ContentChangedDocumentDamage};
use servo_util::atom::Atom;
use servo_util::namespace;
use servo_util::... | 5 | 21 | 24 |
3c26f65cc1f2ec59d4e458e034cf1311c4e19db6 | Ms2ger | 2014-09-24T02:40:17 | servo: Merge #3466 - Remove redundant into_string() calls.; r=jdm (from Ms2ger:into_string)
Source-Repo: https://github.com/servo/servo
Source-Revision: 3b842c4f064607575f5c83b6f7ca5fa6492752ec | diff --git a/gfx/text/util.rs b/gfx/text/util.rs
index c5059bbff..9aee736df 100644
--- a/gfx/text/util.rs
+++ b/gfx/text/util.rs
@@ -82,7 +82,7 @@ pub fn transform_text(text: &str, mode: CompressionMode,
}
};
- return (out_str.into_string(), out_whitespace);
+ return (out_str, out_whitespace);
... | 2 | 2 | 2 |
7ab0af865e1c612cdc83be0c9de93e229ac04003 | Ms2ger | 2014-09-23T20:34:54 | servo: Merge #3462 - Avoid an unnecessary string allocation in allow_cross_origin_request; r=jdm (from Ms2ger:as-slice)
Source-Repo: https://github.com/servo/servo
Source-Revision: 178843456fedc20029c9c6d0c20071fea31c73e1 | diff --git a/script/cors.rs b/script/cors.rs
index a4702eb21..5bcb737a5 100644
--- a/script/cors.rs
+++ b/script/cors.rs
@@ -404,7 +404,7 @@ pub fn allow_cross_origin_request(req: &CORSRequest, headers: &ResponseHeaderCol
match allow_cross_origin_request {
Some(h) => {
let origin_str = h.head... | 1 | 1 | 1 |
5c6f9478ae4d3f275edef96b65aeac25902a2fb2 | Matt Brubeck | 2014-09-23T20:20:44 | servo: Merge #3461 - Fix misc warnings in devtools crates. r=jdm (from mbrubeck:warnings)
Source-Repo: https://github.com/servo/servo
Source-Revision: 2886fccb3eed9fa9f0d07e585d73fb74f9e8c274 | diff --git a/devtools/actor.rs b/devtools/actor.rs
index d9f214c79..8a2d0be8c 100644
--- a/devtools/actor.rs
+++ b/devtools/actor.rs
@@ -136,7 +136,7 @@ impl ActorRegistry {
// fails for unknown reasons.
/*let actor: &Actor+Send+Sized = *self.actors.find(&name.to_string()).unwrap();
(ac... | 4 | 8 | 4 |
953b9064275075d8b55f7f514aeed6465a80f368 | Glenn Watson | 2014-09-23T14:47:29 | servo: Merge #3460 - Fix inline context padding on inline-block (from glennw:inline-block-padding)
Source-Repo: https://github.com/servo/servo
Source-Revision: 4546d5d23caa3f459b75e9a0bf9e91a3376dc197 | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 1281775ee..04cbaccad 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1178,9 +1178,9 @@ impl Fragment {
-> IntrinsicISizes {
let mut result = self.style_specified_intrinsic_inline_size();
- match self.s... | 1 | 17 | 13 |
c5fef839f8d70333893227b3f1b59cc96c8d0059 | Manish Goregaokar | 2014-09-23T12:53:37 | servo: Merge #3435 - Reorganize macros crate; r=jdm (from Manishearth:macro_reorg)
Source-Repo: https://github.com/servo/servo
Source-Revision: 27f3bcd7183d836bd454e687706b4e76d6d3b312 | diff --git a/gfx/Cargo.toml b/gfx/Cargo.toml
index b1b6faaa7..ad62df8fd 100644
--- a/gfx/Cargo.toml
+++ b/gfx/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["The Servo Project Developers"]
name = "gfx"
path = "lib.rs"
-[dependencies.macros]
-path = "../macros"
+[dependencies.plugins]
+path = "../plugins"
[dependencies.ne... | 11 | 76 | 65 |
e43941999ff0d60a4941eb3ffd41e57f106ee4b9 | Patrick Walton | 2014-09-23T03:06:18 | servo: Merge #3457 - layout: Adjust the position of block formatting contexts based on float placement (from pcwalton:block-formatting-contexts)
Source-Repo: https://github.com/servo/servo
Source-Revision: 6177a3bdcca974d5070b0ecab0973d42963946ec | diff --git a/layout/block.rs b/layout/block.rs
index a75a2e482..0d8d4b290 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -16,7 +16,7 @@
use construct::FlowConstructor;
use context::LayoutContext;
-use floats::{ClearBoth, ClearLeft, ClearRight, FloatKind, Floats, PlacementInfo};
+use floats::{ClearBoth, Clear... | 2 | 43 | 3 |
7a0422ec8d971df0346ca7cb86e04b6efd3b8c80 | Patrick Walton | 2014-09-23T00:36:36 | servo: Merge #3454 - layout: Translate floats when clearing non-floated blocks (from pcwalton:float-clear-bug)
Source-Repo: https://github.com/servo/servo
Source-Revision: a6ff0479d9b8ea6a35570765748a6fc86d0dcb47 | diff --git a/layout/block.rs b/layout/block.rs
index fedca6509..a75a2e482 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -906,7 +906,7 @@ impl BlockFlow {
clear::right => floats.clearance(ClearRight),
clear::both => floats.clearance(ClearBoth),
};
- cur_b... | 1 | 1 | 1 |
a9eca3530899cf70f245098c4e00d4fc74c87bb1 | Glenn Watson | 2014-09-22T04:53:19 | servo: Merge #3449 - Add support for min-width and max-width to images (from glennw:img-min-max)
Source-Repo: https://github.com/servo/servo
Source-Revision: 2c3d3b007554990359a06b90ca5380bf466eb308 | diff --git a/layout/fragment.rs b/layout/fragment.rs
index c695c038c..1281775ee 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -52,7 +52,9 @@ use std::from_str::FromStr;
use std::mem;
use std::num::Zero;
use style::{ComputedValues, TElement, TNode, cascade_anonymous, RGBA};
-use style::computed_values::... | 1 | 60 | 20 |
d8551835188114b681905ffa5de575bb7fd9d8e5 | Tetsuharu OHZEKI | 2014-09-21T14:17:46 | servo: Merge #3442 - Make Document.idmap key to Atom; r=Ms2ger (from saneyuki:atom)
Source-Repo: https://github.com/servo/servo
Source-Revision: 61e17656cd17ea9bc1af1226376d9e8f2c24a8ad | diff --git a/script/dom/document.rs b/script/dom/document.rs
index 265131f00..8ce297164 100644
--- a/script/dom/document.rs
+++ b/script/dom/document.rs
@@ -54,6 +54,7 @@ use dom::window::{Window, WindowHelpers};
use html::hubbub_html_parser::build_element_from_tag;
use hubbub::hubbub::{QuirksMode, NoQuirks, LimitedQ... | 2 | 14 | 8 |
613a2a443d57d1991cb013a5b7b5e3465cf98036 | Simon Sapin | 2014-09-21T10:00:34 | servo: Merge #3437 - Use HTTPS for Cargo dependencies (from SimonSapin:https-deps)
Source-Repo: https://github.com/servo/servo
Source-Revision: c228b81ca8e851b3fd4e161ea83fc1d0913d516d | diff --git a/gfx/Cargo.toml b/gfx/Cargo.toml
index fdac5770f..b1b6faaa7 100644
--- a/gfx/Cargo.toml
+++ b/gfx/Cargo.toml
@@ -51,12 +51,12 @@ git = "https://github.com/servo/rust-fontconfig"
git = "https://github.com/servo/rust-freetype"
[dependencies.core_foundation]
-git = "http://github.com/servo/rust-core-founda... | 2 | 9 | 9 |
977ae13d92e263cf4bea9d8e5a964672d9a1b07e | Adenilson Cavalcanti | 2014-09-20T17:53:22 | servo: Merge #3428 - Move is_void() Element method together with the other struct methods (from Adenilson:moveIsVoidElement01)
Source-Repo: https://github.com/servo/servo
Source-Revision: 2adc594e5d8babaadbe1a4e05a8f7d808313728f | diff --git a/script/dom/element.rs b/script/dom/element.rs
index 923a587d5..143f025fc 100644
--- a/script/dom/element.rs
+++ b/script/dom/element.rs
@@ -242,6 +242,7 @@ pub trait ElementHelpers {
fn get_local_name<'a>(&'a self) -> &'a Atom;
fn get_namespace<'a>(&'a self) -> &'a Namespace;
fn summarize(&s... | 3 | 18 | 19 |
65c12c13b6fa6c3f504b42ac75668425cf0ba207 | Gilles Leblanc | 2014-09-20T13:12:04 | servo: Merge #3400 - Share code between Navigator and WorkerNavigator (from gilles-leblanc:issue-3279)
Source-Repo: https://github.com/servo/servo
Source-Revision: 249638da8f01a66b98be857fba7755c8625480f5 | diff --git a/script/dom/location.rs b/script/dom/location.rs
index 4a435a26b..8217c91e4 100644
--- a/script/dom/location.rs
+++ b/script/dom/location.rs
@@ -7,6 +7,7 @@ use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::global::Window;
use dom::bindings::js::{JSRef, Temporary};... | 7 | 81 | 32 |
80a057ad362d684caa97600cdaa3be2149a5c170 | Tetsuharu OHZEKI | 2014-09-20T07:40:06 | servo: Merge #3418 - Replace manual Encodable implementation for LayoutDataRef with Untraceable (from saneyuki:untrace)
Source-Repo: https://github.com/servo/servo
Source-Revision: de67710934ac89de0cf21911dc57dcda7cb0fae1 | diff --git a/layout/util.rs b/layout/util.rs
index a0e466e88..fd8cb10cd 100644
--- a/layout/util.rs
+++ b/layout/util.rs
@@ -77,20 +77,20 @@ pub trait LayoutDataAccess {
impl<'ln> LayoutDataAccess for LayoutNode<'ln> {
#[inline(always)]
unsafe fn borrow_layout_data_unchecked(&self) -> *const Option<LayoutDat... | 8 | 23 | 17 |
a3b0adbb438eb1a73de6b96bd849cb7115571f1f | Patrick Walton | 2014-09-20T06:05:55 | servo: Merge #3430 - layout: Make percentage heights propagate through inline flows (from pcwalton:inline-block-percentage-height)
Source-Repo: https://github.com/servo/servo
Source-Revision: c51b8a07acbbfa8539b9234c7717a9af53a9e2b8 | diff --git a/layout/block.rs b/layout/block.rs
index ad5eb03cc..ba8dfda87 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -513,10 +513,6 @@ pub struct BlockFlow {
/// block formatting contexts.
previous_float_inline_size: Option<Au>,
- /// The block-size of the block container of this block, if it ... | 3 | 27 | 19 |
96375e0fdcfe3fbfb883f75f435f63b697a7d363 | Glenn Watson | 2014-09-20T02:50:47 | servo: Merge #3420 - Adds support for table layout trace and updates viewer for tables (from glennw:table-debug)
Source-Repo: https://github.com/servo/servo
Source-Revision: ccda8f204acb014387e92f1ecd47355e9e45ed89 | diff --git a/layout/block.rs b/layout/block.rs
index c52741215..ad5eb03cc 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1481,7 +1481,7 @@ impl Flow for BlockFlow {
///
/// TODO(pcwalton): Inline blocks.
fn bubble_inline_sizes(&mut self, _: &LayoutContext) {
- let _scope = layout_debug_sco... | 8 | 96 | 2 |
234c5f2df566fa8a5a5cde3261b61155a8580028 | Clark Gaebel | 2014-09-20T00:19:42 | servo: Merge #3427 - added valid license to tid.rs (from cgaebel:add-license-to-tid)
Source-Repo: https://github.com/servo/servo
Source-Revision: 877de7f694dddd02fcc855a571f99e7c46f7501d | diff --git a/util/tid.rs b/util/tid.rs
index fdd9a775b..22fc3402d 100644
--- a/util/tid.rs
+++ b/util/tid.rs
@@ -1,3 +1,7 @@
+/* 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 obtain one at http://mozilla.org/... | 1 | 4 | 0 |
29865bb1f6c1f524ba5cc03bae0f3e9d334d7048 | Patrick Walton | 2014-09-19T19:27:32 | servo: Merge #3399 - Handle generated content with `display: block` correctly during flow (from pcwalton:fix-generated-content-iteration)
Source-Repo: https://github.com/servo/servo
Source-Revision: b8f34bbc5170f78e4939b1d647f8d8498e3c2fb6 | diff --git a/layout/construct.rs b/layout/construct.rs
index f730a08bf..0cf5adf32 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -212,14 +212,24 @@ impl<'a> FlowConstructor<'a> {
Some(url) => {
// FIXME(pcwalton): The fact that image fragments store the cache within them mak... | 3 | 55 | 19 |
0209c090f9d4d60b74cfd1cf0fff08572bb9cb9c | Patrick Walton | 2014-09-19T14:51:02 | servo: Merge #3401 - layout: Remove `layout/extra.rs` (from pcwalton:refactor-layout)
Source-Repo: https://github.com/servo/servo
Source-Revision: f139eb51763091165136c88a7b9931fc09ebe2cc | diff --git a/layout/construct.rs b/layout/construct.rs
index a76034c02..f730a08bf 100644
--- a/layout/construct.rs
+++ b/layout/construct.rs
@@ -73,7 +73,7 @@ pub enum ConstructionResult {
/// This node contributed a flow at the proper position in the tree.
/// Nothing more needs to be done for this node. I... | 8 | 117 | 129 |
fc3524cd803300cd5c2588d7ab5a18bb932b1621 | Glenn Watson | 2014-09-19T09:20:27 | servo: Merge #3419 - Fix img with display: block. Fixes text/image overflow on wikipedia (from glennw:img-block)
Source-Repo: https://github.com/servo/servo
Source-Revision: 2652d223f50d53ee5a8a07ff4a3d6a25b510d1f1 | diff --git a/layout/block.rs b/layout/block.rs
index d3211d89c..f803580bf 100644
--- a/layout/block.rs
+++ b/layout/block.rs
@@ -1646,8 +1646,12 @@ impl Flow for BlockFlow {
fn assign_block_size<'a>(&mut self, ctx: &'a LayoutContext<'a>) {
if self.is_replaced_content() {
+ let _scope = layout... | 1 | 4 | 0 |
c4c14e6cbc356debd128e732e56ba710a9c250a6 | Glenn Watson | 2014-09-19T07:50:50 | servo: Merge #3421 - Fix padding on tables. This fixes the TOC on wikipedia pages (from glennw:table-padding)
Source-Repo: https://github.com/servo/servo
Source-Revision: a3b20d81799f13f602b8895e423c41c9cabfda5c | diff --git a/layout/table.rs b/layout/table.rs
index 1708ceca2..c9f80f888 100644
--- a/layout/table.rs
+++ b/layout/table.rs
@@ -229,9 +229,13 @@ impl Flow for TableFlow {
}
}
}
+
+ let fragment_intrinsic_inline_sizes = self.block_flow.fragment.intrinsic_inline_sizes();
... | 2 | 19 | 13 |
3a78eefbb4f7e0475282bd9331b11706c601ec00 | Matt Brubeck | 2014-09-19T02:30:37 | servo: Merge #3414 - Fix line splitting in `white-space: pre` flows. r=gw (from mbrubeck:pre-line-break)
Source-Repo: https://github.com/servo/servo
Source-Revision: b11a110e85ca5670a1d492b6deb616fe8a90cf5b | diff --git a/layout/inline.rs b/layout/inline.rs
index 8c86b8fae..a888378bf 100644
--- a/layout/inline.rs
+++ b/layout/inline.rs
@@ -499,7 +499,7 @@ impl LineBreaker {
debug!("LineBreaker: Deferring the fragment to the inline_end of the new-line \
character to the line.");
... | 1 | 1 | 1 |
585ff90ed800cee0adb46ede4e5095c80bfcce0a | Patrick Walton | 2014-09-18T17:56:58 | servo: Try to unbreak the build by removing unused import
Source-Repo: https://github.com/servo/servo
Source-Revision: 5e5f77a354500103247359e63f1f4147919ade62 | diff --git a/layout/css/matching.rs b/layout/css/matching.rs
index 4c94692a0..7abc683f4 100644
--- a/layout/css/matching.rs
+++ b/layout/css/matching.rs
@@ -17,7 +17,6 @@ use servo_util::cache::{Cache, LRUCache, SimpleHashCache};
use servo_util::namespace::Null;
use servo_util::smallvec::{SmallVec, SmallVec16};
use ... | 1 | 0 | 1 |
f0dadd7bd29c13e679dafdfc5c7deda031975e2b | Clark Gaebel | 2014-09-18T16:29:21 | servo: Merge #3397 - Fixes #3386 (from cgaebel:issue-3386)
Source-Repo: https://github.com/servo/servo
Source-Revision: 667f887f49902c4750b80b8be15ba1d4dc3dccdf | diff --git a/layout/context.rs b/layout/context.rs
index 936314dcb..8792e99d2 100644
--- a/layout/context.rs
+++ b/layout/context.rs
@@ -79,6 +79,10 @@ pub struct SharedLayoutContext {
/// The dirty rectangle, used during display list building.
pub dirty: Rect<Au>,
+
+ /// Starts at zero, and increased b... | 7 | 59 | 8 |
88028995db35c56212e4cd252d1a25e69a736a5f | Clark Gaebel | 2014-09-18T16:12:34 | servo: Merge #3379 - Added more complex profiling metadata (from cgaebel:bucketed-timing)
Source-Repo: https://github.com/servo/servo
Source-Revision: 1b251db7323dce3b7838709c7d2dfb685d8b24a9 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index f17954245..08be501cf 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -922,7 +922,7 @@ impl IOCompositor {
}
fn composite(&mut self) {
- profile(time::CompositingCategory, self.time_profiler_chan.clone()... | 9 | 122 | 69 |
70899b2892aa0ee597c05cd515d27e8048a45a43 | Glenn Watson | 2014-09-18T14:51:11 | servo: Merge #3404 - Include margin in inline block intrinsic width. Fixes [edit] links on wikipedia. Also improves google homepage (from glennw:inline-block-fix)
Source-Repo: https://github.com/servo/servo
Source-Revision: 22bca83509e81aabb8e1cd538cc91a642bd39bfa | diff --git a/layout/fragment.rs b/layout/fragment.rs
index 4ff043898..841ed1f6b 100644
--- a/layout/fragment.rs
+++ b/layout/fragment.rs
@@ -1165,8 +1165,12 @@ impl Fragment {
TableWrapperFragment => {}
InlineBlockFragment(ref mut info) => {
let block_flow = info.flow_ref.get_... | 1 | 9 | 3 |
8bf5dbdfb4c7b149262fffeb910a4227672e5ce8 | Matt Brubeck | 2014-09-18T00:05:29 | servo: Merge #3395 - Fix unit test failures. r=jdm (from mbrubeck:doctest)
Source-Repo: https://github.com/servo/servo
Source-Revision: 8aeb90e8c34a6872cf418643fef40e67382737e2 | diff --git a/gfx/text/glyph.rs b/gfx/text/glyph.rs
index 2ea2d7c5d..5fcfb227a 100644
--- a/gfx/text/glyph.rs
+++ b/gfx/text/glyph.rs
@@ -484,7 +484,7 @@ impl<'a> GlyphInfo<'a> {
/// Simple glyphs are stored inline in the `entry_buffer`, detailed glyphs are
/// stored as pointers into the `detail_store`.
///
-/// ~~~... | 6 | 19 | 16 |
8050f4734b7932ea730edf279d12174d211bf015 | Josh Matthews | 2014-09-17T23:09:31 | servo: Merge #3358 - Delay initiating layout operations for as long as possible (from jdm:thespicemustnotreflow)
Source-Repo: https://github.com/servo/servo
Source-Revision: 75caade8287bbe9ee25a71bea01e3da6a1d3c1b5 | diff --git a/script/dom/node.rs b/script/dom/node.rs
index 8462d652e..1fb0c52ad 100644
--- a/script/dom/node.rs
+++ b/script/dom/node.rs
@@ -589,7 +589,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
let page = window.deref().page();
let addr = self.to_trusted_node_address();
- le... | 4 | 46 | 13 |
66697100bd744b2d2fa5de05e0009098dd2757a4 | Patrick Walton | 2014-09-17T15:24:32 | servo: Merge #3376 - build: Update string-cache to fix a nasty race (from pcwalton:string-cache-race)
Source-Repo: https://github.com/servo/servo
Source-Revision: aa841ae5080d11e82e50c98a37f961a9c49fbed2 | diff --git a/util/Cargo.toml b/util/Cargo.toml
index 6f4824fd6..1378fc1a0 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -18,4 +18,5 @@ path = "../../support/rust-task_info"
[dependencies.string_cache]
git = "https://github.com/servo/string-cache"
+branch = "pre-rustup" | 1 | 1 | 0 |
ef5fd90287631250eb8f0e70cec39b53f6794ccf | Josh Matthews | 2014-09-17T06:33:27 | servo: Merge #3367 - Add breakpoint utility function (from jdm:breakpoint)
Source-Repo: https://github.com/servo/servo
Source-Revision: 4a1d51b98207078fc4b65a6a55f10a34d56c6019 | diff --git a/util/lib.rs b/util/lib.rs
index 0c186fdb6..b543df42e 100644
--- a/util/lib.rs
+++ b/util/lib.rs
@@ -46,3 +46,7 @@ pub mod task;
pub mod time;
pub mod vec;
pub mod workqueue;
+
+pub fn breakpoint() {
+ unsafe { ::std::intrinsics::breakpoint() };
+} | 1 | 4 | 0 |
bd524957e5ba5e62c047cacb31aa15b57169c8f7 | ProgramFOX | 2014-09-17T00:39:06 | servo: Merge #3373 - Removed unused BlobMethods and CommentMethods traits, fixes #3366 (from ProgramFOX:issue3366)
Source-Repo: https://github.com/servo/servo
Source-Revision: 1544db8bb9fc7b27282bbf0555a45a662930f7b3 | diff --git a/script/dom/blob.rs b/script/dom/blob.rs
index 1a7d2a216..9afd784a9 100644
--- a/script/dom/blob.rs
+++ b/script/dom/blob.rs
@@ -40,9 +40,6 @@ impl Blob {
}
}
-pub trait BlobMethods {
-}
-
impl Reflectable for Blob {
fn reflector<'a>(&'a self) -> &'a Reflector {
&self.reflector_
diff ... | 2 | 0 | 6 |
9efa5e62a7ea24fbed3113b15a478cba48f39411 | Martin Robinson | 2014-09-16T20:00:44 | servo: Merge #3318 - Store content offset in unscaled pixels (from mrobinson:scrolling)
Source-Repo: https://github.com/servo/servo
Source-Revision: ffd126a0ffa5fc813659d3e8e27dc9b5bfe59844 | diff --git a/compositing/compositor.rs b/compositing/compositor.rs
index ea8bf4472..f17954245 100644
--- a/compositing/compositor.rs
+++ b/compositing/compositor.rs
@@ -22,7 +22,6 @@ use windowing::PinchZoomWindowEvent;
use azure::azure_hl::SourceSurfaceMethods;
use azure::azure_hl;
use std::cmp;
-use geom::matrix::... | 3 | 77 | 88 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.