Граф коммитов

25 Коммитов

Автор SHA1 Сообщение Дата
Ms2ger 39a22519e3 servo: Merge #4756 - Fix various build warnings (from Ms2ger:warnings); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 88b781421aa78a2f466e6d170f89d13a870643cd
2015-01-28 13:15:53 -07:00
Josh Matthews 78741af324 servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Ms2ger e5578c14fd servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Matt Brubeck 257e1b9aac servo: Merge #4428 - Code cleanup in glfw_app::Window::scroll_window (from mbrubeck:scroll-cleanup); r=glennw
More code re-use, fewer unchecked units. r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: cf616b90a236f88058dbad74b568b4d4379d2829
2015-01-05 17:21:54 -07:00
Ms2ger 833bb336a1 servo: Merge #4550 - Rename MouseWindowEvent variants (from Ms2ger:MouseWindowEvent); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ca876edc051c9b105747252155d0f11c31189646
2015-01-05 08:09:53 -07:00
Ms2ger 11a0efe9f4 servo: Merge #4542 - Prepare for the rust upgrade (from servo:pre-rustup_20141221); r=saneyuki
In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.

Source-Repo: https://github.com/servo/servo
Source-Revision: ba8cf6b0e6145265f9472d4855f078d8b5943fe7
2015-01-04 12:39:47 -07:00
Ms2ger 19cd65303c servo: Merge #4538 - Remove obsolete attributes (from Ms2ger:attributes); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d8b6cec722e67f1fd39f154f4f0a298f2227501f
2015-01-03 10:39:48 -07:00
Patrick Walton cda269baf7 servo: Merge #4358 - compositing: Implement `cursor` per CSS3-UI § 8.1.1 in the CEF/Mac port (from pcwalton:cursor); r=mbrubeck
I'm not sure how we want to handle Linux cursors, and GLFW has no
ability to set cursors (short of disabling it and managing it yourself).

If you test this in the wild you will probably hit #4357 until that PR lands.

Source-Repo: https://github.com/servo/servo
Source-Revision: e2267e0a0749e27046ee8a26ba514cc6865e0345
2014-12-18 00:24:49 -07:00
Glenn Watson b185394a0f servo: Merge #4405 - Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d (from servo:rustup_20141124); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fbf42c951b2f53d91e2f32f8035484a07ea83493
2014-12-17 18:45:49 -07:00
Nathan E. Egge 1d5fe80591 servo: Merge #4347 - Sending key events through script task before processing them in the com (from negge:backspace4); r=jdm
...positor.

Fixes #4163

Source-Repo: https://github.com/servo/servo
Source-Revision: 4b8c9128597a7598ef76a4bebe6d81fb2ff9aa1a
2014-12-12 10:36:55 -07:00
Patrick Walton 8b6e74fa78 servo: Merge #4193 - ports/cef: Implement accelerated compositing for the CEF port (from pcwalton:cef-redux); r=pcwalton,metajack
@glennw, is it possible to rebase your stuff on top of this? Sorry for the mess.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: ba06d50e3a611d1c27c6c9aa0b21441282911c3f
2014-12-10 09:40:03 -07:00
Tetsuharu OHZEKI d9885c4396 servo: Merge #4279 - Rename "render"/"rendering" to "paint"/"painting" (from saneyuki:rename); r=jdm
#4275

* This changeset rename "render"/"rendering" to "paint"/"painting" under `components/`.
* This does not rename words which are used as general browser's working.
  * So this doesn't change `reftest.rs`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0b486b12109ab765ecee4cbcc684e5d99e8ad5ad

--HG--
rename : servo/components/canvas/canvas_render_task.rs => servo/components/canvas/canvas_paint_task.rs
rename : servo/components/gfx/render_context.rs => servo/components/gfx/paint_context.rs
rename : servo/components/gfx/render_task.rs => servo/components/gfx/paint_task.rs
2014-12-08 10:28:10 -07:00
Glenn Watson e76f75ceeb servo: Merge #4051 - Remove unused exit after load option (from glennw:remove-exit-load); r=mbrubeck
This simplifies some upcoming changes to how event handling works.

