Commit Graph

3540 Commits

Author SHA1 Message Date
Dan Fox
f6711c6464 servo: Merge #5135 - Fix 5120 rename layout util (from iamdanfox:fix-5120-rename-layout-util); r=jdm
A simple rename/refactor (https://github.com/servo/servo/issues/5120)

My first servo contribution!

Source-Repo: https://github.com/servo/servo
Source-Revision: 7fc37dfaa76c9265e6d2145fe5ef2fba5f6bd013
2015-03-05 11:09:58 -07:00
Ms2ger
418b86f02b servo: Merge #5155 - Remove an unused import from properties.rs (from Ms2ger:unused-import); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: caf5663e0981f36a621dde1dd51be2bd0a15dd24
2015-03-05 08:27:50 -07:00
Keith Yeung
31f44a00d3 servo: Merge #5127 - Added type parameter to PartialEq on JSRef (from KiChjang:partial-eq-jsref); r=Ms2ger
Fixes #5112, #3960

Source-Repo: https://github.com/servo/servo
Source-Revision: 67548a6244f0cf92f6b71507b69dceb2115d1aa2
2015-03-05 01:15:44 -07:00
Adenilson Cavalcanti
500496a046 servo: Merge #5144 - Remove flush_layout() (from Adenilson:removeFlushLayout01); r=Manishearth
Due to changes on Page/Window interfaces, we no longer have use for flush_layout().

Source-Repo: https://github.com/servo/servo
Source-Revision: 34289943e354b2ac0e54fd1fe2d65c944f6c8e9d
2015-03-04 16:54:44 -07:00
Adenilson Cavalcanti
449cb2dc15 servo: Merge #5137 - Cleanup compilation warning (from Adenilson:cleanupWarning02); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 761f7f056c607ed67adc0c4927ae63847aef8f0d
2015-03-04 07:51:44 -07:00
Simon Sapin
a29ae9aa10 servo: Merge #5141 - Make submodule sync silent (and recursive) (from SimonSapin:silent-submodule-sync); r=Manishearth
This eliminates the

    Synchronizing submodule url for 'support/android-rs-glue'
    Synchronizing submodule url for 'tests/wpt/web-platform-tests'

messages that appeared for every `mach build` command.

Source-Repo: https://github.com/servo/servo
Source-Revision: 373a720dfdf7a5849b32c03865d96e047cdea647
2015-03-04 05:51:44 -07:00
Bryan Bell
e9daaa31b5 servo: Merge #5128 - For inline-block correctly use min-width (from bjwbell:inline-block_fix_min-width); r=jdm
With inline-block elements set the width to max(min width,
specified width) instead of only using the specified width.

Fixes https://github.com/servo/servo/issues/4945

Source-Repo: https://github.com/servo/servo
Source-Revision: 9d58c086e72a7d2fc8655506d35f30069bbadbbd
2015-03-03 22:24:44 -07:00
Josh Matthews
6ff0a01710 servo: Merge #5118 - Async document loads (from jdm:pageload); r=Ms2ger
Rebased and improved version of #4967.

Source-Repo: https://github.com/servo/servo
Source-Revision: 72f8898990f06e7f505eeaf9cfa671740c60395d
2015-03-03 16:03:45 -07:00
Glenn Watson
4fbf5e6588 servo: Merge #5125 - Remove compositor layers when iframes are removed from doc or display:none (from glennw:remove-iframe-layers); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: e19fbc686cd10d59c9e02593f0b6ab68aabe02fc
2015-03-03 15:12:45 -07:00
Dan Fox
8e70fff16f servo: Merge #5136 - Replace uint with usize in reftest.rs (from iamdanfox:replace-uint-with-usize); r=metajack
Clears up some warnings.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0ff54a97730f3eca71cb61b71fbdfa6a7d0b2b4b
2015-03-03 14:24:47 -07:00
Adenilson Cavalcanti
560490d893 servo: Merge #5124 - Cleanup compilation warning (from Adenilson:cleanupWarning01); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 621150db1ca2d6ac9d4ba5d2709726dbc4139883
2015-03-03 13:51:48 -07:00
Simon Sapin
9d0586a22d servo: Revert "layout: Implement ordered lists, CSS counters, and quotes per CSS 2.1"
This reverts commit 30fd28d1077fbb3f47140f6ab1252c0d24f44d23.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4c1d778ced267eeef790d4166e361d9348b933d3
2015-03-03 21:16:24 +01:00
Simon Sapin
3df1ad88b2 servo: Revert "Refactor content property parsing."
This reverts commit 50800940dc5c8cf424d5786c447f7ff1d0432a97.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7a218b3f08c95b5c1a14ef1bbf09658d61b8d342
2015-03-03 21:16:03 +01:00
Simon Sapin
f2437f06b8 servo: Revert "Tidy."
This reverts commit e209f5e0da5a3dd3b188d11e884b2859daf053d3.

Source-Repo: https://github.com/servo/servo
Source-Revision: e590f9b7f4167ed9a2b46d97b282b99a0fa47d5f
2015-03-03 21:16:01 +01:00
Simon Sapin
4578a773a4 servo: Merge #5133 - layout: Implement image-rendering per CSS-IMAGES-3 § 5.3 and (from servo:background-size); r=SimonSapin
`background-size` per CSS-BACKGROUNDS § 3.9.

Nearest neighbor interpolation is used for `crisp-edges`, like Firefox.
A note has been added that we could do better if we wanted to.

Multiple backgrounds are not yet supported.

Rebase of #4368. Fixes #4368.

Source-Repo: https://github.com/servo/servo
Source-Revision: e1a50c771973fe3223cf98feea5d570375d68fa9
2015-03-03 11:48:54 -07:00
Simon Sapin
73082d1626 servo: Merge #5067 - layout: Implement ordered lists, CSS counters, and quotes per CSS 2.1 § 12.3-12.5 (from servo:counters); r=SimonSapin
Only simple alphabetic and numeric counter styles are supported. (This
is most of them though.)

Although this PR adds a sequential pass to layout, I verified that on
pages that contain a reasonable number of ordered lists (Reddit
`/r/rust`), the time spent in generated content resolution is dwarfed by
the time spent in the parallelizable parts of layout. So I don't expect
this to negatively affect our parallelism expect perhaps in pathological
cases.

Moved from #4544, because Critic.

Fixes #4544.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5cd6316addc1acf145ed3220719387ef6ef08d2f
2015-03-03 10:42:52 -07:00
Patrick Walton
dfd3000b94 servo: Merge #5132 - layout: Implement overflow-x and overflow-y per CSS-OVERFLOW § 3 (from servo:overflow-xy); r=SimonSapin
Rebase of #4567. Fix #4567.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6fcc02e92f4c519239a834dc37a2965a4993322a
2015-03-03 09:06:55 -07:00
Avi Weinstock
3574ac3b9e servo: Merge #5131 - Replace borrow with borrow_for_gc_trace in JSTraceable::trace (Issue #47 (from aweinstock314:master); r=jdm
...78).

