Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity
7202 commits 168 branches 5 tags 1.6 GiB
Commit graph

7202 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors-servo
483e84ca7b auto merge of #3989 : jdm/servo/disableiframetest, r=mbrubeck 2014-11-15 10:03:33 -07:00
bors-servo
80baba015e auto merge of #3996 : jdm/servo/flakyvertical, r=Ms2ger 
...investigated. #3926
 2014-11-15 09:30:34 -07:00
Josh Matthews
a589ed7848 Mark vertical-lr-blocks.html as flaky to ease the pain while it's being investigated. #3926 2014-11-15 11:17:04 -05:00
bors-servo
443b1b98e1 auto merge of #3984 : zmike/servo/embedding-option_callbacks, r=jdm 
@jdm,  @larsbergstrom

#legday
 2014-11-14 18:45:35 -07:00
bors-servo
0ab70dd539 auto merge of #3977 : wenderen/servo/cef-empty-enums, r=jdm 
fix for #3968
 2014-11-14 17:15:33 -07:00
bors-servo
7d3b76c60d auto merge of #3979 : Ms2ger/servo/as_unsafe_cell, r=jdm 2014-11-14 15:48:35 -07:00
Mike Blumenkrantz
5f10092995 embedding: convert callback Option<> matching to map() 2014-11-14 17:18:50 -05:00
Mike Blumenkrantz
11e30731ef embedding: change Option<> unwrapping for fptrs to use match 2014-11-14 17:08:36 -05:00
bors-servo
e3ee984f17 auto merge of #3985 : mbrubeck/servo/android-green, r=larsbergstrom 
r? @glennw
 2014-11-14 15:03:35 -07:00
Josh Matthews
62a74cf3f0 Disable the iframe content test due to #3986. 2014-11-14 16:25:36 -05:00
Ms2ger
86d609abaf Use RefCell in DOMRefCell to reduce duplicated code. 2014-11-14 21:18:43 +01:00
Matt Brubeck
18dad40dfb Update GLUT for rustup fixes 
Pulls in servo/rust-glut#49
 2014-11-14 12:14:03 -08:00
Matt Brubeck
6323c230a2 Update Cargo.lock files for Android rustup fixes 
r? @glennw
 2014-11-14 11:56:29 -08:00
Mike Blumenkrantz
d33f74f499 embedding: remove eutil::fptr_is_null, fix #3967, add Option<> to fptrs 2014-11-14 14:30:59 -05:00
Rohan Prinja
ab6a230839 empty enum replaces c_void 
fix incorrect type aliasing logic

remove trailing semicolons

remove trailing semicolons

embedding: empty enum replaces c_void
 2014-11-14 20:27:54 +05:30
Ms2ger
c0016c7438 Use Cell::as_unsafe_cell in Reflector::rootable. 2014-11-14 11:56:00 +01:00
bors-servo
85a2f0b66a auto merge of #3953 : neojski/servo/implement-HTMLIFrameElement.contentDocument, r=jdm 
Because of #2122 I cannot write test for this right now because it will be failing randomly due to that iframe issue. However, if it doesn't fail due to that issue a test like this:

```html
<html>
  <head>
    <meta charset="utf8" />
    <script src="harness.js"></script>
    <title>Iframe contentDocument test.</title>
  </head>
  <body>
    <iframe src="test_iframe_contentDocument_inner.html" id="iframe"></iframe>
    <script>
      waitForExplicitFinish();

      var timeout = 100;
      var iframe = document.getElementById('iframe');
      function test_contentWindow() {
        if (!iframe.contentWindow) {
          // Iframe not loaded yet, try again.
          // No load event for iframe, insert bug number here.
          setTimeout(test_contentWindow, timeout);
          return;
        }
        is(iframe.contentDocument.getElementById('test').textContent, 'value');
        finish();
      }
      test_contentWindow();
    </script>
  </body>
</html>
```
where inner is simply:
```html
<html><body><div id="test">value</div></body></html>
```
passes.

I have added `SameOrigin` method to the `UrlHelper`. I wanted to reuse it in [`constellation.rs` same_script check](f0184a2d01/components/compositing/constellation.rs (L625)) but I it didn't want to compile saying

```
error: unresolved import `dom::urlhelper::UrlHelper`. Maybe a missing `extern crate dom`?
```

So I didn't include it in this PR for now.