Source-Repo: https://github.com/servo/servo
Source-Revision: 32d765fb049318f2ff22f39fdeb9fa258ec8a174
2014-11-20 16:54:31 -07:00
Glenn Watson 8a83aa075e servo: Merge #4035 - Remove rust-alert as it's broken on mac, and unimplemented on other platforms (from glennw:remove-rust-alert); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 554f696db81665f92e9976a15d986b0fd0f99edf
2014-11-18 21:30:27 -07:00
Glenn Watson c04e3b2bc7 servo: Merge #4028 - Add glutin port (supported on Linux only currently) (from glennw:glutin); r=larsbergstrom
Default build uses glfw, but glutin can be enabled via:

./mach cargo build --no-default-features --features=glutin

Remaining work:
 * Mac
 * Android
 * hi-dpi
 * nested event loop

This PR also enables true headless (without X) rendering on Linux by specifying the rendering API as Mesa.

Source-Repo: https://github.com/servo/servo
Source-Revision: f5c6146de0b3bfda97edff6662033f4a981df3f6
2014-11-18 15:48:29 -07:00
Glenn Watson 7ecba6a00a servo: Merge #4011 - Update gleam submodule, and use glfw to load OpenGL function pointers (from glennw:gleam-update); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 3da9ad464db7e3a422e06f82285aff15b7375344
2014-11-16 16:09:28 -07:00
Josh Matthews 4d3016e023 servo: Merge #3585 - Implement single-line text input (from jdm:input); r=gw
This attempts to implement a bunch of the DOM Level 3 Events spec by implementing the KeyboardEvent interface, the document focus context, and dispatching keyup/keydown/keypress events appropriately. There's also some support for multiline text input that's untested.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2ffa845cf463b14b19322d477a77ffd20efa89a9
2014-11-13 10:57:33 -07:00
Glenn Watson 22c4035692 servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00
Tom Schuster 8f14a6073c servo: Merge #3892 - Support Back and forward button on mouses (from evilpie:master); r=glennw
I am not sure if this is the same key everywhere, but this works on Linux. Google didn't produce useful results for me.

Source-Repo: https://github.com/servo/servo
Source-Revision: e781cb4d0c49905d250a4f1a91dcc09b4d3927c4
2014-11-06 12:03:32 -07:00
Patrick Walton 35e2f9710a servo: Merge #3761 - Invert control flow, fix resizing, and improve checkerboarding significantly (from pcwalton:smooth-scrolling); r=larsbergstrom
r? @glennw @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: ffae1104989c0177b483d591a482e5cd877183c2
2014-11-04 18:12:32 -07:00
Glenn Watson cfd1172702 servo: Merge #3846 - Update to use CGL crate for mac (from glennw:cgl); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: b8de54bc63a27ec55db683bba7430cbd0e4aa9e4
2014-10-29 09:24:40 -06:00
Glenn Watson 8755e7f008 servo: Merge #3800 - Use WindowMethods to get native graphics metadata instead of relying on azure (from glennw:native-gfx-metadata); r=mbrubeck
This is a prerequisite for glutin support.

Tested on Linux, mac. Tested that android + cef build.

Source-Repo: https://github.com/servo/servo
Source-Revision: a2587462693bf73412a729dfaccb2abb0d3f6ff6
2014-10-23 23:03:29 -06:00
Patrick Walton de5550d56e servo: Merge #3765 - util: Make some minor formatting cleanups to profiling and gfx (from pcwalton:profiler-cleanups); r=cgaebel
The only real user-visible change this effects is to trim URLs to 30 characters so they don't make huge lines on the terminal.

r? @cgaebel

Source-Repo: https://github.com/servo/servo
Source-Revision: a6f0159cb85e3b84a826c41ae5ad1b6aea09d7cc
2014-10-22 14:45:35 -06:00
Glenn Watson feabe3b678 servo: Merge #3729 - Use opts as a global, to avoid cloning and passing the struct all over the code base (from glennw:opts-cleanup); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 852378209badb936e8929c31501cb8cabeea6bc5
2014-10-19 21:33:25 -06:00
Matt Brubeck 09b8582693 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

--HG--
rename : servo/Cargo.lock => servo/ports/android/glut_app/Cargo.lock
rename : servo/components/compositing/platform/common/glut_windowing.rs => servo/ports/android/glut_app/window.rs
rename : servo/components/compositing/platform/common/glfw_windowing.rs => servo/ports/glfw/window.rs
2014-10-10 13:12:37 -07:00