Source-Repo: https://github.com/servo/servo
Source-Revision: 417a932e306438b5cda7a7071412a34d3e503f94
2015-03-03 07:18:53 -07:00
Avi Weinstock
9b02835116 servo: Merge #5122 - Filter out "Downloading rust snapshot" percent indicator in mach's outpu (from aweinstock314:master); r=kmcallister
...t based on sys.stdout.isatty() (Issue #5043).

Source-Repo: https://github.com/servo/servo
Source-Revision: 315a2349e8e0064be3d8ba1ab42cdd38ff3451a7
2015-03-02 20:18:49 -07:00
Glenn Watson
f7ffceeeaa servo: Merge #5121 - Fix hover state on elements with transparent background colours (from glennw:transparent-hover); r=mbrubeck
Move culling of transparent display items to paint task rather than display list builder, so that hit testing detects mouse over on transparent background elements.

Source-Repo: https://github.com/servo/servo
Source-Revision: ac4a690e8fa98da4e4f7adbc2d888a94c6d99e0e
2015-03-02 19:42:49 -07:00
Prabhjyot Singh Sodhi
dad168b3bd servo: Merge #5115 - mach commands now warn when it's ambiguous which binary to run (from psdh:improveBinRun); r=mbrubeck
Fixes #5080

Source-Repo: https://github.com/servo/servo
Source-Revision: 801b939479f359777c6ee68cd634da0f7c73984b
2015-03-02 19:06:51 -07:00
Prabhjyot Singh Sodhi
b3d9e25a9b servo: Merge #5114 - Replacing uses of accumulating fold with sum (from psdh:foldsum); r=jdm
Fix #5109

Source-Repo: https://github.com/servo/servo
Source-Revision: 290b025f8992569ed98a8556b70d5ebafb57a154
2015-03-02 18:27:51 -07:00
Glenn Watson
d0a623032b servo: Merge #5113 - Only allow root pipelines to set the window title (from glennw:fix-title); r=mbrubeck
Sometimes, the root pipeline title is sent before the compositor has created the root pipeline, so also request the main page title once the initial frame tree has been sent.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6927bf6ff0ba7232f9d201d6f71f57ce9146ce12
2015-03-02 17:24:56 -07:00
Glenn Watson
91294b5a71 servo: Merge #5086 - Reap layout data whenever a node is removed from the tree (from glennw:reap-more-stuff); r=jdm
Also introduce a clear() function to layout data which will be used to clear items such as compositor layouts.

Clear the layout data when a node becomes display:none.

Source-Repo: https://github.com/servo/servo
Source-Revision: 65454e51c806c7d91c869a7b4afce872b4eeea57
2015-03-02 16:45:51 -07:00
Glenn Watson
2de8116f3c servo: Merge #5065 - Fix making an iframe visible when it was initially set to display:none (from glennw:iframe-vis-fix); r=pcwalton
When an iframe is created with display:none it sets the root layer to be zero width and height. When updating the rect of the iframe from layout send the entire rect rather than just the new origin, which handles the case where the iframe has been made visible and now has a non-zero rect.

Source-Repo: https://github.com/servo/servo
Source-Revision: 891dd496e3994a96dc76ce247623be6c32a073fb
2015-03-02 15:30:52 -07:00
Patrick Walton
8d21fbc4f5 servo: Merge #4475 - layout: Implement text-shadow per CSS-TEXT-DECORATION-3 § 4 (from pcwalton:text-shadow); r=mbrubeck
r? @mbrubeck

Depends on servo/rust-geom#64.

Source-Repo: https://github.com/servo/servo
Source-Revision: 93d1f40a96df69eb9d38890df96c621e180d78cc
2015-03-02 14:54:52 -07:00
Mátyás Mustoha
689a6b3ab5 servo: Merge #5089 - Canvas: added lineTo support (from mmatyas:canvas_lineto); r=jdm
This patch enables the use of `lineTo()` on the canvas.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9eaa48b793de78b713e6c3a3c79c4060084d5fbe
2015-03-02 13:33:55 -07:00
Ms2ger
f10e3ac24e servo: Merge #5110 - Fix string default values (from Ms2ger:defaultvalue-strings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 2f3697f5f346cac7578883f452735d50b832c986
2015-03-02 12:57:59 -07:00
Keith Yeung
6473e1f89e servo: Merge #5111 - Implementation of step 1 activation behavior of htmlanchorelement (from KiChjang:step-1-anchor); r=Manishearth
Fixes #4871

Source-Repo: https://github.com/servo/servo
Source-Revision: fed878710c5697b49ccf5185ebe08a58be27073f
2015-03-01 22:18:49 -07:00
Ms2ger
de83933bd0 servo: Merge #5104 - Remove unused import from script_task (from Ms2ger:unused-import); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 154427ce51cf06b54940f84895d8f42aca79e2c2
2015-02-28 14:45:47 -07:00
Manish Goregaokar
aa848e398d servo: Merge #5033 - Fix gonk warnings, add to tidy (from Manishearth:gonk-warn); r=Ms2ger
Rust still reports that the `*mut ANativeWindow` argument in `gnw_perform` in `gonk/src/window.rs` is ffi unsafe,
however `ANativeWindow` is marked as `#[repr(C)]` and should be okay.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8bc4d07e50aa38371ef383b8f22ec9f7cacaae96
2015-02-28 14:09:48 -07:00
Ms2ger
1e32ac8466 servo: Merge #5103 - Use the correct lifetime bounds for FooCast::from_actual (from Ms2ger:from_actual); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 184d32b519f1c5daf7dda164c9179e6c8ddc0919
2015-02-28 13:33:49 -07:00
Robo
24cd83455b servo: Merge #5053 - default to number of available cpu for wpt-tests (from deepak1556:script_patch); r=jdm
fixes #5046

Source-Repo: https://github.com/servo/servo
Source-Revision: 39273d6b533c540ff4965a660802d0ed8a9b9f92
2015-02-28 12:57:50 -07:00
Guro Bokum
5f7ffbe627 servo: Merge #5073 - Move body of ScriptTask::handle_mouse_move_event into a method on Document (fixes #5032) (from JIoJIaJIu:handle_mouse_event); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 75060f41dbd6c9a6e8865f1c1c88f5b984b199f7
2015-02-28 12:21:51 -07:00
Ankit Agrawal
67d93f2be4 servo: Merge #5102 - Add profiling to image decoding (from servo:profile-img); r=jdm
This extracts some independently useful parts of
<https://github.com/servo/servo/pull/4215>.

Source-Repo: https://github.com/servo/servo
Source-Revision: 16bc4749af685c7a1728858c15ead011ab415615
2015-02-28 11:46:02 -07:00
Ms2ger
093e8fa985 servo: Merge #5099 - Cleanup our exception story (from Ms2ger:exceptions); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 5eaf1144c327272e18584db9cf047d8bb2b53eed
2015-02-28 11:09:55 -07:00
Manish Goregaokar
6c832abd84 servo: Merge #5097 - Add explicit mention of mach run for Running (from servo:Manishearth-patch-1); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 4c04d520491d8d378ed6718e08d340eff933dc0e
2015-02-28 10:33:52 -07:00
Chris Manchester
4e33e62e67 servo: Merge #5094 - Add support for BinaryName attribute to servo's codegen (fixes #4435) (from chmanchester:binarynames); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1f53d30f858a71206fce01116a3b1e5c199c1648
2015-02-28 09:57:58 -07:00
Liam Zdenek
0ac8f1f430 servo: Merge #5059 - Click event is now a MouseEvent (from saneyuki:event); r=jdm
Fix #4260

Pick up: This original commit is https://github.com/servo/servo/pull/4718.

Source-Repo: https://github.com/servo/servo
Source-Revision: b261d27ac5fc5e8a858b344087792f9b1709ee55
2015-02-28 09:21:54 -07:00
Ms2ger
1bc0663206 servo: Merge #5100 - Fix a typo in argument_type (from Ms2ger:descriptorProvdider); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: b84f620b26b5dd14cb4a92bf428c5c722a6f6eb4
2015-02-28 08:45:54 -07:00
Alexandru Cojocaru
68cf9c0af2 servo: Merge #5098 - Remove uint/int inside components/util (partial #4745) (from servo:int-util); r=Ms2ger
This leaves range.rs alone.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07b918f731c0ff7c101f69195a4ff94b2f13acdc
2015-02-28 07:21:53 -07:00
yodalee
50d5ff0835 servo: Merge #4928 - Issue4906 fix characterdata substringdata (from yodalee:issue4906-fix-characterdata-substringdata); r=jdm
issue #4906
Fix substringData function, and add a test case for all function in characterdata.

Source-Repo: https://github.com/servo/servo
Source-Revision: 55f763654910bb3110a8853d74481290a4e591af
2015-02-27 19:39:58 -07:00
Bryan Bell
195b198cde servo: Merge #4952 - Dont draw interior borders for text run fragments (from bjwbell:borders-txt-nodes); r=pcwalton
Inline fragments that are part of a text run don't have interior borders.
So don't draw interior borders or include them when calculating positioning.

Fixes https://github.com/servo/servo/issues/4658, where multiple text nodes that are adjacent have distinct borders.

r? @Ms2ger, @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: b2f099026a8c649daf063dc7e119a514c2680697
2015-02-27 16:57:53 -07:00
James Gilbertson
eaced89b69 servo: Merge #5066 - Implemented Document.currentScript (from luniv:document-currentscript); r=jdm
Implements https://github.com/servo/servo/issues/5057 (Document.currentScript)

Source-Repo: https://github.com/servo/servo
Source-Revision: 26567ef2e62597b359c179f8665213002e05da96
2015-02-27 11:30:57 -07:00
dhneio
64e845c2ed servo: Merge #5091 - Remove AccessControl header implementations in favor of hyper’s (from dhneio:5090); r=jdm
We no longer need these header implementations as they are included in hyper. Fixes #5090.

Source-Repo: https://github.com/servo/servo
Source-Revision: 60ce6c3b0fa7bd4199976a2b7e18f14df99bc511
2015-02-27 09:48:58 -07:00
Glenn Watson
1f9816fcf2 servo: Merge #5064 - Fix setting display:none after a layout where the element was visible (from glennw:hide-after-layout); r=pcwalton
Prior to incremental layout, the code would remove the existing
construction result. However, with incremental layout the construction result
is cloned rather than removed. This change ensures that the previous
construction result is cleared when an element's display type
changes to none.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8ad3c5aeb65e473a4c099b12e9439dfc556024f8
2015-02-26 14:46:10 -07:00
Jack Moffitt
10158ea9a8 servo: Merge #5078 - Update to latest Cocoa (from metajack:cocoa-hotifx); r=jdm
This fixes Servo in release mode on OS X.

Source-Repo: https://github.com/servo/servo
Source-Revision: 24139a21e8dabf5d1b16773a3a7a1919aa2655fd
2015-02-26 08:39:54 -07:00
Keith Yeung
c82108a005 servo: Merge #5031 - Moved dispatch_key_event method from script_task.rs to document.rs (from KiChjang:refactor-dispatch-key-event); r=jdm
Fixes #4982

Source-Repo: https://github.com/servo/servo
Source-Revision: 071941da59e442ad359d97e7c36e387c0029f9aa
2015-02-26 06:15:56 -07:00
James Gilbertson
1280a21db0 servo: Merge #5070 - Implement 'beforescriptexecute' and 'afterscriptexecute' events (from luniv:script-before-after-events); r=Ms2ger
Spec: https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block, sections 2.b.2 & 2.b.9

Source-Repo: https://github.com/servo/servo
Source-Revision: c1645bd10ccd9a17e149d8bec56633ac06d8529f
2015-02-26 01:06:51 -07:00
Adenilson Cavalcanti
06295cffa8 servo: Merge #5072 - Clean compilation warnings (from Adenilson:cleanWarnings01); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a8b55e821a10c5ed8e5942e88e88eb20d08ad43c
2015-02-25 22:48:50 -07:00
Glenn Watson
0d83959390 servo: Merge #5071 - If root element contains "reftest-wait" class, don't mark document as ready until it's removed (from glennw:reftest-wait); r=jdm
This allows reftests to perform tests for incremental layout and other bugs that require rendering multiple frames.

Source-Repo: https://github.com/servo/servo
Source-Revision: c7c399a26b01fe6f4d49476638a68caf6ecb8f82
2015-02-25 21:06:57 -07:00
Adenilson Cavalcanti
3fe1f46565 servo: Merge #5062 - Implements a DisplayList dumper (from Adenilson:printDisplayList01); r=pcwalton
This patch will iterate through the DisplayList after the reflow is done and print its elements (as also any sub-lists associated to a child node stacking context).

Source-Repo: https://github.com/servo/servo
Source-Revision: 67b78983db31128604339e2fd7f391e878cf9f9b
2015-02-25 20:15:56 -07:00
Jack Moffitt
e8c545debc servo: Merge #5069 - Change Servo release builds to include debugging (from metajack:rel-debug); r=larsbergstrom
This makes basic symbols available in release builds.

Source-Repo: https://github.com/servo/servo
Source-Revision: 259792e4818c6356a87d8375503feff9f837cf21
2015-02-25 12:04:04 -07:00
dhneio
7b5edad7d8 servo: Merge #5052 - Remove outdated warning from test-unit (from dhneio:5042); r=Manishearth
This warning is no longer applicable due to a change in cargo's behavior, see https://github.com/servo/servo/issues/5042

Source-Repo: https://github.com/servo/servo
Source-Revision: 862c66e78e9a590229acbcc9ce139653da7c1e52
2015-02-25 08:52:18 -07:00
Dae-seon Moon
4591049d79 servo: Merge #5068 - Remove ScriptMsg::Navigate (fixes #4948) (from servo:navigate-msg); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: a5688466855c31548ba27506bd99a35b9e6d136d
2015-02-25 07:49:08 -07:00
Patrick Walton
cbb589d36c servo: Merge #5061 - style: Fix parsing of text decorations (from pcwalton:fix-text-decoration); r=mbrubeck
Adds a reftest so it doesn't break again.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: cbc4b9520e8fb609fa068bb53193a95202f3a0a7
2015-02-24 19:12:50 -07:00
Matt Brubeck
07744237bb servo: Merge #5060 - Fix incorrect comment in BlockFlow (from mbrubeck:comment); r=pcwalton
The behavior of this code was changed in #3631.  The parent no longer sets the inline size to a temporary value.

r? @pcwalton or @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: 213b90fdacc3dc27d59e145ae37484dbc808f316
2015-02-24 18:30:57 -07:00
Ms2ger
0adaac0b3b servo: Merge #5048 - Derive Debug rather than the deprecated Show for TimerControlMsg (from servo:show-warning); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bf60477e955ff8997b8dffd2b4e6da76ad6b3346
2015-02-24 08:15:47 -07:00
Ms2ger
9f4b732f0b servo: Merge #5049 - Make 'args' a list in the mach run handler (from servo:Ms2ger-patch-1); r=Manishearth
This fixes a regression from 894e58f714de0f3d65aeb943dbf8f569feb8c1d6.

Source-Repo: https://github.com/servo/servo
Source-Revision: 337433cde572099ff2975fd5cade49a9b79911d2
2015-02-24 06:54:46 -07:00
Pawel Kondzior
4be04275fb servo: Merge #4960 - Add thaw/freeze messages that can suspend/resume webcontent timers #4907 (from pkondzior:add-script-timers-suspend-resume-functionality); r=jdm
Adds free/thaw methods to script_task that let you send suspend/resume messages to web content timers. Fixes #4907

Source-Repo: https://github.com/servo/servo
Source-Revision: a3ea3eed47713a4a6faa86c575bc2ac95c5fe135
2015-02-23 21:45:46 -07:00
Nathan Froyd
c17713165d servo: Merge #5047 - add basic |mach rr-{record,replay}| commands (from jdm:rr-mach-commands); r=jdm
These are very basic commands for invoking Servo underneath rr.  rr
currently doesn't support all the syscalls that Servo requires, but
that's easy to fix on the rr side.

Fixes #4177. Rebased from #4237.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6264e4dcdc75b83c8d08eb6bbbc9ed8412a2115c
2015-02-23 21:09:46 -07:00
Josh Matthews
2d23b906b0 servo: Merge #4996 - Eagerly report errors when evaluating JS on a global scope. Fixes #4966 (from jdm:reportpending); r=Ms2ger
I believe this problem was introduced with the mozjs error reporting changes, since we don't see errors reported from `<script>` blocks any more.

Source-Repo: https://github.com/servo/servo
Source-Revision: 99617557d40504060d5162739f8ba9b962843099
2015-02-23 20:30:48 -07:00
Nicholas Nethercote
c46175ed5f servo: Merge #4894 - Read smaps in the memory profiler on Linux (from nnethercote:read-smaps); r=jdm
Here's example -m output after these changesets are applied:

```
_size (MiB)_: _category_
     2798.61: vsize
      136.80: resident
      142.89: resident-according-to-smaps
       97.84: - anonymous (rw-p)
       23.98: - /home/njn/moz/servo/components/servo/target/servo (r-xp)
        6.58: - [heap] (rw-p)
        5.36: - other
        3.51: - /usr/lib/x86_64-linux-gnu/dri/i965_dri.so (r-xp)
        1.33: - /lib/x86_64-linux-gnu/libc-2.19.so (r-xp)
        0.93: - /home/njn/moz/servo/components/servo/target/servo (r--p)
        0.76: - /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20 (r-xp)
        0.74: - /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0 (r-xp)
        0.50: - /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 (r-xp)
        0.50: - /lib/x86_64-linux-gnu/libglib-2.0.so.0.4200.1 (r-xp)
        0.45: - /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2.0 (r-xp)
        0.43: - /lib/x86_64-linux-gnu/libm-2.19.so (r-xp)
       30.85: system-heap-allocated
        4.91: jemalloc-heap-allocated
        6.11: jemalloc-heap-active
      120.00: jemalloc-heap-mapped
```
The `resident-according-to-smaps` line is new, as are all the indented lines beneath it. This is useful particularly because it shows how much memory is taken up by code, e.g. the line ending in `servo (r-xp)` shows that the `servo` executable's code alone takes up 24 MiB of physical memory.

Source-Repo: https://github.com/servo/servo
Source-Revision: eb7e86ac4e21334e807a81ed01348a82ac7610b5
2015-02-23 19:54:50 -07:00
Glenn Watson
2e341432b6 servo: Merge #4959 - Fixes a number of issues with setting hover state, and simplifies the code (from glennw:fix-hover); r=jdm
Specifically:
 - Use inclusive_ancestors instead of ancestors, to detect hover on elements like divs.
 - Send the mousemove event after all the hover states have been set correctly.
 - Correctly handle removing hover state from elements when mouse is not over any elements.
 - Correctly detect when a reflow is required (previous code failed in several edge cases).

Source-Repo: https://github.com/servo/servo
Source-Revision: 576158d08deae2d87bde351548cbeb77590a34dc
2015-02-23 19:18:51 -07:00
Ms2ger
12dfb91106 servo: Merge #5040 - Simplify RootCollection::unroot a bit (from Ms2ger:cleanup-unroot); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9a5970cceacb40a742a3f34292ad6bf5fa56c01f
2015-02-23 14:51:54 -07:00
Simon Sapin
40036d9f8a servo: Merge #5010 - Move selector matching to an external library, for use outside Servo (from SimonSapin:external-selectors); r=larsberg
The new library is https://github.com/servo/rust-selectors. It’s not quite ready for other users (the API needs work), but this is a first step.

https://github.com/servo/rust-selectors/pull/2 should also be reviewed.

Fixes #3669.

Source-Repo: https://github.com/servo/servo
Source-Revision: 91abf5557b1a324d6568ce08cfb92cdffca10e41
2015-02-23 08:39:47 -07:00
Ms2ger
471b294157 servo: Merge #5028 - Split the 'Execute a script block' code out of prepare() (from Ms2ger:script-split); r=jdm
This also adds comments for missing steps.

The only change in behaviour should be the debug message when an external
script fails to load.

Source-Repo: https://github.com/servo/servo
Source-Revision: f0b5794e44a2a28212aaf3fac4c340a3f32a8515
2015-02-23 06:33:47 -07:00
Patrick Walton
c89b718f8e servo: Merge #5016 - script: Implement enough 2D canvas support to render basic SVGs such as (from jdm:canvas-for-svg); r=jdm
the tiger.

Rebased from #4623.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2e1adb3fa670504fb0fedaa517f312ba233bf67b

--HG--
rename : servo/components/script/dom/webidls/HTMLHeadElement.webidl => servo/components/script/dom/webidls/CanvasPattern.webidl
2015-02-22 20:33:45 -07:00
Ms2ger
f158c18736 servo: Merge #5024 - Fix build warnings in CEF (from Ms2ger:cef-warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 21a6633898d244595dc3bcf8b10ed859bca96e2e
2015-02-22 15:57:43 -07:00
Tetsuharu OHZEKI
1c2ef92830 servo: Merge #5023 - Introduce dom::htmlscriptelement::EventDispatcher (from saneyuki:script); r=Ms2ger
Fix #5021

Source-Repo: https://github.com/servo/servo
Source-Revision: fe7db9d8d0dbf1135cf955a0cfb7bb1405a92a6e
2015-02-22 14:57:44 -07:00
Keith Yeung
3bd31af0aa servo: Merge #5022 - script_task.rs now utilizes hyper's LastModified header (from KiChjang:hyper-last-modified); r=Manishearth
Fixes #4986

Source-Repo: https://github.com/servo/servo
Source-Revision: 3d9ff6e880a22de9fc5f9751da5a404e55ea23bf
2015-02-22 14:24:45 -07:00
Josh Matthews
4671d7cb11 servo: Merge #5019 - The HTML serializer depth can change on each iteration (from jdm:serializerfix); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 0ea9dafa639d153f6f064192f8f378c0b482540f
2015-02-22 13:51:45 -07:00
Prabhjyot Singh Sodhi
56b7bb7f35 servo: Merge #5012 - using opts::default_opts() in cef/core.rs (from psdh:defopts); r=jdm
Fixes #5002

Source-Repo: https://github.com/servo/servo
Source-Revision: 2271de3d5be0adbe6dcdcbfbbc480a3d39b8a321
2015-02-22 13:15:44 -07:00
Edit Balint
515ef0d463 servo: Merge #5020 - Implement Canvas pixel manipulation (from jdm:canvas); r=jdm
Rebase of #4639.

Source-Repo: https://github.com/servo/servo
Source-Revision: 287f390c4a56dd8c5960df699d45653227b25d6f
2015-02-22 11:48:46 -07:00
Ms2ger
a9f76e032c servo: Merge #5017 - Mark some unused arguments as unused in bindings (from Ms2ger:unused-args); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3ea09bf2ea8db621107abbc8b358f1c0ce0ffea4
2015-02-22 10:15:47 -07:00
Ms2ger
3aa03cdd4e servo: Merge #5004 - Reindent handle_click_event (from Ms2ger:handle_click_event); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e68d6d2924bf2f6f762e2dc50b75fc32c0eafe16
2015-02-22 09:36:46 -07:00
Ms2ger
2379d5a154 servo: Merge #5015 - Only unwrap the object once when finalizing (from Ms2ger:finalize); r=jdm
Previously, we had 'value' and 'this' locals, both storing a pointer to the
DOM object, for no good reason.

Source-Repo: https://github.com/servo/servo
Source-Revision: 92620c0a5f3bf01ddfb2f52fb89cdc467ff4a761
2015-02-22 08:36:49 -07:00
Prabhjyot Singh Sodhi
27cccf0267 servo: Merge #5011 - changin os.exit to sys.exit (from psdh:ossys); r=Manishearth
Fixes #5009

Source-Repo: https://github.com/servo/servo
Source-Revision: a5f52bf086fcb4ec4c3d22917b928ebd0997ff84
2015-02-21 13:42:45 -07:00
Prabhjyot Singh Sodhi
8e4c455bec servo: Merge #4956 - Fixing Intermittent failure in pages with timers (from psdh:interfail); r=jdm
Fixes #4923

Source-Repo: https://github.com/servo/servo
Source-Revision: f1f826544919b4fa7cdf4bf263abf0c0c1497f70
2015-02-21 12:51:44 -07:00
Ms2ger
959786fd9f servo: Merge #5007 - Remove unused imports (from Ms2ger:warnings); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 939b13f436d2fc895cf8a57140b0bd50acc53a89
2015-02-21 11:33:46 -07:00
Ms2ger
0369e60ea1 servo: Merge #5006 - Cleanup ScriptTask::load (from Ms2ger:script_task); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 31c8f97b4b493d828f1b96144772f3df1aff145b
2015-02-21 10:48:46 -07:00
yodalee
5da0bd9faa servo: Merge #5003 - update mozjs-sys to newest (from yodalee:update-mozjs-sys); r=Ms2ger
update mozjs-sys after rust-mozjs

Source-Repo: https://github.com/servo/servo
Source-Revision: d368d70f14474c5c0460d0d06f163c390cff60bd
2015-02-21 10:06:48 -07:00
Tetsuharu OHZEKI
d03a50553c servo: Merge #4997 - Move DocumentProgressHandler to document.rs (from saneyuki:doc); r=jdm
Fix #4987

Source-Repo: https://github.com/servo/servo
Source-Revision: b589735b47e0c8c9b008831a776a6db38b38cd5d
2015-02-21 09:24:47 -07:00
Keith Yeung
06a1188c2f servo: Merge #4939 - Script elements now fire async error events (fixes #4506) (from KiChjang:script-element-error-events); r=jdm
Fixes #4506

Source-Repo: https://github.com/servo/servo
Source-Revision: 0be6389158799a58a46564524004e827c5884296
2015-02-21 08:42:46 -07:00
Keith Yeung
da58e664b1 servo: Merge #4931 - Worker now fires errorevent when url fetching failed, fixes #4511 (from KiChjang:worker-error-event); r=jdm
Fixes #4511

Source-Repo: https://github.com/servo/servo
Source-Revision: 1ad9c678f7fbfaffe86a0f76904aaf5f5a3bbee2
2015-02-21 07:39:51 -07:00
Ms2ger
9c6ed590bc servo: Merge #5000 - Move gfx to libc from crates.io (from Ms2ger:libc-gfx); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bc5eeb00a1874c7211d6a656871000f9352c2f40
2015-02-21 06:51:50 -07:00
Keith Yeung
624cc237e1 servo: Merge #4999 - Moved handle_click_event from script_task.rs to document.rs (from KiChjang:refactor-handle-click-event); r=jdm
Fixes #4983

Source-Repo: https://github.com/servo/servo
Source-Revision: aad6cc03b80c3ef88439c3dc68693ddcc941ecde
2015-02-21 05:42:53 -07:00
Ms2ger
6c5842988e servo: Merge #5001 - Remove the implementation of ToJSValConvertible for JS<T> (from Ms2ger:JS-to_jsval); r=jdm
It is unused and doesn't serve a purpose.

Source-Repo: https://github.com/servo/servo
Source-Revision: ea9b0909bdc240a064978accd0c092b8814945d4
2015-02-21 05:03:51 -07:00
yodalee
919ae8d751 servo: Merge #4998 - update mozjs and rust-mozjs to newest (from yodalee:update-mozjs-and-rustmozjs); r=Ms2ger
All javascript Typedarray supported.

Source-Repo: https://github.com/servo/servo
Source-Revision: b548fb8f58c03a7ebb6573049ec72a516eb9282d
2015-02-21 02:51:48 -07:00
Patrick Walton
150bdee4d8 servo: Merge #4994 - layout: Add an option to visualize parallel layout (from pcwalton:layout-tinting); r=pcwalton
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: d26345f868e4261760ce204bdc383941e8f14621
2015-02-20 23:06:48 -07:00
Manish Goregaokar
12185fd3bc servo: Merge #4991 - Add ./mach build-gonk; unbreak gonk build; document (from Manishearth:gonkup); r=larsbergstrom
r? @larsbergstrom

cc @mwu

Source-Repo: https://github.com/servo/servo
Source-Revision: d326e75c5e0314903ed2d297dcb72e535c543c2f
2015-02-20 22:27:49 -07:00
Andreas Gal
e3a7b4c06d servo: Merge #4977 - Use cleaner StrokeOptions interface (from andreasgal:master); r=jdm
The new interface will be added by https://github.com/ser...vo/rust-azure/pull/145 (has to be merged first).

Source-Repo: https://github.com/servo/servo
Source-Revision: 991b47953197ef5311300145e7b3d6f249a3f6b5
2015-02-20 21:00:55 -07:00
Adenilson Cavalcanti
5558b61a79 servo: Merge #4995 - Actually print the contents of Flow Tree into console (from Adenilson:printFlowTree01); r=jdm
When executing servo with proper flags (i.e. --debug dump-flow-tree), it should print the flow tree. We had the code, but it was commented.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2eb71bda83c175ec4af9aca4e22b74ef7fea9097
2015-02-20 20:12:55 -07:00
Shing Lyu
0149b7729b servo: Merge #4870 - Bug 4236: Moved anchorelement click event to activation behaviour (from shinglyu:bug4236); r=jdm
Fixed bug #4236

Source-Repo: https://github.com/servo/servo
Source-Revision: 95cc1705cb2d795071ee454132a3d7d691f385ae
2015-02-20 19:00:54 -07:00
Ms2ger
b801182c59 servo: Merge #4993 - Move compositing to libc from crates.io (from Ms2ger:libc-compositing); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d8c9f2b92fb4be83895c4fe43ede2d6e83d2c274
2015-02-20 18:21:51 -07:00
Simon Sapin
07b7b78232 servo: Merge #4988 - Do "computed value" calculation with a trait with an associated type (from SimonSapin:to_computed_value_associated_type); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: ab0cbbe3f398c89baa5d53f79b607d32fd9ee2ce
2015-02-20 17:42:52 -07:00
Prabhjyot Singh Sodhi
a4bd26f91d servo: Merge #4865 - implementing step 12 of 'prepare a script' algorithm (from psdh:prepscript); r=Ms2ger
#4176

Source-Repo: https://github.com/servo/servo
Source-Revision: e39e75865bdcef639b47a6a448a84cf2ca4894cf
2015-02-20 17:03:53 -07:00
Prabhjyot Singh Sodhi
a2572cb4f4 servo: Merge #4992 - ./mach cargo now cd's to servo dir if in root (from psdh:cargodir); r=Manishearth
Fixes #4976

Source-Repo: https://github.com/servo/servo
Source-Revision: ff10deb81415d2d1822166d1c0ca0d9f484f48c6
2015-02-20 16:24:53 -07:00
Josh Matthews
76adf3ce88 servo: Merge #4989 - Use platform-sized integers for textinput.rs (from jdm:textinputsizes); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: e8ade1e3d331a78921b3a7a3be2737a94b096ffa
2015-02-20 15:39:53 -07:00
awlnx
efc175ec27 servo: Merge #4958 - fixes issue #4103 (from awlnx:master); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bc0e13a46db491b778f2ec47782d03282775eedc
2015-02-20 14:33:54 -07:00
Chris Manchester
d6b0936869 servo: Merge #4882 - Stringifiers (from chmanchester:stringifiers); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 172db80703fc19ff078f2f46fb299cadd99a483b
2015-02-20 13:01:02 -07:00
Ms2ger
8fa61151a1 servo: Merge #4979 - Audit ints and uints in script (from Ms2ger:audit-ints); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 276f74b1ddec9dfa4cb053eb0802f95bd5ed6b66
2015-02-20 07:09:54 -07:00
Ms2ger
88fd138436 servo: Merge #4978 - Use the try macro to initialize dictionaries (from Ms2ger:try-dicts); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 45a0e0e65c0d104c3e29f6521b11b4285cde58d2
2015-02-20 05:54:53 -07:00
Ms2ger
6f16c7dd57 servo: Merge #4975 - Move util to libc from crates.io (from Ms2ger:util-libc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0a4c8c0e4c0e8c94a82363b10971c99fc0d9abbc
2015-02-20 01:42:53 -07:00
Jack Moffitt
aaef4c20a3 servo: Merge #4969 - Added overlay for demoing parallel painting (from servo:parallel-paint-demo); r=glennw
You can enable this with `-Z show-parallel-paint`. The output looks like this:

![screenshot 2015-02-19 13 21 12](https://cloud.githubusercontent.com/assets/28357/6275199/7bd6e788-b83a-11e4-89cb-a74f360272f2.png)

Source-Repo: https://github.com/servo/servo
Source-Revision: 49ff6b2ccc43ab657814a1b4584122411a4b2acb
2015-02-19 16:21:57 -07:00
Ms2ger
7d0de0bb3d servo: Merge #4970 - Move layout to libc from crates.io (from Ms2ger:js-layout); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: f769626dd2e351c8b408b39bfac6f6cbd53581a9
2015-02-19 13:43:00 -07:00
Ms2ger
d434c04486 servo: Merge #4963 - Move js to libc from crates.io (from Ms2ger:js-libc); r=jdm
Requires https://github.com/servo/rust-mozjs/pull/136.

Source-Repo: https://github.com/servo/servo
Source-Revision: d94bd278a4a6e5ef38a9967be69ada0f1bf50f6d
2015-02-19 12:03:54 -07:00
Ms2ger
fbf983ef98 servo: Merge #4962 - Remove the libc feature gate from cef (from Ms2ger:cef-libc); r=jdm
As it depends on the crates.io libc crate, the feature gate doesn't apply.

Source-Repo: https://github.com/servo/servo
Source-Revision: e0af48426980dd067dba00c98d6c2e9b8ebe1695
2015-02-19 06:45:52 -07:00
Ms2ger
39813e1fef servo: Merge #4961 - Remove the Option<Self> arguments from IDLInterface (from Ms2ger:IDLInterface); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 1e2d6c5a2d6ffe54d610858d786cda421180cb63
2015-02-19 03:15:52 -07:00
Glenn Watson
92351aa8e2 servo: Merge #4951 - Change window title to reflect document title (from glennw:set-title); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: dc31d96f65246def19cb7a23f3a62795cd7344a1
2015-02-18 14:42:49 -07:00
thiagopnts
641741cfab servo: Merge #4943 - Remove warning (from thiagopnts:remove-warnings); r=gw
Remove warning from unused import

Source-Repo: https://github.com/servo/servo
Source-Revision: 25678f9c2f220fbbfaad61e3d3b53aa39428d53b
2015-02-18 14:00:58 -07:00
Prabhjyot Singh Sodhi
97ba6efd50 servo: Merge #4930 - Mach bootstrapping will sync modules (from psdh:sync); r=Manishearth
Fixes #4916

Source-Repo: https://github.com/servo/servo
Source-Revision: 5622366bc5d40e387114ad51fdfb3a321772351d
2015-02-18 13:18:50 -07:00
Prabhjyot Singh Sodhi
1468fc2d06 servo: Merge #4918 - Porting Gecko's JSToNativeConversionInfo changes to Servo's codegen (from psdh:conversion); r=Ms2ger
Fixes #4800

Source-Repo: https://github.com/servo/servo
Source-Revision: 2e4f343aeae23a0fd3d9c5307778dec9b2e8ea21
2015-02-18 12:15:56 -07:00
Prabhjyot Singh Sodhi
24d19afa21 servo: Merge #4877 - improving mach run error message in case of missing binaries (from psdh:imperror); r=jdm
#4874

Source-Repo: https://github.com/servo/servo
Source-Revision: b70e3cc5be5474cf3e45b7db251cf1ee494e26f1
2015-02-18 11:33:55 -07:00
Tetsuharu OHZEKI
79c9cf4a82 servo: Merge #4949 - XMLHttpRequestEventTarget should not be [NoInterfaceObject] (from saneyuki:xhr); r=jdm
Fix #4941

Source-Repo: https://github.com/servo/servo
Source-Revision: 554e1ee939187914c55aca9b3355fbdf20dd31c8
2015-02-17 10:45:52 -07:00
Ms2ger
057d7cb476 servo: Merge #4947 - Use rustc-serialize rather than the built-in deprecated serialize (from Ms2ger:serialize); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: afb152a8569953f730df564be2745c5a6302bf6f
2015-02-17 07:30:50 -07:00
Manish Goregaokar
051e813fd0 servo: Merge #4946 - Update to latest glutin (from Manishearth:glutin_up); r=gw
Also moves some of our deps away from rustc's libc and onto Crates libc.

Needs:

 - https://github.com/servo/rust-azure/pull/144
 - https://github.com/servo/rust-xlib/pull/35
 - https://github.com/servo/gleam/pull/14
 - https://github.com/servo/rust-layers/pull/151

Source-Repo: https://github.com/servo/servo
Source-Revision: 4ab928728e3d65ac4c6ca72cd6c8aa0c75fde33b
2015-02-17 00:18:49 -07:00
Nicholas Nethercote
60061c31b2 servo: Merge #4938 - Avoid bloom filter churn (from nnethercote:dont-clone-bloom-filter); r=Ms2ger
When a cached bloom filter is found during traversal, there are two
cases, both of which currently do unnecessary allocations. This patch
avoids these allocations. In the process, it renders correct two
previously-incorrect comments, and moves one of those comments into a
better spot.

While scrolling moderately fast all the way through the "Guardians of
the Galaxy" Wikipedia page, this patch (a) avoids 1.2 million calls to
`clone()` and (b) replaces 111,000 `BloomFilter::new()` calls with
`clear()` calls.

Source-Repo: https://github.com/servo/servo
Source-Revision: a45265231797355d08e891be360b2e10bd8df37b
2015-02-16 15:54:48 -07:00
Bryan Bell
931cd7e602 servo: Merge #4896 - When using glutin, set the mouse cursor (from bjwbell:mouse-cursor); r=glennw
r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: a848a00a1db2c57f59509efc4165d8e04e89bb53
2015-02-16 14:54:49 -07:00
Glenn Watson
4ddf1f39c5 servo: Merge #4934 - Fixes background-color calculation for iframes. Fixes #1248 (from glennw:fix-1248); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d2e840bf49f7d9d8022ab2566cfb641dd578a44
2015-02-16 14:06:52 -07:00
Glenn Watson
884bfec2ce servo: Merge #4937 - Support root element having percentage heights in layout (from glennw:pc-height); r=pcwalton
This allows using standard CSS techniques to place a footer at the bottom of the page.

Source-Repo: https://github.com/servo/servo
Source-Revision: c7d3ea1c6588512c62ce6688ad0e544dacccfb8f
2015-02-16 13:19:02 -07:00
Ms2ger
4e8c547103 servo: Merge #4936 - Replace the FooCast traits by structs (from Ms2ger:InheritTypes); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: ec42c01fba1188ef965ce9cbce59b22767c3c2fd
2015-02-15 17:18:48 -07:00
Ms2ger
d9ad6619e6 servo: Merge #4935 - Improve the formatting for FromJSValConvertible implementations in UnionTypes (from Ms2ger:UnionTypes); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 05db1a449908152495523b11b280acca338bb320
2015-02-15 15:36:48 -07:00
Ms2ger
7341b3a564 servo: Merge #4932 - Fix a build warning with CEF on Mac (from Ms2ger:warning-cef-mac); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b2f2c55057493a6d6b1b56d02173625fbe403a8
2015-02-15 13:45:52 -07:00
storedbox
93340a492b servo: Merge #4929 - Collapsed unnecessarily verbose command combo (from storedbox:patch-1); r=saneyuki
When a path is passed to the `pushd` command, bash will push your _current_ directory to the top of the stack and then `cd` to whatever location you provided. There is no need to use two separate commands.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3e7dc576934acb935fd67b6b3d909aca216c5dec
2015-02-14 00:03:46 -07:00
Ms2ger
51c90c3967 servo: Merge #4914 - Cleanup match_lang_ty a bit (from Ms2ger:match_lang_ty); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 736c58067064a421f732dae118fde811b50b8aa6
2015-02-13 23:21:49 -07:00
Adenilson Cavalcanti
4a6230be7e servo: Merge #4903 - Companion single Color patch (from Adenilson:singleColor02); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b5749e9855b68636d5366450602cd73397a6f219
2015-02-13 15:51:50 -07:00
Ms2ger
4da720d734 servo: Merge #4927 - Cleanup memory.rs a bit (from Ms2ger:mem); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 52fc01ad37e5e06de997862f480e8bb679ad8a89
2015-02-13 09:48:54 -07:00
Ruud van Asseldonk
ad71ce0ea3 servo: Merge #4925 - Remove glob re-exports in devtools_traits/lib.rs (from ruuda:devtools-traits); r=jdm
This resolves #4921.

Source-Repo: https://github.com/servo/servo
Source-Revision: 40eff84ae1220c3d596cddf4fb789763b71bcb38
2015-02-13 09:06:53 -07:00
Ms2ger
c1db4c4e1b servo: Merge #4924 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9c476a290aa493404a8e5953d0e813cb68c4c434
2015-02-13 07:36:50 -07:00
Nicholas Nethercote
f63fe22a33 servo: Merge #4917 - Fix jemalloc memory measurements (from nnethercote:fix-jemalloc-reporting); r=jdm
It turns out you need to send an "epoch" request to jemalloc before
asking for a measurement otherwise you get stale data! Heavens.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7acc6887d5190b31e171be4823c6205e5e55ceec
2015-02-13 06:54:56 -07:00
awlnx
cfc90cb92f servo: Merge #4913 - Added cleaning of packages to mach (from awlnx:master); r=jdm
issue #4898

Source-Repo: https://github.com/servo/servo
Source-Revision: c0e2a237ec14d1aaecc5240e7ebb8f324c946834
2015-02-13 06:15:48 -07:00
Ms2ger
b019c7ef30 servo: Merge #4922 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 66f4faf44fbc6e8703d4336219a20dd3b19fb493
2015-02-13 05:33:49 -07:00
Simon Sapin
b9b04d79b1 servo: Merge #4919 - Cleanup libstyle (from SimonSapin:cleanup-libstyle); r=gw
Source-Repo: https://github.com/servo/servo
Source-Revision: 11b627704d539122bdf9755644fb5bc0c6a03bb6
2015-02-13 03:06:49 -07:00
Ms2ger
b8800f2bb7 servo: Merge #4911 - Cleanup join_layout a little bit (from Ms2ger:join_layout); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c5a4e78302fab9c40a0ed946663cf4609969cdb8
2015-02-13 02:24:50 -07:00
Matt Brubeck
c7d0095a59 servo: Merge #4904 - Replace util::dlist code with new collections::DList methods (from mbrubeck:dlist); r=pcwalton
r? @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 26aee53c827c4db517171cd89786d894b1ceb76c
2015-02-12 16:39:53 -07:00
Ms2ger
13868c9015 servo: Merge #4912 - Use boxed::into_raw in create_or_get_local_context (from Ms2ger:local_context); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 45d18ce21c0f902e2b88f01cd57b68a7e8c0a633
2015-02-12 15:36:47 -07:00
Ms2ger
c897ff19a3 servo: Merge #4910 - Replace squirrel_away_unique by boxed::into_raw (from Ms2ger:squirrel); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 69259e9975a0383d309b7ce678734c49e6616d32
2015-02-12 14:48:50 -07:00
Tetsuharu OHZEKI
1c21301bac servo: Merge #4909 - Fix warnings about RefCell<T>.try_borrow() (from saneyuki:warn); r=jdm
follow up #4893

Source-Repo: https://github.com/servo/servo
Source-Revision: 6d1a2d90e531e82c8692af469f308e539d15bedb
2015-02-12 14:06:49 -07:00
Ms2ger
c93c281532 servo: Merge #4908 - Remove some methods from js.rs (from Ms2ger:dead-code-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b351b216c6ac5df1913ddd589d3300d7cd07ebb0
2015-02-12 13:21:47 -07:00
Ms2ger
c9176a14a6 servo: Merge #4905 - Fix some warnings in script (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b655b54f8022d963460e510511ad774a1a1d9ccd
2015-02-12 12:12:47 -07:00
Ms2ger
e4a7ce0d88 servo: Merge #4902 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fab80925818e53bfb92ffa2684a6834bb9f70f29
2015-02-12 11:06:50 -07:00
Keith Yeung
4dd00911b1 servo: Merge #4866 - Updated trigger_fragment to take a string instead of URL and updated cal (from KiChjang:trigger-fragment-string); r=jdm
Fixes #4863

Source-Repo: https://github.com/servo/servo
Source-Revision: 29d24a5049cda10111bb36f3ca2d798e68137107
2015-02-12 10:18:45 -07:00
hgentry
f27db51a13 servo: Merge #4890 - Remove our copy of Utf16Encoder in favor of the built-in equivalent (fixes #4725) (from servo:Utf16Encoder); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 395323cd70cad05f43617e9ef95f4db71df05d71
2015-02-12 09:18:46 -07:00
Simon Sapin
da87abc762 servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
Ready for review.

Final link step on android fails, but we know how to fix it and will add it to this branch soon.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9

--HG--
rename : servo/ports/gonk/build.rs => servo/support/rust-task_info/build.rs
2015-02-11 17:24:45 -07:00
Martin Robinson
9a7b554da0 servo: Merge #4895 - Send back unused buffers to the right pipeline (from mrobinson:fix-buffer-return); r=mbrubeck
Update to latest rust-layers and send back all buffers to their
original pipeline.

Source-Repo: https://github.com/servo/servo
Source-Revision: bc6882bdefc318402a46ede1494eb79339705c21
2015-02-11 09:27:54 -07:00
Glenn Watson
cadc2b7986 servo: Merge #4884 - Dispatch a load event at iframes. Fixes #4350 (from glennw:iframe-load); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fcfa00f4df7e382f1390c26ab3fd322886d2e138
2015-02-11 03:51:47 -07:00
Ms2ger
845ba25d04 servo: Merge #4889 - Use base64 from rustc-serialize (fixes #4747) (from Ms2ger:4747-base64); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 58b7186cea7a61645b38158053e3849d121fa487
2015-02-10 07:24:45 -07:00
Ms2ger
0d1c95d2b5 servo: Merge #4885 - Update the documentation in js.rs (from Ms2ger:doc-js); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 1b23c4fd579fc387f79b33989415174a2a821ec6
2015-02-10 06:45:47 -07:00
Ms2ger
e80f986397 servo: Merge #4887 - Import net as net rather than servo_net (from Ms2ger:servo_net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e3a4d493117ffd09ce75270b36012845ebb9c08c
2015-02-10 05:15:45 -07:00