Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add low-level bindings to Hubbub

Browse source
This commit is contained in:
Patrick Walton 2012-08-22 11:51:42 -07:00
parent 754deea2d9
commit 033bbbf7a0
6 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -40,4 +40,7 @@
[submodule "src/servo-sandbox"] [submodule "src/servo-sandbox"]
path = src/servo-sandbox path = src/servo-sandbox
url = git://github.com/pcwalton/servo-sandbox.git url = git://github.com/pcwalton/servo-sandbox.git
[submodule "src/rust-hubbub"]
path = src/rust-hubbub
url = git://github.com/pcwalton/rust-hubbub.git

5
Makefile.in
View file

@ -28,6 +28,7 @@ RUSTLIBS = \
-L src/rust-glut \ -L src/rust-glut \
-L src/rust-layers \ -L src/rust-layers \
-L src/rust-http-client \ -L src/rust-http-client \
-L src/rust-hubbub \
$(NULL) $(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -72,6 +73,7 @@ SERVO_DEPS += \
src/libparserutils/libparserutils.dummy \ src/libparserutils/libparserutils.dummy \
src/libhubbub/libhubbub.dummy \ src/libhubbub/libhubbub.dummy \
src/servo-sandbox/servo-sandbox.dummy \ src/servo-sandbox/servo-sandbox.dummy \
src/rust-hubbub/librusthubbub.dummy \
$(NULL) $(NULL)
CHECK_DEPS += \ CHECK_DEPS += \
@ -202,6 +204,9 @@ src/libhubbub/libhubbub.dummy:
src/servo-sandbox/servo-sandbox.dummy: src/servo-sandbox/servo-sandbox.dummy:
$(MAKE) -C src/servo-sandbox $(MAKE) -C src/servo-sandbox
src/rust-hubbub/librusthubbub.dummy:
$(MAKE) -C src/rust-hubbub
# Testing targets # Testing targets

2
configure.in
View file

@ -17,6 +17,7 @@ mkdir -p src/rust-http-client || exit $?
mkdir -p src/libparserutils || exit $? mkdir -p src/libparserutils || exit $?
mkdir -p src/libhubbub || exit $? mkdir -p src/libhubbub || exit $?
mkdir -p src/servo-sandbox || exit $? mkdir -p src/servo-sandbox || exit $?
mkdir -p src/rust-hubbub || exit $?
mkdir -p src/test/ref || exit $? mkdir -p src/test/ref || exit $?
@ -34,3 +35,4 @@ mkdir -p src/test/ref || exit $?
(cd src/libparserutils && sh ${SRCDIR}/src/libparserutils/configure) || exit $? (cd src/libparserutils && sh ${SRCDIR}/src/libparserutils/configure) || exit $?
(cd src/libhubbub && sh ${SRCDIR}/src/libhubbub/configure) || exit $? (cd src/libhubbub && sh ${SRCDIR}/src/libhubbub/configure) || exit $?
(cd src/servo-sandbox && sh ${SRCDIR}/src/servo-sandbox/configure) || exit $? (cd src/servo-sandbox && sh ${SRCDIR}/src/servo-sandbox/configure) || exit $?
(cd src/rust-hubbub && sh ${SRCDIR}/src/rust-hubbub/configure) || exit $?

1
src/rust-hubbub Submodule

@ -0,0 +1 @@
Subproject commit 599b086aa5219e6d5306939fc306a1ee300f21e5

2
src/servo-sandbox

@ -1 +1 @@
Subproject commit c1a3cd94ee7ea21d27b9a90d1576417dc3d8edbf Subproject commit 4fc86aceb448ebb9658664e60e8ffdb1d5e3c989

4
src/servo/content/content_task.rs
View file

@ -128,9 +128,13 @@ struct Content<C:Compositor> {
let stream = spawn_html_lexer_task(copy url, self.resource_task); let stream = spawn_html_lexer_task(copy url, self.resource_task);
let (root, style_port, js_port) = build_dom(self.scope, stream, url, let (root, style_port, js_port) = build_dom(self.scope, stream, url,
self.resource_task); self.resource_task);
let css_rules = style_port.recv(); let css_rules = style_port.recv();
let js_scripts = js_port.recv(); let js_scripts = js_port.recv();
let css_rules = ~[];
let js_scripts = ~[];
// Apply the css rules to the dom tree: // Apply the css rules to the dom tree:
#debug["css_rules: %?", css_rules]; #debug["css_rules: %?", css_rules];