There is more discussion about the cross origin iframes in [another issue](https://github.com/servo/servo/issues/3939). In this PR I just added same origin check.
 2014-11-13 23:54:28 -07:00
Tomasz Kołodziejski
fb8a45c58d Iframe resource file moved to resources dir so it's not picked up by test harness (and does not fail). 2014-11-13 22:45:55 -08:00
Tomasz Kołodziejski
af30484f2a Add contentDocument support for HTMLIFrameElement. Fixes #3808. 2014-11-13 22:45:46 -08:00
bors-servo
10cd7728ff auto merge of #3973 : Manishearth/servo/301-fix, r=jdm 2014-11-13 17:45:29 -07:00
bors-servo
99fc4ab634 auto merge of #3947 : zmike/servo/embedding-string_map, r=jdm 
implements a string map which is 100% identical to CEF

r+ @larsbergstrom  @jdm
 2014-11-13 17:06:30 -07:00
bors-servo
1773198e8d auto merge of #3946 : zmike/servo/embedding-fixups, r=jdm 
adds a missing string api function and renames an existing string_list function

r+ @larsbergstrom @jdm ?
 2014-11-13 16:00:40 -07:00
Mike Blumenkrantz
2df8125985 embedding: fix conflicts from rustup 2014-11-13 16:35:38 -05:00
bors-servo
8cb2b922ef auto merge of #3971 : SimonSapin/servo/cargo-https, r=Ms2ger 
Download from https://static-rust-lang-org.s3.amazonaws.com, which apparently does not require SNI? This bypasses the CloudFront CDN and goes to directly to S3.

CC @brson
 2014-11-13 14:24:45 -07:00
Manish Goregaokar
cdddf6465c Remove unused arguments from LoadComplete and LoadCompleteMsg 2014-11-14 02:14:00 +05:30
Manish Goregaokar
d5f1bb2df5 Don't overwrite redirected URL in script_task (fixes #3970) 2014-11-14 02:10:04 +05:30
Mike Blumenkrantz
2d4c6a1d1c embedding: address most recent critic review 2014-11-13 15:07:41 -05:00
Mike Blumenkrantz
19c80b1741 embedding: replace all occurrences of slicing to &str with slice_to_str() 2014-11-13 14:41:13 -05:00
Mike Blumenkrantz
7ba1150943 embedding: add eutil::slice_to_str() convenience function 
converts a *u8+length to &str and returns c_int
 2014-11-13 14:38:54 -05:00
Mike Blumenkrantz
c813df777e embedding: address various review nitpicks for string_map 2014-11-13 14:37:56 -05:00
Mike Blumenkrantz
3d0d004887 embedding: replace transmutes with manual casts in cef_string_utf8_cmp() 2014-11-13 13:49:12 -05:00
bors-servo
c713bf4724 auto merge of #3969 : mbrubeck/servo/android-html5-cargo, r=larsbergstrom 
Fixes a build error.
 2014-11-13 11:30:35 -07:00
Matt Brubeck
b879fb30b8 Update html5ever ref in Android Cargo.lock 2014-11-13 10:17:56 -08:00
Simon Sapin
1a684f8279 Download Cargo over HTTPS. Fix #3582. 2014-11-13 18:13:39 +00:00
bors-servo
2ffa845cf4 auto merge of #3585 : jdm/servo/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.
 2014-11-13 10:57:33 -07:00
Josh Matthews
c23edf6f5a Short-circuit initFooEvent while dispatching events. 2014-11-13 12:53:54 -05:00
Keegan McAllister
642a3592c7 Fix interfaces test 2014-11-13 12:53:54 -05:00
Josh Matthews
89a27dd11a More documentation. 2014-11-13 12:53:54 -05:00
Josh Matthews
cbed5da9fa Flush layout after executing timers. 2014-11-13 12:53:54 -05:00
Josh Matthews
80764f65e3 Add single-line text input with no visible cursor. 2014-11-13 12:53:54 -05:00
Josh Matthews
84bc17e7ad Implement document focus context and hook it up to click events. 2014-11-13 11:27:15 -05:00
Josh Matthews
329ba56fca Dispatch keydown, keyup, and keypress events at appropriate times. 2014-11-13 11:27:15 -05:00
Josh Matthews
e999843183 Fill in KeyboardEvent. 2014-11-13 11:24:14 -05:00
Josh Matthews
bb7074698a Add KeyboardEvent stub. 2014-11-13 11:24:14 -05:00
Josh Matthews
1c64dabb15 Pass all key events to the current constellation frame. 2014-11-13 11:24:14 -05:00
bors-servo
c5e1b0d32e auto merge of #3948 : servo/servo/rustup-20141105_2, r=Manishearth 2014-11-12 20:48:31 -07:00
Glenn Watson
167a01edc0 Disable event-timeout for rustc upgrade. See #3396. 2014-11-13 13:06:54 +10:00
Glenn Watson
0a0b4c657c Rebase and fix up compile errors for rust upgrade. 2014-11-13 11:25:19 +10:00
Glenn Watson
fe662bbf23 Disable cors tests for now as they break the rust upgrade. 2014-11-13 11:17:44 +10:00
Glenn Watson
532be69cef Fix CEF build cargo.lock file 2014-11-13 11:17:43 +10:00