From 7caa209039b5765138020ba4a34c9575392e49f5 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 13 May 2013 21:27:29 -0700 Subject: [PATCH] Organize all the source files into compiler/, components/, and platform/. --- .gitmodules | 116 +++++++++--------- Makefile.in | 76 +++++++----- configure | 65 +++++++--- mk/check.mk | 4 +- mk/clean.mk | 16 +-- mk/sub.mk | 1 + src/README.md | 100 ++++++++------- src/compiler/rust | 1 + .../contenttest/contenttest.rs | 0 src/{ => components}/reftest/rasterize.py | 0 src/{ => components}/reftest/reftest.rs | 0 src/{ => components}/servo-gfx/color.rs | 0 src/{ => components}/servo-gfx/compositor.rs | 0 .../servo-gfx/display_list.rs | 0 src/{ => components}/servo-gfx/font.rs | 0 .../servo-gfx/font_context.rs | 0 src/{ => components}/servo-gfx/font_list.rs | 10 +- .../servo-gfx/freetype_impl/font_context.rs | 0 src/{ => components}/servo-gfx/geometry.rs | 0 src/{ => components}/servo-gfx/native.rs | 0 src/{ => components}/servo-gfx/opts.rs | 0 .../servo-gfx/platform/linux/font.rs | 0 .../servo-gfx/platform/linux/font_context.rs | 0 .../servo-gfx/platform/linux/font_list.rs | 0 .../servo-gfx/platform/macos/font.rs | 0 .../servo-gfx/platform/macos/font_context.rs | 0 .../servo-gfx/platform/macos/font_list.rs | 2 +- .../servo-gfx/platform/mod.rs | 0 .../servo-gfx/render_context.rs | 0 .../servo-gfx/render_layers.rs | 0 src/{ => components}/servo-gfx/render_task.rs | 0 src/{ => components}/servo-gfx/servo_gfx.rc | 0 src/{ => components}/servo-gfx/surface.rs | 0 src/{ => components}/servo-gfx/text/glyph.rs | 22 ++-- src/{ => components}/servo-gfx/text/mod.rs | 0 src/{ => components}/servo-gfx/text/shaper.rs | 0 .../servo-gfx/text/shaping/harfbuzz.rs | 13 +- .../servo-gfx/text/shaping/mod.rs | 0 .../servo-gfx/text/text_run.rs | 12 +- src/{ => components}/servo-gfx/text/util.rs | 16 +-- src/{ => components}/servo-net/file_loader.rs | 0 src/{ => components}/servo-net/http_loader.rs | 0 src/{ => components}/servo-net/image/base.rs | 0 .../servo-net/image/holder.rs | 0 .../servo-net/image/test.jpeg | Bin .../servo-net/image_cache_task.rs | 3 +- .../servo-net/local_image_cache.rs | 0 .../servo-net/resource_task.rs | 0 src/{ => components}/servo-net/servo_net.rc | 0 src/{ => components}/servo-net/util.rs | 0 src/{ => components}/servo-util/cache.rs | 0 src/{ => components}/servo-util/range.rs | 10 +- src/{ => components}/servo-util/servo_util.rc | 0 src/{ => components}/servo-util/time.rs | 0 src/{ => components}/servo-util/tree.rs | 6 +- src/{ => components}/servo-util/url.rs | 28 ++--- src/{ => components}/servo-util/vec.rs | 0 src/{ => components}/servo/compositing/mod.rs | 2 +- .../servo/compositing/resize_rate_limiter.rs | 0 .../servo/content/content_task.rs | 5 +- src/{ => components}/servo/content/jsnames.rs | 0 src/{ => components}/servo/css/matching.rs | 0 src/{ => components}/servo/css/node_style.rs | 0 src/{ => components}/servo/css/node_util.rs | 0 .../servo/css/node_void_ptr.rs | 0 src/{ => components}/servo/css/select.rs | 0 .../servo/css/select_handler.rs | 0 .../servo/dom/bindings/clientrect.rs | 0 .../servo/dom/bindings/clientrectlist.rs | 0 .../servo/dom/bindings/codegen/BindingGen.py | 0 .../dom/bindings/codegen/BindingUtils.cpp | 0 .../servo/dom/bindings/codegen/BindingUtils.h | 0 .../servo/dom/bindings/codegen/Bindings.conf | 0 .../dom/bindings/codegen/ClientRect.webidl | 0 .../bindings/codegen/ClientRectList.webidl | 0 .../servo/dom/bindings/codegen/Codegen.py | 0 .../servo/dom/bindings/codegen/CodegenRust.py | 0 .../dom/bindings/codegen/Configuration.py | 0 .../servo/dom/bindings/codegen/DOMJSClass.h | 0 .../bindings/codegen/DOMJSProxyHandler.cpp | 0 .../dom/bindings/codegen/DOMJSProxyHandler.h | 0 .../dom/bindings/codegen/DOMParser.webidl | 0 .../servo/dom/bindings/codegen/ErrorResult.h | 0 .../servo/dom/bindings/codegen/Errors.msg | 0 .../servo/dom/bindings/codegen/Event.webidl | 0 .../dom/bindings/codegen/EventTarget.webidl | 0 .../codegen/GenerateCSS2PropertiesWebIDL.py | 0 .../servo/dom/bindings/codegen/GlobalGen.py | 0 .../bindings/codegen/HTMLCollection.webidl | 0 .../servo/dom/bindings/codegen/Makefile.in | 0 .../servo/dom/bindings/codegen/Nullable.h | 0 .../bindings/codegen/PrimitiveConversions.h | 0 .../dom/bindings/codegen/RegisterBindings.cpp | 0 .../dom/bindings/codegen/RegisterBindings.h | 0 .../servo/dom/bindings/codegen/TypedArray.h | 0 .../bindings/codegen/crashtests/769464.html | 0 .../codegen/crashtests/crashtests.list | 0 .../servo/dom/bindings/codegen/parser/README | 0 .../dom/bindings/codegen/parser/UPSTREAM | 0 .../dom/bindings/codegen/parser/WebIDL.py | 0 .../dom/bindings/codegen/parser/runtests.py | 0 .../codegen/parser/tests/test_any_null.py | 0 .../test_argument_identifier_conflicts.py | 0 .../parser/tests/test_argument_novoid.py | 0 .../parser/tests/test_array_of_interface.py | 0 .../codegen/parser/tests/test_arraybuffer.py | 0 .../codegen/parser/tests/test_attr.py | 0 .../parser/tests/test_attr_sequence_type.py | 0 .../parser/tests/test_builtin_filename.py | 0 .../codegen/parser/tests/test_builtins.py | 0 .../codegen/parser/tests/test_callback.py | 0 .../parser/tests/test_callback_interface.py | 0 .../codegen/parser/tests/test_const.py | 0 .../codegen/parser/tests/test_constructor.py | 0 .../test_constructor_no_interface_object.py | 0 .../codegen/parser/tests/test_deduplicate.py | 0 .../codegen/parser/tests/test_dictionary.py | 0 .../parser/tests/test_distinguishability.py | 0 .../codegen/parser/tests/test_double_null.py | 0 .../parser/tests/test_duplicate_qualifiers.py | 0 .../codegen/parser/tests/test_empty_enum.py | 0 .../codegen/parser/tests/test_enum.py | 0 .../tests/test_enum_duplicate_values.py | 0 .../codegen/parser/tests/test_error_colno.py | 0 .../codegen/parser/tests/test_error_lineno.py | 0 .../parser/tests/test_extended_attributes.py | 0 .../codegen/parser/tests/test_forward_decl.py | 0 .../codegen/parser/tests/test_implements.py | 0 .../parser/tests/test_incomplete_parent.py | 0 .../parser/tests/test_incomplete_types.py | 0 .../codegen/parser/tests/test_interface.py | 0 ...st_interface_const_identifier_conflicts.py | 0 ...ace_identifier_conflicts_across_members.py | 0 .../codegen/parser/tests/test_method.py | 0 .../parser/tests/test_nullable_equivalency.py | 0 .../parser/tests/test_nullable_void.py | 0 .../parser/tests/test_optional_constraints.py | 0 .../codegen/parser/tests/test_overload.py | 0 .../codegen/parser/tests/test_sanity.py | 0 .../test_special_method_signature_mismatch.py | 0 .../parser/tests/test_special_methods.py | 0 .../tests/test_special_methods_uniqueness.py | 0 .../tests/test_treatNonCallableAsNull.py | 0 .../codegen/parser/tests/test_typedef.py | 0 .../codegen/parser/tests/test_union.py | 0 .../codegen/parser/tests/test_union_any.py | 0 .../parser/tests/test_union_nullable.py | 0 .../parser/tests/test_variadic_callback.py | 0 .../parser/tests/test_variadic_constraints.py | 0 .../servo/dom/bindings/codegen/ply/COPYING | 0 .../servo/dom/bindings/codegen/ply/README | 0 .../dom/bindings/codegen/ply/ply/__init__.py | 0 .../servo/dom/bindings/codegen/ply/ply/lex.py | 0 .../dom/bindings/codegen/ply/ply/yacc.py | 0 .../servo/dom/bindings/codegen/pythonpath.py | 0 .../codegen/stubgenerator/Skeleton.cpp | 0 .../bindings/codegen/stubgenerator/Skeleton.h | 0 .../codegen/stubgenerator/generate.sh | 0 .../dom/bindings/codegen/test/Makefile.in | 0 .../bindings/codegen/test/TestBindingHeader.h | 0 .../bindings/codegen/test/TestCodeGen.webidl | 0 .../codegen/test/TestDictionary.webidl | 0 .../bindings/codegen/test/TestTypedef.webidl | 0 .../bindings/codegen/test/file_bug775543.html | 0 .../bindings/codegen/test/forOf_iframe.html | 0 .../codegen/test/test_InstanceOf.html | 0 .../bindings/codegen/test/test_bug773326.html | 0 .../bindings/codegen/test/test_bug775543.html | 0 .../bindings/codegen/test/test_bug788369.html | 0 .../dom/bindings/codegen/test/test_enums.html | 0 .../dom/bindings/codegen/test/test_forOf.html | 0 .../bindings/codegen/test/test_integers.html | 0 .../codegen/test/test_interfaceToString.html | 0 .../codegen/test/test_lookupGetter.html | 0 .../codegen/test/test_sequence_wrapping.html | 0 .../codegen/test/test_traceProtos.html | 0 .../servo/dom/bindings/conversions.rs | 0 .../servo/dom/bindings/document.rs | 0 .../servo/dom/bindings/domparser.rs | 0 .../servo/dom/bindings/element.rs | 0 .../servo/dom/bindings/event.rs | 0 .../servo/dom/bindings/eventtarget.rs | 0 .../servo/dom/bindings/htmlcollection.rs | 0 .../servo/dom/bindings/node.rs | 0 .../servo/dom/bindings/proxyhandler.rs | 0 .../servo/dom/bindings/text.rs | 0 .../servo/dom/bindings/utils.rs | 0 .../servo/dom/bindings/window.rs | 0 .../servo/dom/characterdata.rs | 0 src/{ => components}/servo/dom/clientrect.rs | 0 .../servo/dom/clientrectlist.rs | 0 src/{ => components}/servo/dom/document.rs | 0 src/{ => components}/servo/dom/domparser.rs | 0 src/{ => components}/servo/dom/element.rs | 0 src/{ => components}/servo/dom/event.rs | 0 src/{ => components}/servo/dom/eventtarget.rs | 0 .../servo/dom/htmlcollection.rs | 0 src/{ => components}/servo/dom/node.rs | 0 src/{ => components}/servo/dom/window.rs | 0 src/{ => components}/servo/engine.rs | 0 src/{ => components}/servo/html/cssparse.rs | 0 .../servo/html/hubbub_html_parser.rs | 0 src/{ => components}/servo/image.rs | 0 src/{ => components}/servo/layout/aux.rs | 0 src/{ => components}/servo/layout/block.rs | 0 src/{ => components}/servo/layout/box.rs | 2 +- .../servo/layout/box_builder.rs | 0 src/{ => components}/servo/layout/context.rs | 0 src/{ => components}/servo/layout/debug.rs | 0 .../servo/layout/display_list_builder.rs | 0 src/{ => components}/servo/layout/flow.rs | 9 +- src/{ => components}/servo/layout/inline.rs | 45 ++++--- .../servo/layout/layout_task.rs | 0 src/{ => components}/servo/layout/text.rs | 0 src/{ => components}/servo/macros.rs | 0 .../servo/platform/common/glut_windowing.rs | 0 .../platform/common/shared_gl_windowing.rs | 0 src/{ => components}/servo/platform/mod.rs | 0 src/{ => components}/servo/servo.rc | 0 src/{ => components}/servo/util/mod.rs | 0 src/{ => components}/servo/util/task.rs | 0 src/{ => components}/servo/windowing.rs | 0 src/{ => etc}/patches/README | 0 src/{ => etc}/patches/mozjs-stack-bounds.diff | 0 src/libcss | 1 - src/libhubbub | 1 - src/{ => platform/linux}/rust-fontconfig | 0 src/platform/linux/rust-freetype | 1 + src/platform/linux/rust-xlib | 1 + src/platform/macos/rust-cocoa | 1 + src/platform/macos/rust-core-foundation | 1 + src/{ => platform/macos}/rust-core-graphics | 0 src/platform/macos/rust-core-text | 1 + src/{ => platform/macos}/rust-io-surface | 0 src/rust | 1 - src/rust-azure | 1 - src/rust-cocoa | 1 - src/rust-core-foundation | 1 - src/rust-core-text | 1 - src/rust-freetype | 1 - src/rust-glut | 1 - src/rust-hubbub | 1 - src/rust-layers | 1 - src/rust-netsurfcss | 1 - src/rust-opengles | 1 - src/rust-wapcaplet | 1 - src/rust-xlib | 1 - src/support/azure/rust-azure | 1 + src/{ => support/css}/rust-css | 0 src/{ => support/geom}/rust-geom | 0 src/support/glut/rust-glut | 1 + src/{ => support/harfbuzz}/rust-harfbuzz | 0 .../http-client}/rust-http-client | 0 src/support/hubbub/libhubbub | 1 + src/support/hubbub/rust-hubbub | 1 + src/support/layers/rust-layers | 1 + .../libparserutils}/libparserutils | 0 src/support/netsurfcss/libcss | 1 + src/support/netsurfcss/rust-netsurfcss | 1 + src/support/opengles/rust-opengles | 1 + src/{ => support/sharegl}/sharegl | 0 src/{ => support/skia}/skia | 0 src/{ => support/spidermonkey}/mozjs | 0 src/{ => support/spidermonkey}/rust-mozjs | 0 src/{ => support/stb-image}/rust-stb-image | 0 src/{ => support/wapcaplet}/libwapcaplet | 0 src/support/wapcaplet/rust-wapcaplet | 1 + 267 files changed, 349 insertions(+), 244 deletions(-) create mode 160000 src/compiler/rust rename src/{ => components}/contenttest/contenttest.rs (100%) rename src/{ => components}/reftest/rasterize.py (100%) rename src/{ => components}/reftest/reftest.rs (100%) rename src/{ => components}/servo-gfx/color.rs (100%) rename src/{ => components}/servo-gfx/compositor.rs (100%) rename src/{ => components}/servo-gfx/display_list.rs (100%) rename src/{ => components}/servo-gfx/font.rs (100%) rename src/{ => components}/servo-gfx/font_context.rs (100%) rename src/{ => components}/servo-gfx/font_list.rs (95%) rename src/{ => components}/servo-gfx/freetype_impl/font_context.rs (100%) rename src/{ => components}/servo-gfx/geometry.rs (100%) rename src/{ => components}/servo-gfx/native.rs (100%) rename src/{ => components}/servo-gfx/opts.rs (100%) rename src/{ => components}/servo-gfx/platform/linux/font.rs (100%) rename src/{ => components}/servo-gfx/platform/linux/font_context.rs (100%) rename src/{ => components}/servo-gfx/platform/linux/font_list.rs (100%) rename src/{ => components}/servo-gfx/platform/macos/font.rs (100%) rename src/{ => components}/servo-gfx/platform/macos/font_context.rs (100%) rename src/{ => components}/servo-gfx/platform/macos/font_list.rs (98%) rename src/{ => components}/servo-gfx/platform/mod.rs (100%) rename src/{ => components}/servo-gfx/render_context.rs (100%) rename src/{ => components}/servo-gfx/render_layers.rs (100%) rename src/{ => components}/servo-gfx/render_task.rs (100%) rename src/{ => components}/servo-gfx/servo_gfx.rc (100%) rename src/{ => components}/servo-gfx/surface.rs (100%) rename src/{ => components}/servo-gfx/text/glyph.rs (98%) rename src/{ => components}/servo-gfx/text/mod.rs (100%) rename src/{ => components}/servo-gfx/text/shaper.rs (100%) rename src/{ => components}/servo-gfx/text/shaping/harfbuzz.rs (98%) rename src/{ => components}/servo-gfx/text/shaping/mod.rs (100%) rename src/{ => components}/servo-gfx/text/text_run.rs (96%) rename src/{ => components}/servo-gfx/text/util.rs (93%) rename src/{ => components}/servo-net/file_loader.rs (100%) rename src/{ => components}/servo-net/http_loader.rs (100%) rename src/{ => components}/servo-net/image/base.rs (100%) rename src/{ => components}/servo-net/image/holder.rs (100%) rename src/{ => components}/servo-net/image/test.jpeg (100%) rename src/{ => components}/servo-net/image_cache_task.rs (99%) rename src/{ => components}/servo-net/local_image_cache.rs (100%) rename src/{ => components}/servo-net/resource_task.rs (100%) rename src/{ => components}/servo-net/servo_net.rc (100%) rename src/{ => components}/servo-net/util.rs (100%) rename src/{ => components}/servo-util/cache.rs (100%) rename src/{ => components}/servo-util/range.rs (94%) rename src/{ => components}/servo-util/servo_util.rc (100%) rename src/{ => components}/servo-util/time.rs (100%) rename src/{ => components}/servo-util/tree.rs (97%) rename src/{ => components}/servo-util/url.rs (82%) rename src/{ => components}/servo-util/vec.rs (100%) rename src/{ => components}/servo/compositing/mod.rs (99%) rename src/{ => components}/servo/compositing/resize_rate_limiter.rs (100%) rename src/{ => components}/servo/content/content_task.rs (99%) rename src/{ => components}/servo/content/jsnames.rs (100%) rename src/{ => components}/servo/css/matching.rs (100%) rename src/{ => components}/servo/css/node_style.rs (100%) rename src/{ => components}/servo/css/node_util.rs (100%) rename src/{ => components}/servo/css/node_void_ptr.rs (100%) rename src/{ => components}/servo/css/select.rs (100%) rename src/{ => components}/servo/css/select_handler.rs (100%) rename src/{ => components}/servo/dom/bindings/clientrect.rs (100%) rename src/{ => components}/servo/dom/bindings/clientrectlist.rs (100%) rename src/{ => components}/servo/dom/bindings/codegen/BindingGen.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/BindingUtils.cpp (100%) rename src/{ => components}/servo/dom/bindings/codegen/BindingUtils.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/Bindings.conf (100%) rename src/{ => components}/servo/dom/bindings/codegen/ClientRect.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/ClientRectList.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/Codegen.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/CodegenRust.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/Configuration.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/DOMJSClass.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp (100%) rename src/{ => components}/servo/dom/bindings/codegen/DOMJSProxyHandler.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/DOMParser.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/ErrorResult.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/Errors.msg (100%) rename src/{ => components}/servo/dom/bindings/codegen/Event.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/EventTarget.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/GlobalGen.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/HTMLCollection.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/Makefile.in (100%) rename src/{ => components}/servo/dom/bindings/codegen/Nullable.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/PrimitiveConversions.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/RegisterBindings.cpp (100%) rename src/{ => components}/servo/dom/bindings/codegen/RegisterBindings.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/TypedArray.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/crashtests/769464.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/crashtests/crashtests.list (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/README (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/UPSTREAM (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/WebIDL.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/runtests.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_any_null.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_attr.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_builtins.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_callback.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_const.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_constructor.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_dictionary.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_double_null.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_enum.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_error_colno.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_implements.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_interface.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_method.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_overload.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_sanity.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_special_methods.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_typedef.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_union.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_union_any.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/ply/COPYING (100%) rename src/{ => components}/servo/dom/bindings/codegen/ply/README (100%) rename src/{ => components}/servo/dom/bindings/codegen/ply/ply/__init__.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/ply/ply/lex.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/ply/ply/yacc.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/pythonpath.py (100%) rename src/{ => components}/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp (100%) rename src/{ => components}/servo/dom/bindings/codegen/stubgenerator/Skeleton.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/stubgenerator/generate.sh (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/Makefile.in (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/TestBindingHeader.h (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/TestCodeGen.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/TestDictionary.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/TestTypedef.webidl (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/file_bug775543.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/forOf_iframe.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_InstanceOf.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_bug773326.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_bug775543.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_bug788369.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_enums.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_forOf.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_integers.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_interfaceToString.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_lookupGetter.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_sequence_wrapping.html (100%) rename src/{ => components}/servo/dom/bindings/codegen/test/test_traceProtos.html (100%) rename src/{ => components}/servo/dom/bindings/conversions.rs (100%) rename src/{ => components}/servo/dom/bindings/document.rs (100%) rename src/{ => components}/servo/dom/bindings/domparser.rs (100%) rename src/{ => components}/servo/dom/bindings/element.rs (100%) rename src/{ => components}/servo/dom/bindings/event.rs (100%) rename src/{ => components}/servo/dom/bindings/eventtarget.rs (100%) rename src/{ => components}/servo/dom/bindings/htmlcollection.rs (100%) rename src/{ => components}/servo/dom/bindings/node.rs (100%) rename src/{ => components}/servo/dom/bindings/proxyhandler.rs (100%) rename src/{ => components}/servo/dom/bindings/text.rs (100%) rename src/{ => components}/servo/dom/bindings/utils.rs (100%) rename src/{ => components}/servo/dom/bindings/window.rs (100%) rename src/{ => components}/servo/dom/characterdata.rs (100%) rename src/{ => components}/servo/dom/clientrect.rs (100%) rename src/{ => components}/servo/dom/clientrectlist.rs (100%) rename src/{ => components}/servo/dom/document.rs (100%) rename src/{ => components}/servo/dom/domparser.rs (100%) rename src/{ => components}/servo/dom/element.rs (100%) rename src/{ => components}/servo/dom/event.rs (100%) rename src/{ => components}/servo/dom/eventtarget.rs (100%) rename src/{ => components}/servo/dom/htmlcollection.rs (100%) rename src/{ => components}/servo/dom/node.rs (100%) rename src/{ => components}/servo/dom/window.rs (100%) rename src/{ => components}/servo/engine.rs (100%) rename src/{ => components}/servo/html/cssparse.rs (100%) rename src/{ => components}/servo/html/hubbub_html_parser.rs (100%) rename src/{ => components}/servo/image.rs (100%) rename src/{ => components}/servo/layout/aux.rs (100%) rename src/{ => components}/servo/layout/block.rs (100%) rename src/{ => components}/servo/layout/box.rs (100%) rename src/{ => components}/servo/layout/box_builder.rs (100%) rename src/{ => components}/servo/layout/context.rs (100%) rename src/{ => components}/servo/layout/debug.rs (100%) rename src/{ => components}/servo/layout/display_list_builder.rs (100%) rename src/{ => components}/servo/layout/flow.rs (98%) rename src/{ => components}/servo/layout/inline.rs (96%) rename src/{ => components}/servo/layout/layout_task.rs (100%) rename src/{ => components}/servo/layout/text.rs (100%) rename src/{ => components}/servo/macros.rs (100%) rename src/{ => components}/servo/platform/common/glut_windowing.rs (100%) rename src/{ => components}/servo/platform/common/shared_gl_windowing.rs (100%) rename src/{ => components}/servo/platform/mod.rs (100%) rename src/{ => components}/servo/servo.rc (100%) rename src/{ => components}/servo/util/mod.rs (100%) rename src/{ => components}/servo/util/task.rs (100%) rename src/{ => components}/servo/windowing.rs (100%) rename src/{ => etc}/patches/README (100%) rename src/{ => etc}/patches/mozjs-stack-bounds.diff (100%) delete mode 160000 src/libcss delete mode 160000 src/libhubbub rename src/{ => platform/linux}/rust-fontconfig (100%) create mode 160000 src/platform/linux/rust-freetype create mode 160000 src/platform/linux/rust-xlib create mode 160000 src/platform/macos/rust-cocoa create mode 160000 src/platform/macos/rust-core-foundation rename src/{ => platform/macos}/rust-core-graphics (100%) create mode 160000 src/platform/macos/rust-core-text rename src/{ => platform/macos}/rust-io-surface (100%) delete mode 160000 src/rust delete mode 160000 src/rust-azure delete mode 160000 src/rust-cocoa delete mode 160000 src/rust-core-foundation delete mode 160000 src/rust-core-text delete mode 160000 src/rust-freetype delete mode 160000 src/rust-glut delete mode 160000 src/rust-hubbub delete mode 160000 src/rust-layers delete mode 160000 src/rust-netsurfcss delete mode 160000 src/rust-opengles delete mode 160000 src/rust-wapcaplet delete mode 160000 src/rust-xlib create mode 160000 src/support/azure/rust-azure rename src/{ => support/css}/rust-css (100%) rename src/{ => support/geom}/rust-geom (100%) create mode 160000 src/support/glut/rust-glut rename src/{ => support/harfbuzz}/rust-harfbuzz (100%) rename src/{ => support/http-client}/rust-http-client (100%) create mode 160000 src/support/hubbub/libhubbub create mode 160000 src/support/hubbub/rust-hubbub create mode 160000 src/support/layers/rust-layers rename src/{ => support/libparserutils}/libparserutils (100%) create mode 160000 src/support/netsurfcss/libcss create mode 160000 src/support/netsurfcss/rust-netsurfcss create mode 160000 src/support/opengles/rust-opengles rename src/{ => support/sharegl}/sharegl (100%) rename src/{ => support/skia}/skia (100%) rename src/{ => support/spidermonkey}/mozjs (100%) rename src/{ => support/spidermonkey}/rust-mozjs (100%) rename src/{ => support/stb-image}/rust-stb-image (100%) rename src/{ => support/wapcaplet}/libwapcaplet (100%) create mode 160000 src/support/wapcaplet/rust-wapcaplet diff --git a/.gitmodules b/.gitmodules index 03888a05fbf..ba618f940f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,87 +1,87 @@ -[submodule "src/rust-azure"] - path = src/rust-azure +[submodule "src/support/azure/rust-azure"] + path = src/support/azure/rust-azure url = https://github.com/mozilla-servo/rust-azure.git -[submodule "src/rust-cocoa"] - path = src/rust-cocoa +[submodule "src/platform/macos/rust-cocoa"] + path = src/platform/macos/rust-cocoa url = https://github.com/mozilla-servo/rust-cocoa.git -[submodule "src/mozjs"] - path = src/mozjs +[submodule "src/support/spidermonkey/mozjs"] + path = src/support/spidermonkey/mozjs url = https://github.com/mozilla-servo/mozjs.git -[submodule "src/rust-mozjs"] - path = src/rust-mozjs +[submodule "src/support/spidermonkey/rust-mozjs"] + path = src/support/spidermonkey/rust-mozjs url = https://github.com/mozilla-servo/rust-mozjs.git -[submodule "src/rust-harfbuzz"] - path = src/rust-harfbuzz +[submodule "src/support/harfbuzz/rust-harfbuzz"] + path = src/support/harfbuzz/rust-harfbuzz url = https://github.com/mozilla-servo/rust-harfbuzz.git -[submodule "src/rust-stb-image"] - path = src/rust-stb-image +[submodule "src/support/stb-image/rust-stb-image"] + path = src/support/stb-image/rust-stb-image url = https://github.com/mozilla-servo/rust-stb-image.git -[submodule "src/rust-geom"] - path = src/rust-geom +[submodule "src/support/geom/rust-geom"] + path = src/support/geom/rust-geom url = https://github.com/mozilla-servo/rust-geom.git -[submodule "src/rust-opengles"] - path = src/rust-opengles +[submodule "src/support/opengles/rust-opengles"] + path = src/support/opengles/rust-opengles url = https://github.com/mozilla-servo/rust-opengles.git -[submodule "src/rust-glut"] - path = src/rust-glut +[submodule "src/support/glut/rust-glut"] + path = src/support/glut/rust-glut url = https://github.com/mozilla-servo/rust-glut.git -[submodule "src/rust-layers"] - path = src/rust-layers +[submodule "src/support/layers/rust-layers"] + path = src/support/layers/rust-layers url = https://github.com/mozilla-servo/rust-layers.git -[submodule "src/rust-http-client"] - path = src/rust-http-client +[submodule "src/support/http-client/rust-http-client"] + path = src/support/http-client/rust-http-client url = https://github.com/mozilla-servo/rust-http-client.git -[submodule "src/libhubbub"] - path = src/libhubbub +[submodule "src/support/hubbub/libhubbub"] + path = src/support/hubbub/libhubbub url = https://github.com/mozilla-servo/libhubbub.git -[submodule "src/libparserutils"] - path = src/libparserutils +[submodule "src/support/libparserutils/libparserutils"] + path = src/support/libparserutils/libparserutils url = https://github.com/mozilla-servo/libparserutils.git -[submodule "src/rust-hubbub"] - path = src/rust-hubbub +[submodule "src/support/hubbub/rust-hubbub"] + path = src/support/hubbub/rust-hubbub url = https://github.com/mozilla-servo/rust-hubbub.git -[submodule "src/rust-core-foundation"] - path = src/rust-core-foundation +[submodule "src/platform/macos/rust-core-foundation"] + path = src/platform/macos/rust-core-foundation url = https://github.com/mozilla-servo/rust-core-foundation.git -[submodule "src/rust-io-surface"] - path = src/rust-io-surface +[submodule "src/platform/macos/rust-io-surface"] + path = src/platform/macos/rust-io-surface url = https://github.com/mozilla-servo/rust-io-surface.git -[submodule "src/sharegl"] - path = src/sharegl +[submodule "src/support/sharegl/sharegl"] + path = src/support/sharegl/sharegl url = https://github.com/mozilla-servo/sharegl.git -[submodule "src/libwapcaplet"] - path = src/libwapcaplet +[submodule "src/support/wapcaplet/libwapcaplet"] + path = src/support/wapcaplet/libwapcaplet url = https://github.com/mozilla-servo/libwapcaplet.git -[submodule "src/libcss"] - path = src/libcss +[submodule "src/support/css/libcss"] + path = src/support/css/libcss url = https://github.com/mozilla-servo/libcss.git -[submodule "src/rust-netsurfcss"] - path = src/rust-netsurfcss +[submodule "src/support/netsurfcss/rust-netsurfcss"] + path = src/support/netsurfcss/rust-netsurfcss url = https://github.com/mozilla-servo/rust-netsurfcss.git -[submodule "src/rust-wapcaplet"] - path = src/rust-wapcaplet +[submodule "src/support/wapcaplet/rust-wapcaplet"] + path = src/support/wapcaplet/rust-wapcaplet url = https://github.com/mozilla-servo/rust-wapcaplet.git -[submodule "src/rust-core-graphics"] - path = src/rust-core-graphics +[submodule "src/platform/macos/rust-core-graphics"] + path = src/platform/macos/rust-core-graphics url = https://github.com/mozilla-servo/rust-core-graphics.git -[submodule "src/rust-core-text"] - path = src/rust-core-text +[submodule "src/platform/macos/rust-core-text"] + path = src/platform/macos/rust-core-text url = https://github.com/mozilla-servo/rust-core-text.git -[submodule "src/rust-freetype"] - path = src/rust-freetype +[submodule "src/platform/linux/rust-freetype"] + path = src/platform/linux/rust-freetype url = https://github.com/mozilla-servo/rust-freetype.git -[submodule "src/rust-fontconfig"] - path = src/rust-fontconfig +[submodule "src/platform/linux/rust-fontconfig"] + path = src/platform/linux/rust-fontconfig url = https://github.com/mozilla-servo/rust-fontconfig.git -[submodule "src/rust-xlib"] - path = src/rust-xlib +[submodule "src/platform/linux/rust-xlib"] + path = src/platform/linux/rust-xlib url = https://github.com/mozilla-servo/rust-xlib.git -[submodule "src/rust-css"] - path = src/rust-css +[submodule "src/support/css/rust-css"] + path = src/support/css/rust-css url = https://github.com/mozilla-servo/rust-css.git -[submodule "src/skia"] - path = src/skia +[submodule "src/support/skia/skia"] + path = src/support/skia/skia url = https://github.com/mozilla-servo/skia.git -[submodule "src/rust"] - path = src/rust +[submodule "src/compiler/rust"] + path = src/compiler/rust url = https://github.com/mozilla/rust.git diff --git a/Makefile.in b/Makefile.in index c1b1ac83e38..0864cdb595a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,10 +78,10 @@ $(S)config.stamp : $(S)configure $(S)Makefile.in # Build the compiler ifneq ($(CFG_LOCAL_RUSTC),1) $(CFG_RUSTC): - $(MAKE) -C "$(CFG_BUILD_DIR)src/rust" CFG_RUSTC_FLAGS="" RUSTFLAGS="" + $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CFG_RUSTC_FLAGS="" RUSTFLAGS="" clean-rust: - $(MAKE) -C "$(CFG_BUILD_DIR)src/rust" CFG_RUSTC_FLAGS="" RUSTFLAGS="" clean + $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CFG_RUSTC_FLAGS="" RUSTFLAGS="" clean else $(CFG_RUSTC): @@ -91,6 +91,13 @@ endif rust: $(CFG_RUSTC) +# Strip off submodule paths to determine "raw" submodule names. +SUBMODULES=$(shell echo $(CFG_SUBMODULES) | perl -p -e 's![A-Za-z0-9_-]+/!!g') + +# Define e.g. PATH_rust-io-surface = platform/macos/rust-io-surface +$(foreach submodule,$(CFG_SUBMODULES),\ +$(eval PATH_$(shell echo $(submodule) | perl -p -e 's![A-Za-z0-9_-]+/!!g') = $(submodule))) + define DEF_SUBMODULE_VARS #defaults @@ -106,29 +113,34 @@ endif # # We can't auto-compute this, because some modules have lib* prefix in # their name already, while others don't. -DONE_$(1) = $$(B)src/$(1)/lib*.dummy -DEPS_SUBMODULES += $(1) +DONE_$(1) = $$(B)src/$$(PATH_$(1))/lib*.dummy +DEPS_SUBMODULES += $$(PATH_$(1)) endef # these will get populated. DEPS_SUBMODULES = -$(foreach submodule,$(CFG_SUBMODULES),\ +$(foreach submodule,$(SUBMODULES),\ $(eval $(call DEF_SUBMODULE_VARS,$(submodule)))) +$(info $(DEPS_SUBMODULES)) + # include submodule dependencies configuration include $(S)mk/sub.mk # Define how to make submodule targets define DEF_SUBMODULE_RULES + +ENV_RLDFLAGS_$(1) = $$(foreach dep,$$(DEPS_$(1)),-L $$(B)src/$$(PATH_$$(dep))) + # variables that depend on dependency definitions from sub.mk! ENV_CFLAGS_$(1) = CFLAGS="$$(CFLAGS_$(1))" -ENV_RFLAGS_$(1) = RUSTFLAGS="$$(strip $$(CFG_RUSTC_FLAGS)) $$(addprefix -L $$(B)src/,$$(DEPS_$(1)))" +ENV_RFLAGS_$(1) = RUSTFLAGS="$$(strip $$(CFG_RUSTC_FLAGS)) $$(ENV_RLDFLAGS_$(1))" # use a rough approximation of submodule dependencies to trigger calling submodule make # whenever a submodule changes # TODO: this may be a bit brutish, but is there a better way? -ROUGH_DEPS_$(1)=$$(call rwildcard,$$(S)src/$(1),*h *c *cpp *rs *rc) +ROUGH_DEPS_$(1)=$$(call rwildcard,$$(S)src/$$(PATH_$(1)),*h *c *cpp *rs *rc) DONE_DEPS_$(1)=$$(foreach dep,$$(DEPS_$(1)),$$(DONE_$$(dep))) # the main target for a submodule # -- @@ -148,7 +160,7 @@ $$(DONE_$(1)) : $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1)) $$(RUSTC_DEP_$(1)) $$(Q) \ $$(ENV_CFLAGS_$(1)) \ $$(ENV_RFLAGS_$(1)) \ - $$(MAKE) -C $$(B)src/$(1) && touch $$(DONE_$(1)) + $$(MAKE) -C $$(B)src/$$(PATH_$(1)) && touch $$(DONE_$(1)) # main submodule target $(1) : $$(DONE_$(1)) @@ -156,38 +168,38 @@ $(1) : $$(DONE_$(1)) .NOTPARALLEL : $(1) endef -$(foreach submodule,$(CFG_SUBMODULES),\ +$(foreach submodule,$(SUBMODULES),\ $(eval $(call DEF_SUBMODULE_RULES,$(submodule)))) -DONE_SUBMODULES = $(foreach dep,$(DEPS_SUBMODULES),$(DONE_$(dep))) +DONE_SUBMODULES = $(foreach submodule,$(SUBMODULES),$(DONE_$(submodule))) RFLAGS_servo_util = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -SRC_servo_util = $(call rwildcard,$(S)src/servo-util/,*.rs) -CRATE_servo_util = $(S)src/servo-util/servo_util.rc -DONE_servo_util = $(B)src/servo-util/libservoutil.dummy +SRC_servo_util = $(call rwildcard,$(S)src/components/servo-util/,*.rs) +CRATE_servo_util = $(S)src/components/servo-util/servo_util.rc +DONE_servo_util = $(B)src/components/servo-util/libservoutil.dummy DEPS_servo_util = $(CRATE_servo_util) $(SRC_servo_util) $(DONE_SUBMODULES) -RFLAGS_servo_net = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-util -SRC_servo_net = $(call rwildcard,$(S)src/servo-net/,*.rs) -CRATE_servo_net = $(S)src/servo-net/servo_net.rc -DONE_servo_net = $(B)src/servo-net/libservonet.dummy +RFLAGS_servo_net = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-util +SRC_servo_net = $(call rwildcard,$(S)src/components/servo-net/,*.rs) +CRATE_servo_net = $(S)src/components/servo-net/servo_net.rc +DONE_servo_net = $(B)src/components/servo-net/libservonet.dummy DEPS_servo_net = $(CRATE_servo_net) $(SRC_servo_net) $(DONE_SUBMODULES) $(DONE_servo_util) -RFLAGS_servo_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-util -L $(B)src/servo-net -SRC_servo_gfx = $(call rwildcard,$(S)src/servo-gfx/,*.rs) -CRATE_servo_gfx = $(S)src/servo-gfx/servo_gfx.rc -DONE_servo_gfx = $(B)src/servo-gfx/libservogfx.dummy +RFLAGS_servo_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-util -L $(B)src/components/servo-net +SRC_servo_gfx = $(call rwildcard,$(S)src/components/servo-gfx/,*.rs) +CRATE_servo_gfx = $(S)src/components/servo-gfx/servo_gfx.rc +DONE_servo_gfx = $(B)src/components/servo-gfx/libservogfx.dummy DEPS_servo_gfx = $(CRATE_servo_gfx) $(SRC_servo_gfx) $(DONE_SUBMODULES) $(DONE_servo_util) $(DONE_servo_net) -RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-gfx -L $(B)src/servo-util -L $(B)src/servo-net +RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-gfx -L $(B)src/components/servo-util -L $(B)src/components/servo-net -WEBIDL_servo = $(call rwildcard,$(S)src/servo/,*.webidl) +WEBIDL_servo = $(call rwildcard,$(S)src/components/servo/,*.webidl) AUTOGEN_SRC_servo = $(patsubst %.webidl, %Binding.rs, $(WEBIDL_servo)) -SRC_servo = $(call rwildcard,$(S)src/servo/,*.rs) $(AUTOGEN_SRC_servo) -CRATE_servo = $(S)src/servo/servo.rc +SRC_servo = $(call rwildcard,$(S)src/components/servo/,*.rs) $(AUTOGEN_SRC_servo) +CRATE_servo = $(S)src/components/servo/servo.rc DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_servo_util) $(DONE_servo_gfx) $(DONE_servo_net) @@ -210,7 +222,7 @@ $(DONE_servo_net): $(DEPS_servo_net) $(DONE_servo_gfx): $(DEPS_servo_gfx) $(RUSTC) $(RFLAGS_servo_gfx) -o $@ $< && touch $@ -BINDINGS_SRC = $(S)/src/servo/dom/bindings/codegen +BINDINGS_SRC = $(S)/src/components/servo/dom/bindings/codegen CACHE_DIR = $(BINDINGS_SRC)/_cache @@ -249,12 +261,12 @@ servo: $(DEPS_servo) ifeq ($(OSTYPE),apple-darwin) package: servo - mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa - mkdir -p Servo.app/Contents/MacOS/src/rust-azure + mkdir -p Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa + mkdir -p Servo.app/Contents/MacOS/src/platform/macos/rust-azure cp $(S)/Info.plist Servo.app/Contents/ cp servo Servo.app/Contents/MacOS/ - cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/ - cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/ + cp src/platform/macos/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa/ + cp src/platform/macos/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/platform/macos/rust-azure/ else @@ -272,8 +284,8 @@ endif .PHONY: backup-rust restore-rust backup-rust: - mv src/rust .. + mv src/compiler/rust .. restore-rust: - rm -rf src/rust + rm -rf src/compiler/rust mv ../rust src/ diff --git a/configure b/configure index 18918506d48..53a0f1eb5a3 100755 --- a/configure +++ b/configure @@ -320,7 +320,7 @@ then else step_msg "using in-tree rust compiler" # The Rust compiler we're going to build - CFG_RUSTC="${CFG_BUILD_DIR}src/rust/${DEFAULT_HOST_TRIPLE}/stage2/bin/rustc" + CFG_RUSTC="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_HOST_TRIPLE}/stage2/bin/rustc" fi if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] @@ -371,7 +371,7 @@ msg "configuring src/mozjs" AUTOCONF213_M4_MACROS="$(dirname ${CFG_AUTOCONF213})/../share/$(basename ${CFG_AUTOCONF213})/" # Run the SpiderMonkey autoconf using autoconf 2.13 -(cd ${CFG_SRC_DIR}src/mozjs/js/src && "${CFG_AUTOCONF213}" -l "${AUTOCONF213_M4_MACROS}") || exit $? +(cd ${CFG_SRC_DIR}src/support/spidermonkey/mozjs/js/src && "${CFG_AUTOCONF213}" -l "${AUTOCONF213_M4_MACROS}") || exit $? # Pixman and cairo require some care to autoconf correctly for our in-tree build. # The normal autogen.sh files mostly just run autoreconfig but we need more fine control @@ -397,16 +397,46 @@ fi AUTOCMD="${LIBTOOLIZE} && autoconf && autoheader && automake --add-missing --copy --force" # Copied from cairo's autogen.sh. Build fails without -CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles skia rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-css rust-hubbub sharegl rust-mozjs mozjs" +CFG_SUBMODULES="\ + support/azure/rust-azure \ + support/css/rust-css \ + support/geom/rust-geom \ + support/glut/rust-glut \ + support/harfbuzz/rust-harfbuzz \ + support/http-client/rust-http-client \ + support/hubbub/libhubbub \ + support/hubbub/rust-hubbub \ + support/layers/rust-layers \ + support/libparserutils/libparserutils \ + support/netsurfcss/libcss \ + support/netsurfcss/rust-netsurfcss \ + support/opengles/rust-opengles \ + support/sharegl/sharegl \ + support/skia/skia \ + support/spidermonkey/mozjs \ + support/spidermonkey/rust-mozjs \ + support/stb-image/rust-stb-image \ + support/wapcaplet/libwapcaplet \ + support/wapcaplet/rust-wapcaplet" if [ $CFG_OSTYPE = "apple-darwin" ] then -CFG_SUBMODULES="rust-cocoa rust-io-surface rust-core-foundation rust-core-graphics rust-core-text ${CFG_SUBMODULES}" +CFG_SUBMODULES="\ + platform/macos/rust-cocoa \ + platform/macos/rust-core-foundation \ + platform/macos/rust-core-graphics \ + platform/macos/rust-core-text \ + platform/macos/rust-io-surface \ + ${CFG_SUBMODULES}" fi if [ $CFG_OSTYPE = "unknown-linux-gnu" ] then -CFG_SUBMODULES="rust-freetype rust-fontconfig rust-xlib ${CFG_SUBMODULES}" +CFG_SUBMODULES="\ + platform/linux/rust-fontconfig \ + platform/linux/rust-freetype \ + platform/linux/rust-xlib \ + ${CFG_SUBMODULES}" fi step_msg "making build directories" @@ -418,11 +448,11 @@ do make_dir ${CFG_BUILD_DIR}src/${i} done -make_dir ${CFG_BUILD_DIR}src/servo-util -make_dir ${CFG_BUILD_DIR}src/servo-net -make_dir ${CFG_BUILD_DIR}src/servo-gfx +make_dir ${CFG_BUILD_DIR}src/components/servo-util +make_dir ${CFG_BUILD_DIR}src/components/servo-net +make_dir ${CFG_BUILD_DIR}src/components/servo-gfx make_dir src/test/ref -make_dir src/rust +make_dir src/compiler/rust # TODO: don't run configure on submodules unless necessary. For an example, # see how Rust's configure script optionally reconfigures the LLVM module. @@ -430,11 +460,11 @@ step_msg "running submodule configure scripts" # Only reconfigure Rust when it changes do_reconfigure=1 -index1="${CFG_SRC_DIR}.git/modules/src/rust/index" -index2="${CFG_SRC_DIR}src/rust/.git/index" +index1="${CFG_SRC_DIR}.git/modules/src/compiler/rust/index" +index2="${CFG_SRC_DIR}src/compiler/rust/.git/index" for index in ${index1} ${index2} do - config_stamp="${CFG_BUILD_DIR}src/rust/config.stamp" + config_stamp="${CFG_BUILD_DIR}src/compiler/rust/config.stamp" if test -e ${index} -a -e ${config_stamp} -a ${config_stamp} -nt ${index} then msg "not reconfiguring Rust, config.stamp is fresh" @@ -444,16 +474,11 @@ done if [ ${do_reconfigure} -ne 0 ] then - cd ${CFG_BUILD_DIR}src/rust - ${CFG_SRC_DIR}src/rust/configure + cd ${CFG_BUILD_DIR}src/compiler/rust + ${CFG_SRC_DIR}src/compiler/rust/configure cd ${CFG_BUILD_DIR} fi -# Cairo expects to use an installed pixman, but we want to override that -# behavior to use our version -export pixman_CFLAGS="-I${CFG_SRC_DIR}src/pixman/pixman -I${CFG_BUILD_DIR}src/pixman/pixman" -export pixman_LDFLAGS="-I${CFG_BUILD_DIR}src/pixman/pixman/.libs" - # PIC all the things export CFLAGS="${CFLAGS} -fPIC" export LDFLAGS="${CFLAGS} -fPIC" @@ -466,7 +491,7 @@ do fi CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/configure" # needed because Spidermonkey configure is in non-standard location - if [ $i = mozjs ]; then + if [ $i = "support/spidermonkey/mozjs" ]; then CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/js/src/configure" fi diff --git a/mk/check.mk b/mk/check.mk index c27870d352b..9ee9473c8c8 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -6,12 +6,12 @@ check-$(1) : $$(DONE_$(1)) $$(Q) \ $$(ENV_CFLAGS_$(1)) \ $$(ENV_RFLAGS_$(1)) \ - $$(MAKE) -C $$(B)src/$(1) check + $$(MAKE) -C $$(B)src/$$(PATH_$(1)) check DEPS_CHECK_ALL += $(1) endef -$(foreach submodule,$(CFG_SUBMODULES),\ +$(foreach submodule,$(SUBMODULES),\ $(eval $(call DEF_SUBMODULE_TEST_RULES,$(submodule)))) diff --git a/mk/clean.mk b/mk/clean.mk index a659d20124a..f0de6be741d 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -3,13 +3,13 @@ define DEF_SUBMODULE_CLEAN_RULES clean-$(1) : @$$(call E, make clean: $(1)) $$(Q)rm -f $$(DONE_$(1)) - $$(Q)$$(MAKE) -C $$(B)src/$(1) clean + $$(Q)$$(MAKE) -C $$(B)src/$$(PATH_$(1)) clean # add these targets to meta-targets DEPS_CLEAN_ALL += $(1) endef -$(foreach submodule,$(CFG_SUBMODULES),\ +$(foreach submodule,$(SUBMODULES),\ $(eval $(call DEF_SUBMODULE_CLEAN_RULES,$(submodule)))) DEPS_CLEAN_TARGETS_ALL = $(addprefix clean-,$(DEPS_CLEAN_ALL)) @@ -25,14 +25,14 @@ clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo $(Q)echo "Cleaning targets:" $(Q)echo "$(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))" -clean-servo-gfx: - cd $(B)/src/servo-gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx) +clean-servo-util: + cd $(B)/src/components/servo-util/ && rm -rf libservo_util*.dylib $(DONE_servo_util) clean-servo-net: - cd $(B)/src/servo-net/ && rm -rf libservo_net*.dylib $(DONE_servo_net) + cd $(B)/src/components/servo-net/ && rm -rf libservo_net*.dylib $(DONE_servo_net) -clean-servo-util: - cd $(B)/src/servo-util/ && rm -rf libservo_util*.dylib $(DONE_servo_util) +clean-servo-gfx: + cd $(B)/src/components/servo-gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx) -clean-servo: clean-servo-gfx clean-servo-net clean-servo-util +clean-servo: clean-servo-gfx clean-servo-util clean-servo-net rm -f servo servo-test diff --git a/mk/sub.mk b/mk/sub.mk index e636d15e61b..88b9acdc8ca 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -140,3 +140,4 @@ DEPS_rust-layers += \ rust-xlib \ $(NULL) endif + diff --git a/src/README.md b/src/README.md index f27f834f58f..e9b58181e65 100644 --- a/src/README.md +++ b/src/README.md @@ -1,54 +1,68 @@ Descriptions of the Servo source directories. For the most part these represent a single crate or library. -## Servo and Rust projects +## Servo components -These are the main servo projects, as well as projects that are pure Rust (not bindings). +* `components/contenttest`: JavaScript test runner. +* `components/reftest`: Reference (layout) test runner. +* `components/servo`: The top-level Servo crate. Contains compositing, DOM, layout, and script. +* `components/servo-gfx`: Graphics rendering, fonts, and text shaping. +* `components/servo-net`: Networking, caching, image decoding. +* `components/servo-util`: Various utility functions used by other Servo components. -* _rust-css_ - A CSS parsing and selector matching library, based on libcss and currently - using libcss for the implementation, but not exposing any libcss internals -* _rust-geom_ - Generic linear algebra library -* _rust-http-client_ - An HTTP library in Rust, using libuv via the Rust standard library -* _rust-layers_ - A simple GPU-accelerated 2D scene graph library -* _servo_ - The Servo web browser engine -* _servo-gfx_ - Servo's graphics subsystem -* _sharegl_ - A library for sharing 3D textures between processes +## The Rust compiler -## Third-party projects +* `compiler/rust`: The Rust compiler. -* _libcss_ - The CSS library from the NetSurf web browser. We are using this for parsing - and selector matching until we have a Rust solution -* _libhubbub_ - The HTML parser from the NetSurf web browser. We are using this for parsing - until we have a Rust solution -* _libparserutils_ - A parsing library used by libcss and libhubbub -* _libwapcaplet_ - A string internment library used by libcss and libhubbub -* _mozjs_ - The SpiderMonkey JavaScript engine, forked from mozilla-central -* _rust-azure_ - mozilla-central's 2D vector graphics abstraction layer and bindings -* _rust-harfbuzz_ - The harfbuzz text shaping library and bindings -* _rust-stb-image_ - The stb_image library and bindings. We are using this for image decoding - until we have a higher-performance and/or Rust solution -* _skia_ - The Skia drawing library, a backend for Azure +## Supporting libraries -## Library bindings +These libraries are used in all Servo ports. In keeping with Servo's philosophy of modularity, +they are designed to be useful in other Rust projects. -* _rust-cocoa_ - Bindings to OS X's Cocoa framework -* _rust-core-foundation_ - Bindings to OS X's Core Foundation framework -* _rust-core-graphics_ - Bindings to OS X's Core Graphics framework, a backend for Azure -* _rust-core-text_ - Bindings to OS X's Core Text framework -* _rust-fontconfig_ - Bindings to fontconfig -* _rust-freetype_ - Bindings to FreeType -* _rust-glut_ - Bindings to GLUT -* _rust-hubbub_ - Bindings to libhubbub -* _rust-io-surface_ - OS X implementation of cross-process surface sharing. Used by sharegl -* _rust-mozjs_ - Bindings to SpiderMonkey -* _rust-netsurfcss_ - Bindings to libcss -* _rust-opengles_ - Bindings to OpenGL ES -* _rust-wapcaplet_ - Bindings to libwapcaplet -* _rust-xlib_ - Bindings to xlib +* `support/azure`: A cross-platform 2D drawing library from the Mozilla project. Azure can render + with Direct2D, Core Graphics (Quartz), Skia, and Cairo. +* `support/css`: A general CSS parsing and selector matching library. This abstraction layer + exists to prevent `libcss` internals from leaking into Servo. +* `support/geom`: A simple Euclidean geometry and linear algebra library. +* `support/glut`: Bindings to the GLUT windowing framework. This bare-bones windowing framework is + useful for testing the engine without browser chrome. +* `support/harfbuzz`: A mature Unicode- and OpenType-aware text shaping library, used by many + rendering engines and toolkits. +* `support/http-client`: An HTTP client library for Rust. +* `support/hubbub`: The HTML parser from the NetSurf project. This is a temporary solution for HTML + parsing until a pure-Rust solution is available. +* `support/layers`: A simple GPU-accelerated 2D scene graph library, somewhat similar to libraries + like Clutter. +* `support/libparserutils`: A parsing library used by `hubbub` and `netsurfcss`. +* `support/netsurfcss`: The CSS library from the NetSurf project. This is a temporary stopgap for + CSS parsing until a pure-Rust solution is available. +* `support/opengles`: Bindings to OpenGL ES 2.0. +* `support/sharegl`: A library for sharing OpenGL or Direct3D textures between processes. +* `support/skia`: Google's accelerated 2D rendering library. +* `support/spidermonkey`: Mozilla's JavaScript engine. +* `support/stb-image`: A minimalist image decoding library. This is a temporary stopgap for image + decoding until a higher-performance solution is available. +* `support/wapcaplet`: A string storage library used by `hubbub` and `netsurfcss`. -## Other +## Platform-specfic bindings + +### Linux + +* `platform/linux/rust-fontconfig`: Bindings to the freedesktop.org `fontconfig` library. +* `platform/linux/rust-freetype`: Bindings to the FreeType library. +* `platform/linux/rust-xlib`: Bindings to the X Window System libraries. + +### Mac + +* `platform/macos/rust-cocoa`: General Cocoa bindings. +* `platform/macos/rust-core-foundation`: Bindings to Core Foundation. +* `platform/macos/rust-core-graphics`: Bindings to Core Graphics/Quartz. +* `platform/macos/rust-core-text`: Bindings to Core Text. +* `platform/macos/rust-io-surface`: Bindings to the `IOSurface` library. + +## Miscellaneous + +* `etc`: Various scripts and files that don't belong anywhere else. +* `etc/patches`: Patches for upstream libraries. +* `test`: Test cases. -* _contenttest_ - Test harness for JavaScript bindings -* _etc_ - Miscellaneous -* _reftest_ - Test harness for comparing Servo output to Firefox -* _test_ - Test cases diff --git a/src/compiler/rust b/src/compiler/rust new file mode 160000 index 00000000000..1b883365bc0 --- /dev/null +++ b/src/compiler/rust @@ -0,0 +1 @@ +Subproject commit 1b883365bc0813f5775c8207e414b7973e947a76 diff --git a/src/contenttest/contenttest.rs b/src/components/contenttest/contenttest.rs similarity index 100% rename from src/contenttest/contenttest.rs rename to src/components/contenttest/contenttest.rs diff --git a/src/reftest/rasterize.py b/src/components/reftest/rasterize.py similarity index 100% rename from src/reftest/rasterize.py rename to src/components/reftest/rasterize.py diff --git a/src/reftest/reftest.rs b/src/components/reftest/reftest.rs similarity index 100% rename from src/reftest/reftest.rs rename to src/components/reftest/reftest.rs diff --git a/src/servo-gfx/color.rs b/src/components/servo-gfx/color.rs similarity index 100% rename from src/servo-gfx/color.rs rename to src/components/servo-gfx/color.rs diff --git a/src/servo-gfx/compositor.rs b/src/components/servo-gfx/compositor.rs similarity index 100% rename from src/servo-gfx/compositor.rs rename to src/components/servo-gfx/compositor.rs diff --git a/src/servo-gfx/display_list.rs b/src/components/servo-gfx/display_list.rs similarity index 100% rename from src/servo-gfx/display_list.rs rename to src/components/servo-gfx/display_list.rs diff --git a/src/servo-gfx/font.rs b/src/components/servo-gfx/font.rs similarity index 100% rename from src/servo-gfx/font.rs rename to src/components/servo-gfx/font.rs diff --git a/src/servo-gfx/font_context.rs b/src/components/servo-gfx/font_context.rs similarity index 100% rename from src/servo-gfx/font_context.rs rename to src/components/servo-gfx/font_context.rs diff --git a/src/servo-gfx/font_list.rs b/src/components/servo-gfx/font_list.rs similarity index 95% rename from src/servo-gfx/font_list.rs rename to src/components/servo-gfx/font_list.rs index a67bf8dd951..648a9d7ce35 100644 --- a/src/servo-gfx/font_list.rs +++ b/src/components/servo-gfx/font_list.rs @@ -71,7 +71,7 @@ pub impl FontList { priv fn find_family(&self, family_name: &str) -> Option<@mut FontFamily> { // look up canonical name - let family = self.family_map.find(&str::from_slice(family_name)); + let family = self.family_map.find_equiv(&family_name); let decision = if family.is_some() { "Found" } else { "Couldn't find" }; debug!("FontList: %s font family with name=%s", decision, family_name); @@ -90,15 +90,17 @@ pub struct FontFamily { impl FontFamily { pub fn new(family_name: &str) -> FontFamily { FontFamily { - family_name: str::from_slice(family_name), + family_name: family_name.to_str(), entries: ~[], } } fn load_family_variations(@mut self, list: &FontListHandle) { - if self.entries.len() > 0 { return; } + if self.entries.len() > 0 { + return + } list.load_variations_for_family(self); - assert!(self.entries.len() > 0); + assert!(self.entries.len() > 0) } pub fn find_font_for_style(@mut self, list: &FontListHandle, style: &SpecifiedFontStyle) diff --git a/src/servo-gfx/freetype_impl/font_context.rs b/src/components/servo-gfx/freetype_impl/font_context.rs similarity index 100% rename from src/servo-gfx/freetype_impl/font_context.rs rename to src/components/servo-gfx/freetype_impl/font_context.rs diff --git a/src/servo-gfx/geometry.rs b/src/components/servo-gfx/geometry.rs similarity index 100% rename from src/servo-gfx/geometry.rs rename to src/components/servo-gfx/geometry.rs diff --git a/src/servo-gfx/native.rs b/src/components/servo-gfx/native.rs similarity index 100% rename from src/servo-gfx/native.rs rename to src/components/servo-gfx/native.rs diff --git a/src/servo-gfx/opts.rs b/src/components/servo-gfx/opts.rs similarity index 100% rename from src/servo-gfx/opts.rs rename to src/components/servo-gfx/opts.rs diff --git a/src/servo-gfx/platform/linux/font.rs b/src/components/servo-gfx/platform/linux/font.rs similarity index 100% rename from src/servo-gfx/platform/linux/font.rs rename to src/components/servo-gfx/platform/linux/font.rs diff --git a/src/servo-gfx/platform/linux/font_context.rs b/src/components/servo-gfx/platform/linux/font_context.rs similarity index 100% rename from src/servo-gfx/platform/linux/font_context.rs rename to src/components/servo-gfx/platform/linux/font_context.rs diff --git a/src/servo-gfx/platform/linux/font_list.rs b/src/components/servo-gfx/platform/linux/font_list.rs similarity index 100% rename from src/servo-gfx/platform/linux/font_list.rs rename to src/components/servo-gfx/platform/linux/font_list.rs diff --git a/src/servo-gfx/platform/macos/font.rs b/src/components/servo-gfx/platform/macos/font.rs similarity index 100% rename from src/servo-gfx/platform/macos/font.rs rename to src/components/servo-gfx/platform/macos/font.rs diff --git a/src/servo-gfx/platform/macos/font_context.rs b/src/components/servo-gfx/platform/macos/font_context.rs similarity index 100% rename from src/servo-gfx/platform/macos/font_context.rs rename to src/components/servo-gfx/platform/macos/font_context.rs diff --git a/src/servo-gfx/platform/macos/font_list.rs b/src/components/servo-gfx/platform/macos/font_list.rs similarity index 98% rename from src/servo-gfx/platform/macos/font_list.rs rename to src/components/servo-gfx/platform/macos/font_list.rs index 79698c1cdfd..d453485016c 100644 --- a/src/servo-gfx/platform/macos/font_list.rs +++ b/src/components/servo-gfx/platform/macos/font_list.rs @@ -52,7 +52,7 @@ pub impl FontListHandle { debug!("Creating new FontEntry for face: %s", handle.face_name()); let entry = @FontEntry::new(family, handle); - family.entries.push(entry); + family.entries.push(entry) } } } diff --git a/src/servo-gfx/platform/mod.rs b/src/components/servo-gfx/platform/mod.rs similarity index 100% rename from src/servo-gfx/platform/mod.rs rename to src/components/servo-gfx/platform/mod.rs diff --git a/src/servo-gfx/render_context.rs b/src/components/servo-gfx/render_context.rs similarity index 100% rename from src/servo-gfx/render_context.rs rename to src/components/servo-gfx/render_context.rs diff --git a/src/servo-gfx/render_layers.rs b/src/components/servo-gfx/render_layers.rs similarity index 100% rename from src/servo-gfx/render_layers.rs rename to src/components/servo-gfx/render_layers.rs diff --git a/src/servo-gfx/render_task.rs b/src/components/servo-gfx/render_task.rs similarity index 100% rename from src/servo-gfx/render_task.rs rename to src/components/servo-gfx/render_task.rs diff --git a/src/servo-gfx/servo_gfx.rc b/src/components/servo-gfx/servo_gfx.rc similarity index 100% rename from src/servo-gfx/servo_gfx.rc rename to src/components/servo-gfx/servo_gfx.rc diff --git a/src/servo-gfx/surface.rs b/src/components/servo-gfx/surface.rs similarity index 100% rename from src/servo-gfx/surface.rs rename to src/components/servo-gfx/surface.rs diff --git a/src/servo-gfx/text/glyph.rs b/src/components/servo-gfx/text/glyph.rs similarity index 98% rename from src/servo-gfx/text/glyph.rs rename to src/components/servo-gfx/text/glyph.rs index 3ecc291cc83..7a1dfea9467 100644 --- a/src/servo-gfx/text/glyph.rs +++ b/src/components/servo-gfx/text/glyph.rs @@ -588,7 +588,7 @@ pub impl<'self> GlyphStore { fn iter_glyphs_for_char_index(&'self self, i: uint, cb: &fn(uint, &GlyphInfo<'self>) -> bool) - -> bool { + -> bool { assert!(i < self.entry_buffer.len()); let entry = &self.entry_buffer[i]; @@ -609,30 +609,36 @@ pub impl<'self> GlyphStore { true } - fn iter_glyphs_for_char_range(&'self self, range: &Range, - cb: &fn(uint, &GlyphInfo<'self>) -> bool) { + fn iter_glyphs_for_char_range(&'self self, + range: &Range, + callback: &fn(uint, &GlyphInfo<'self>) -> bool) + -> bool { if range.begin() >= self.entry_buffer.len() { error!("iter_glyphs_for_range: range.begin beyond length!"); - return; + return false } if range.end() > self.entry_buffer.len() { error!("iter_glyphs_for_range: range.end beyond length!"); - return; + return false } for range.eachi |i| { - if !self.iter_glyphs_for_char_index(i, cb) { - break; + if !self.iter_glyphs_for_char_index(i, callback) { + break } } + + true } - fn iter_all_glyphs(&'self self, cb: &fn(uint, &GlyphInfo<'self>) -> bool) { + fn iter_all_glyphs(&'self self, cb: &fn(uint, &GlyphInfo<'self>) -> bool) -> bool { for uint::range(0, self.entry_buffer.len()) |i| { if !self.iter_glyphs_for_char_index(i, cb) { break; } } + + true } // getter methods diff --git a/src/servo-gfx/text/mod.rs b/src/components/servo-gfx/text/mod.rs similarity index 100% rename from src/servo-gfx/text/mod.rs rename to src/components/servo-gfx/text/mod.rs diff --git a/src/servo-gfx/text/shaper.rs b/src/components/servo-gfx/text/shaper.rs similarity index 100% rename from src/servo-gfx/text/shaper.rs rename to src/components/servo-gfx/text/shaper.rs diff --git a/src/servo-gfx/text/shaping/harfbuzz.rs b/src/components/servo-gfx/text/shaping/harfbuzz.rs similarity index 98% rename from src/servo-gfx/text/shaping/harfbuzz.rs rename to src/components/servo-gfx/text/shaping/harfbuzz.rs index 6cf3ea9ab65..6f5c6c6a6f2 100644 --- a/src/servo-gfx/text/shaping/harfbuzz.rs +++ b/src/components/servo-gfx/text/shaping/harfbuzz.rs @@ -357,19 +357,26 @@ impl Shaper { probably doesn't work."); let mut all_glyphs_are_within_cluster: bool = true; - do glyph_span.eachi |j| { + for glyph_span.eachi |j| { let loc = glyph_data.byte_offset_of_glyph(j); if !char_byte_span.contains(loc) { all_glyphs_are_within_cluster = false; + break + } + + // If true, keep checking. Else, stop. + if !all_glyphs_are_within_cluster { + break } - all_glyphs_are_within_cluster // if true, keep checking. else, stop. } debug!("All glyphs within char_byte_span cluster?: %?", all_glyphs_are_within_cluster); // found a valid range; stop extending char_span. - if all_glyphs_are_within_cluster { break; } + if all_glyphs_are_within_cluster { + break + } } // character/glyph clump must contain characters. diff --git a/src/servo-gfx/text/shaping/mod.rs b/src/components/servo-gfx/text/shaping/mod.rs similarity index 100% rename from src/servo-gfx/text/shaping/mod.rs rename to src/components/servo-gfx/text/shaping/mod.rs diff --git a/src/servo-gfx/text/text_run.rs b/src/components/servo-gfx/text/text_run.rs similarity index 96% rename from src/servo-gfx/text/text_run.rs rename to src/components/servo-gfx/text/text_run.rs index ff5f9cba343..e94dd4a15df 100644 --- a/src/servo-gfx/text/text_run.rs +++ b/src/components/servo-gfx/text/text_run.rs @@ -128,7 +128,7 @@ pub impl<'self> TextRun { return max_piece_width; } - fn iter_natural_lines_for_range(&self, range: &Range, f: &fn(&Range) -> bool) { + fn iter_natural_lines_for_range(&self, range: &Range, f: &fn(&Range) -> bool) -> bool { let mut clump = Range::new(range.begin(), 0); let mut in_clump = false; @@ -151,9 +151,11 @@ pub impl<'self> TextRun { clump.extend_to(range.end()); f(&clump); } + + true } - fn iter_indivisible_pieces_for_range(&self, range: &Range, f: &fn(&Range) -> bool) { + fn iter_indivisible_pieces_for_range(&self, range: &Range, f: &fn(&Range) -> bool) -> bool { let mut clump = Range::new(range.begin(), 0); loop { @@ -165,11 +167,15 @@ pub impl<'self> TextRun { } // now clump.end() is break-before or range.end() - if !f(&clump) || clump.end() == range.end() { break; } + if !f(&clump) || clump.end() == range.end() { + break + } // now clump includes one break-before character, or starts from range.end() let end = clump.end(); // FIXME: borrow checker workaround clump.reset(end, 1); } + + true } } diff --git a/src/servo-gfx/text/util.rs b/src/components/servo-gfx/text/util.rs similarity index 93% rename from src/servo-gfx/text/util.rs rename to src/components/servo-gfx/text/util.rs index a74d59bcbc8..1ce4d4b4ff8 100644 --- a/src/servo-gfx/text/util.rs +++ b/src/components/servo-gfx/text/util.rs @@ -127,7 +127,7 @@ pub fn true_type_tag(a: char, b: char, c: char, d: char) -> u32 { #[test] fn test_true_type_tag() { - fail_unless!(true_type_tag('c', 'm', 'a', 'p') == 0x_63_6D_61_70_u32); + assert!(true_type_tag('c', 'm', 'a', 'p') == 0x_63_6D_61_70_u32); } #[test] @@ -143,7 +143,7 @@ fn test_transform_compress_none() { let mode = CompressNone; for uint::range(0, test_strs.len()) |i| { - fail_unless!(transform_text(test_strs[i], mode) == test_strs[i]); + assert!(transform_text(test_strs[i], mode) == test_strs[i]); } } @@ -166,11 +166,11 @@ fn test_transform_discard_newline() { ~"foo bar baz", ~"foobarbaz"]; - fail_unless!(test_strs.len() == oracle_strs.len()); + assert!(test_strs.len() == oracle_strs.len()); let mode = DiscardNewline; for uint::range(0, test_strs.len()) |i| { - fail_unless!(transform_text(test_strs[i], mode) == oracle_strs[i]); + assert!(transform_text(test_strs[i], mode) == oracle_strs[i]); } } @@ -192,11 +192,11 @@ fn test_transform_compress_whitespace() { ~"foo bar baz", ~"foobarbaz\n\n"]; - fail_unless!(test_strs.len() == oracle_strs.len()); + assert!(test_strs.len() == oracle_strs.len()); let mode = CompressWhitespace; for uint::range(0, test_strs.len()) |i| { - fail_unless!(transform_text(test_strs[i], mode) == oracle_strs[i]); + assert!(transform_text(test_strs[i], mode) == oracle_strs[i]); } } @@ -218,10 +218,10 @@ fn test_transform_compress_whitespace_newline() { ~"foo bar baz", ~"foobarbaz "]; - fail_unless!(test_strs.len() == oracle_strs.len()); + assert!(test_strs.len() == oracle_strs.len()); let mode = CompressWhitespaceNewline; for uint::range(0, test_strs.len()) |i| { - fail_unless!(transform_text(test_strs[i], mode) == oracle_strs[i]); + assert!(transform_text(test_strs[i], mode) == oracle_strs[i]); } } diff --git a/src/servo-net/file_loader.rs b/src/components/servo-net/file_loader.rs similarity index 100% rename from src/servo-net/file_loader.rs rename to src/components/servo-net/file_loader.rs diff --git a/src/servo-net/http_loader.rs b/src/components/servo-net/http_loader.rs similarity index 100% rename from src/servo-net/http_loader.rs rename to src/components/servo-net/http_loader.rs diff --git a/src/servo-net/image/base.rs b/src/components/servo-net/image/base.rs similarity index 100% rename from src/servo-net/image/base.rs rename to src/components/servo-net/image/base.rs diff --git a/src/servo-net/image/holder.rs b/src/components/servo-net/image/holder.rs similarity index 100% rename from src/servo-net/image/holder.rs rename to src/components/servo-net/image/holder.rs diff --git a/src/servo-net/image/test.jpeg b/src/components/servo-net/image/test.jpeg similarity index 100% rename from src/servo-net/image/test.jpeg rename to src/components/servo-net/image/test.jpeg diff --git a/src/servo-net/image_cache_task.rs b/src/components/servo-net/image_cache_task.rs similarity index 99% rename from src/servo-net/image_cache_task.rs rename to src/components/servo-net/image_cache_task.rs index 1b9d8415f61..32cd0b6a0a8 100644 --- a/src/servo-net/image_cache_task.rs +++ b/src/components/servo-net/image_cache_task.rs @@ -12,7 +12,7 @@ use core::cell::Cell; use core::comm::{Chan, Port, SharedChan, stream}; use core::task::spawn; use core::to_str::ToStr; -use core::util::replace; +use core::util::{replace, swap}; use std::arc::ARC; use std::net::url::Url; @@ -383,7 +383,6 @@ impl ImageCache { } } - priv fn get_image(&self, url: Url, response: Chan) { match self.get_state(copy url) { Init => fail!(~"request for image before prefetch"), diff --git a/src/servo-net/local_image_cache.rs b/src/components/servo-net/local_image_cache.rs similarity index 100% rename from src/servo-net/local_image_cache.rs rename to src/components/servo-net/local_image_cache.rs diff --git a/src/servo-net/resource_task.rs b/src/components/servo-net/resource_task.rs similarity index 100% rename from src/servo-net/resource_task.rs rename to src/components/servo-net/resource_task.rs diff --git a/src/servo-net/servo_net.rc b/src/components/servo-net/servo_net.rc similarity index 100% rename from src/servo-net/servo_net.rc rename to src/components/servo-net/servo_net.rc diff --git a/src/servo-net/util.rs b/src/components/servo-net/util.rs similarity index 100% rename from src/servo-net/util.rs rename to src/components/servo-net/util.rs diff --git a/src/servo-util/cache.rs b/src/components/servo-util/cache.rs similarity index 100% rename from src/servo-util/cache.rs rename to src/components/servo-util/cache.rs diff --git a/src/servo-util/range.rs b/src/components/servo-util/range.rs similarity index 94% rename from src/servo-util/range.rs rename to src/components/servo-util/range.rs index caf3f3d003e..bc5728aa006 100644 --- a/src/servo-util/range.rs +++ b/src/components/servo-util/range.rs @@ -31,8 +31,14 @@ pub impl Range { fn begin(&self) -> uint { self.off } fn length(&self) -> uint { self.len } fn end(&self) -> uint { self.off + self.len } - fn eachi(&self, cb: &fn(uint) -> bool) { - do uint::range(self.off, self.off + self.len) |i| { cb(i) } + + fn eachi(&self, callback: &fn(uint) -> bool) -> bool { + for uint::range(self.off, self.off + self.len) |i| { + if !callback(i) { + break + } + } + true } fn contains(&self, i: uint) -> bool { diff --git a/src/servo-util/servo_util.rc b/src/components/servo-util/servo_util.rc similarity index 100% rename from src/servo-util/servo_util.rc rename to src/components/servo-util/servo_util.rc diff --git a/src/servo-util/time.rs b/src/components/servo-util/time.rs similarity index 100% rename from src/servo-util/time.rs rename to src/components/servo-util/time.rs diff --git a/src/servo-util/tree.rs b/src/components/servo-util/tree.rs similarity index 97% rename from src/servo-util/tree.rs rename to src/components/servo-util/tree.rs index 7fc104f984f..23b8ca80d77 100644 --- a/src/servo-util/tree.rs +++ b/src/components/servo-util/tree.rs @@ -62,7 +62,7 @@ pub trait TreeUtils { fn remove_child(&self, child: Self); /// Iterates over all children of this node. - fn each_child(&self, callback: &fn(Self) -> bool); + fn each_child(&self, callback: &fn(Self) -> bool) -> bool; /// Iterates over this node and all its descendants, in preorder. fn traverse_preorder(&self, callback: &fn(Self) -> bool) -> bool; @@ -132,7 +132,7 @@ impl,N:TreeNode> TreeUtils for NR { } } - fn each_child(&self, callback: &fn(NR) -> bool) { + fn each_child(&self, callback: &fn(NR) -> bool) -> bool { let mut maybe_current = self.with_base(|n| n.first_child()); while !maybe_current.is_none() { let current = maybe_current.get_ref().clone(); @@ -142,6 +142,8 @@ impl,N:TreeNode> TreeUtils for NR { maybe_current = current.with_base(|n| n.next_sibling()); } + + true } fn traverse_preorder(&self, callback: &fn(NR) -> bool) -> bool { diff --git a/src/servo-util/url.rs b/src/components/servo-util/url.rs similarity index 82% rename from src/servo-util/url.rs rename to src/components/servo-util/url.rs index 9df4e8c49b2..fea0df23b73 100644 --- a/src/servo-util/url.rs +++ b/src/components/servo-util/url.rs @@ -59,8 +59,8 @@ mod make_url_tests { let file = ~"local.html"; let url = make_url(file, None); debug!("url: %?", url); - fail_unless!(url.scheme == ~"file"); - fail_unless!(url.path.contains(os::getcwd().to_str())); + assert!(url.scheme == ~"file"); + assert!(url.path.contains(os::getcwd().to_str())); } #[test] @@ -69,9 +69,9 @@ mod make_url_tests { let old_url = make_url(old_str, None); let new_str = ~"index.html"; let new_url = make_url(new_str, Some(old_url)); - fail_unless!(new_url.scheme == ~"http"); - fail_unless!(new_url.host == ~"example.com"); - fail_unless!(new_url.path == ~"/index.html"); + assert!(new_url.scheme == ~"http"); + assert!(new_url.host == ~"example.com"); + assert!(new_url.path == ~"/index.html"); } #[test] @@ -80,9 +80,9 @@ mod make_url_tests { let old_url = make_url(old_str, None); let new_str = ~"index.html"; let new_url = make_url(new_str, Some(old_url)); - fail_unless!(new_url.scheme == ~"http"); - fail_unless!(new_url.host == ~"example.com"); - fail_unless!(new_url.path == ~"/index.html"); + assert!(new_url.scheme == ~"http"); + assert!(new_url.host == ~"example.com"); + assert!(new_url.path == ~"/index.html"); } #[test] @@ -91,9 +91,9 @@ mod make_url_tests { let old_url = make_url(old_str, None); let new_str = ~"crumpet.html"; let new_url = make_url(new_str, Some(old_url)); - fail_unless!(new_url.scheme == ~"http"); - fail_unless!(new_url.host == ~"example.com"); - fail_unless!(new_url.path == ~"/crumpet.html"); + assert!(new_url.scheme == ~"http"); + assert!(new_url.host == ~"example.com"); + assert!(new_url.path == ~"/crumpet.html"); } #[test] @@ -102,9 +102,9 @@ mod make_url_tests { let old_url = make_url(old_str, None); let new_str = ~"crumpet.html"; let new_url = make_url(new_str, Some(old_url)); - fail_unless!(new_url.scheme == ~"http"); - fail_unless!(new_url.host == ~"example.com"); - fail_unless!(new_url.path == ~"/snarf/crumpet.html"); + assert!(new_url.scheme == ~"http"); + assert!(new_url.host == ~"example.com"); + assert!(new_url.path == ~"/snarf/crumpet.html"); } } diff --git a/src/servo-util/vec.rs b/src/components/servo-util/vec.rs similarity index 100% rename from src/servo-util/vec.rs rename to src/components/servo-util/vec.rs diff --git a/src/servo/compositing/mod.rs b/src/components/servo/compositing/mod.rs similarity index 99% rename from src/servo/compositing/mod.rs rename to src/components/servo/compositing/mod.rs index 3ec1e9d7f36..f6f4c9f5822 100644 --- a/src/servo/compositing/mod.rs +++ b/src/components/servo/compositing/mod.rs @@ -244,7 +244,7 @@ fn lend_surface(surfaces: &mut SurfaceSet, receiver: Chan) { // Now we don't have it surfaces.front.have = false; // But we (hopefully) have another! - surfaces.front <-> surfaces.back; + util::swap(&mut surfaces.front, &mut surfaces.back); // Let's look assert!(surfaces.front.have); } diff --git a/src/servo/compositing/resize_rate_limiter.rs b/src/components/servo/compositing/resize_rate_limiter.rs similarity index 100% rename from src/servo/compositing/resize_rate_limiter.rs rename to src/components/servo/compositing/resize_rate_limiter.rs diff --git a/src/servo/content/content_task.rs b/src/components/servo/content/content_task.rs similarity index 99% rename from src/servo/content/content_task.rs rename to src/components/servo/content/content_task.rs index 695d2a76542..e8cfcf3310b 100644 --- a/src/servo/content/content_task.rs +++ b/src/components/servo/content/content_task.rs @@ -21,6 +21,7 @@ use core::io::read_whole_file; use core::pipes::select2i; use core::ptr::null; use core::task::{SingleThreaded, task}; +use core::local_data; use core::util::replace; use dom; use geom::size::Size2D; @@ -153,7 +154,9 @@ pub fn Content(layout_task: LayoutTask, }; cx.set_cx_private(ptr::to_unsafe_ptr(&*content) as *()); - unsafe { local_data::local_data_set(global_content_key, cast::transmute(content)); } + unsafe { + local_data::local_data_set(global_content_key, cast::transmute(content)); + } content } diff --git a/src/servo/content/jsnames.rs b/src/components/servo/content/jsnames.rs similarity index 100% rename from src/servo/content/jsnames.rs rename to src/components/servo/content/jsnames.rs diff --git a/src/servo/css/matching.rs b/src/components/servo/css/matching.rs similarity index 100% rename from src/servo/css/matching.rs rename to src/components/servo/css/matching.rs diff --git a/src/servo/css/node_style.rs b/src/components/servo/css/node_style.rs similarity index 100% rename from src/servo/css/node_style.rs rename to src/components/servo/css/node_style.rs diff --git a/src/servo/css/node_util.rs b/src/components/servo/css/node_util.rs similarity index 100% rename from src/servo/css/node_util.rs rename to src/components/servo/css/node_util.rs diff --git a/src/servo/css/node_void_ptr.rs b/src/components/servo/css/node_void_ptr.rs similarity index 100% rename from src/servo/css/node_void_ptr.rs rename to src/components/servo/css/node_void_ptr.rs diff --git a/src/servo/css/select.rs b/src/components/servo/css/select.rs similarity index 100% rename from src/servo/css/select.rs rename to src/components/servo/css/select.rs diff --git a/src/servo/css/select_handler.rs b/src/components/servo/css/select_handler.rs similarity index 100% rename from src/servo/css/select_handler.rs rename to src/components/servo/css/select_handler.rs diff --git a/src/servo/dom/bindings/clientrect.rs b/src/components/servo/dom/bindings/clientrect.rs similarity index 100% rename from src/servo/dom/bindings/clientrect.rs rename to src/components/servo/dom/bindings/clientrect.rs diff --git a/src/servo/dom/bindings/clientrectlist.rs b/src/components/servo/dom/bindings/clientrectlist.rs similarity index 100% rename from src/servo/dom/bindings/clientrectlist.rs rename to src/components/servo/dom/bindings/clientrectlist.rs diff --git a/src/servo/dom/bindings/codegen/BindingGen.py b/src/components/servo/dom/bindings/codegen/BindingGen.py similarity index 100% rename from src/servo/dom/bindings/codegen/BindingGen.py rename to src/components/servo/dom/bindings/codegen/BindingGen.py diff --git a/src/servo/dom/bindings/codegen/BindingUtils.cpp b/src/components/servo/dom/bindings/codegen/BindingUtils.cpp similarity index 100% rename from src/servo/dom/bindings/codegen/BindingUtils.cpp rename to src/components/servo/dom/bindings/codegen/BindingUtils.cpp diff --git a/src/servo/dom/bindings/codegen/BindingUtils.h b/src/components/servo/dom/bindings/codegen/BindingUtils.h similarity index 100% rename from src/servo/dom/bindings/codegen/BindingUtils.h rename to src/components/servo/dom/bindings/codegen/BindingUtils.h diff --git a/src/servo/dom/bindings/codegen/Bindings.conf b/src/components/servo/dom/bindings/codegen/Bindings.conf similarity index 100% rename from src/servo/dom/bindings/codegen/Bindings.conf rename to src/components/servo/dom/bindings/codegen/Bindings.conf diff --git a/src/servo/dom/bindings/codegen/ClientRect.webidl b/src/components/servo/dom/bindings/codegen/ClientRect.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/ClientRect.webidl rename to src/components/servo/dom/bindings/codegen/ClientRect.webidl diff --git a/src/servo/dom/bindings/codegen/ClientRectList.webidl b/src/components/servo/dom/bindings/codegen/ClientRectList.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/ClientRectList.webidl rename to src/components/servo/dom/bindings/codegen/ClientRectList.webidl diff --git a/src/servo/dom/bindings/codegen/Codegen.py b/src/components/servo/dom/bindings/codegen/Codegen.py similarity index 100% rename from src/servo/dom/bindings/codegen/Codegen.py rename to src/components/servo/dom/bindings/codegen/Codegen.py diff --git a/src/servo/dom/bindings/codegen/CodegenRust.py b/src/components/servo/dom/bindings/codegen/CodegenRust.py similarity index 100% rename from src/servo/dom/bindings/codegen/CodegenRust.py rename to src/components/servo/dom/bindings/codegen/CodegenRust.py diff --git a/src/servo/dom/bindings/codegen/Configuration.py b/src/components/servo/dom/bindings/codegen/Configuration.py similarity index 100% rename from src/servo/dom/bindings/codegen/Configuration.py rename to src/components/servo/dom/bindings/codegen/Configuration.py diff --git a/src/servo/dom/bindings/codegen/DOMJSClass.h b/src/components/servo/dom/bindings/codegen/DOMJSClass.h similarity index 100% rename from src/servo/dom/bindings/codegen/DOMJSClass.h rename to src/components/servo/dom/bindings/codegen/DOMJSClass.h diff --git a/src/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp b/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp similarity index 100% rename from src/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp rename to src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp diff --git a/src/servo/dom/bindings/codegen/DOMJSProxyHandler.h b/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h similarity index 100% rename from src/servo/dom/bindings/codegen/DOMJSProxyHandler.h rename to src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h diff --git a/src/servo/dom/bindings/codegen/DOMParser.webidl b/src/components/servo/dom/bindings/codegen/DOMParser.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/DOMParser.webidl rename to src/components/servo/dom/bindings/codegen/DOMParser.webidl diff --git a/src/servo/dom/bindings/codegen/ErrorResult.h b/src/components/servo/dom/bindings/codegen/ErrorResult.h similarity index 100% rename from src/servo/dom/bindings/codegen/ErrorResult.h rename to src/components/servo/dom/bindings/codegen/ErrorResult.h diff --git a/src/servo/dom/bindings/codegen/Errors.msg b/src/components/servo/dom/bindings/codegen/Errors.msg similarity index 100% rename from src/servo/dom/bindings/codegen/Errors.msg rename to src/components/servo/dom/bindings/codegen/Errors.msg diff --git a/src/servo/dom/bindings/codegen/Event.webidl b/src/components/servo/dom/bindings/codegen/Event.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/Event.webidl rename to src/components/servo/dom/bindings/codegen/Event.webidl diff --git a/src/servo/dom/bindings/codegen/EventTarget.webidl b/src/components/servo/dom/bindings/codegen/EventTarget.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/EventTarget.webidl rename to src/components/servo/dom/bindings/codegen/EventTarget.webidl diff --git a/src/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py b/src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py similarity index 100% rename from src/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py rename to src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py diff --git a/src/servo/dom/bindings/codegen/GlobalGen.py b/src/components/servo/dom/bindings/codegen/GlobalGen.py similarity index 100% rename from src/servo/dom/bindings/codegen/GlobalGen.py rename to src/components/servo/dom/bindings/codegen/GlobalGen.py diff --git a/src/servo/dom/bindings/codegen/HTMLCollection.webidl b/src/components/servo/dom/bindings/codegen/HTMLCollection.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/HTMLCollection.webidl rename to src/components/servo/dom/bindings/codegen/HTMLCollection.webidl diff --git a/src/servo/dom/bindings/codegen/Makefile.in b/src/components/servo/dom/bindings/codegen/Makefile.in similarity index 100% rename from src/servo/dom/bindings/codegen/Makefile.in rename to src/components/servo/dom/bindings/codegen/Makefile.in diff --git a/src/servo/dom/bindings/codegen/Nullable.h b/src/components/servo/dom/bindings/codegen/Nullable.h similarity index 100% rename from src/servo/dom/bindings/codegen/Nullable.h rename to src/components/servo/dom/bindings/codegen/Nullable.h diff --git a/src/servo/dom/bindings/codegen/PrimitiveConversions.h b/src/components/servo/dom/bindings/codegen/PrimitiveConversions.h similarity index 100% rename from src/servo/dom/bindings/codegen/PrimitiveConversions.h rename to src/components/servo/dom/bindings/codegen/PrimitiveConversions.h diff --git a/src/servo/dom/bindings/codegen/RegisterBindings.cpp b/src/components/servo/dom/bindings/codegen/RegisterBindings.cpp similarity index 100% rename from src/servo/dom/bindings/codegen/RegisterBindings.cpp rename to src/components/servo/dom/bindings/codegen/RegisterBindings.cpp diff --git a/src/servo/dom/bindings/codegen/RegisterBindings.h b/src/components/servo/dom/bindings/codegen/RegisterBindings.h similarity index 100% rename from src/servo/dom/bindings/codegen/RegisterBindings.h rename to src/components/servo/dom/bindings/codegen/RegisterBindings.h diff --git a/src/servo/dom/bindings/codegen/TypedArray.h b/src/components/servo/dom/bindings/codegen/TypedArray.h similarity index 100% rename from src/servo/dom/bindings/codegen/TypedArray.h rename to src/components/servo/dom/bindings/codegen/TypedArray.h diff --git a/src/servo/dom/bindings/codegen/crashtests/769464.html b/src/components/servo/dom/bindings/codegen/crashtests/769464.html similarity index 100% rename from src/servo/dom/bindings/codegen/crashtests/769464.html rename to src/components/servo/dom/bindings/codegen/crashtests/769464.html diff --git a/src/servo/dom/bindings/codegen/crashtests/crashtests.list b/src/components/servo/dom/bindings/codegen/crashtests/crashtests.list similarity index 100% rename from src/servo/dom/bindings/codegen/crashtests/crashtests.list rename to src/components/servo/dom/bindings/codegen/crashtests/crashtests.list diff --git a/src/servo/dom/bindings/codegen/parser/README b/src/components/servo/dom/bindings/codegen/parser/README similarity index 100% rename from src/servo/dom/bindings/codegen/parser/README rename to src/components/servo/dom/bindings/codegen/parser/README diff --git a/src/servo/dom/bindings/codegen/parser/UPSTREAM b/src/components/servo/dom/bindings/codegen/parser/UPSTREAM similarity index 100% rename from src/servo/dom/bindings/codegen/parser/UPSTREAM rename to src/components/servo/dom/bindings/codegen/parser/UPSTREAM diff --git a/src/servo/dom/bindings/codegen/parser/WebIDL.py b/src/components/servo/dom/bindings/codegen/parser/WebIDL.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/WebIDL.py rename to src/components/servo/dom/bindings/codegen/parser/WebIDL.py diff --git a/src/servo/dom/bindings/codegen/parser/runtests.py b/src/components/servo/dom/bindings/codegen/parser/runtests.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/runtests.py rename to src/components/servo/dom/bindings/codegen/parser/runtests.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_any_null.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_any_null.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_attr.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_attr.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_builtins.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_builtins.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_callback.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_callback.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_const.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_const.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_const.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_const.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_constructor.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_constructor.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_dictionary.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_dictionary.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_double_null.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_double_null.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_enum.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_enum.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_error_colno.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_error_colno.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_implements.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_implements.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_interface.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_interface.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_method.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_method.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_method.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_method.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_overload.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_overload.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_sanity.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_sanity.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_special_methods.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_special_methods.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_typedef.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_typedef.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_union.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_union.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_union.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_union.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_union_any.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_union_any.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py similarity index 100% rename from src/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py rename to src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py diff --git a/src/servo/dom/bindings/codegen/ply/COPYING b/src/components/servo/dom/bindings/codegen/ply/COPYING similarity index 100% rename from src/servo/dom/bindings/codegen/ply/COPYING rename to src/components/servo/dom/bindings/codegen/ply/COPYING diff --git a/src/servo/dom/bindings/codegen/ply/README b/src/components/servo/dom/bindings/codegen/ply/README similarity index 100% rename from src/servo/dom/bindings/codegen/ply/README rename to src/components/servo/dom/bindings/codegen/ply/README diff --git a/src/servo/dom/bindings/codegen/ply/ply/__init__.py b/src/components/servo/dom/bindings/codegen/ply/ply/__init__.py similarity index 100% rename from src/servo/dom/bindings/codegen/ply/ply/__init__.py rename to src/components/servo/dom/bindings/codegen/ply/ply/__init__.py diff --git a/src/servo/dom/bindings/codegen/ply/ply/lex.py b/src/components/servo/dom/bindings/codegen/ply/ply/lex.py similarity index 100% rename from src/servo/dom/bindings/codegen/ply/ply/lex.py rename to src/components/servo/dom/bindings/codegen/ply/ply/lex.py diff --git a/src/servo/dom/bindings/codegen/ply/ply/yacc.py b/src/components/servo/dom/bindings/codegen/ply/ply/yacc.py similarity index 100% rename from src/servo/dom/bindings/codegen/ply/ply/yacc.py rename to src/components/servo/dom/bindings/codegen/ply/ply/yacc.py diff --git a/src/servo/dom/bindings/codegen/pythonpath.py b/src/components/servo/dom/bindings/codegen/pythonpath.py similarity index 100% rename from src/servo/dom/bindings/codegen/pythonpath.py rename to src/components/servo/dom/bindings/codegen/pythonpath.py diff --git a/src/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp b/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp similarity index 100% rename from src/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp rename to src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp diff --git a/src/servo/dom/bindings/codegen/stubgenerator/Skeleton.h b/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h similarity index 100% rename from src/servo/dom/bindings/codegen/stubgenerator/Skeleton.h rename to src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h diff --git a/src/servo/dom/bindings/codegen/stubgenerator/generate.sh b/src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh similarity index 100% rename from src/servo/dom/bindings/codegen/stubgenerator/generate.sh rename to src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh diff --git a/src/servo/dom/bindings/codegen/test/Makefile.in b/src/components/servo/dom/bindings/codegen/test/Makefile.in similarity index 100% rename from src/servo/dom/bindings/codegen/test/Makefile.in rename to src/components/servo/dom/bindings/codegen/test/Makefile.in diff --git a/src/servo/dom/bindings/codegen/test/TestBindingHeader.h b/src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h similarity index 100% rename from src/servo/dom/bindings/codegen/test/TestBindingHeader.h rename to src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h diff --git a/src/servo/dom/bindings/codegen/test/TestCodeGen.webidl b/src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/test/TestCodeGen.webidl rename to src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl diff --git a/src/servo/dom/bindings/codegen/test/TestDictionary.webidl b/src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/test/TestDictionary.webidl rename to src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl diff --git a/src/servo/dom/bindings/codegen/test/TestTypedef.webidl b/src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl similarity index 100% rename from src/servo/dom/bindings/codegen/test/TestTypedef.webidl rename to src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl diff --git a/src/servo/dom/bindings/codegen/test/file_bug775543.html b/src/components/servo/dom/bindings/codegen/test/file_bug775543.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/file_bug775543.html rename to src/components/servo/dom/bindings/codegen/test/file_bug775543.html diff --git a/src/servo/dom/bindings/codegen/test/forOf_iframe.html b/src/components/servo/dom/bindings/codegen/test/forOf_iframe.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/forOf_iframe.html rename to src/components/servo/dom/bindings/codegen/test/forOf_iframe.html diff --git a/src/servo/dom/bindings/codegen/test/test_InstanceOf.html b/src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_InstanceOf.html rename to src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html diff --git a/src/servo/dom/bindings/codegen/test/test_bug773326.html b/src/components/servo/dom/bindings/codegen/test/test_bug773326.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_bug773326.html rename to src/components/servo/dom/bindings/codegen/test/test_bug773326.html diff --git a/src/servo/dom/bindings/codegen/test/test_bug775543.html b/src/components/servo/dom/bindings/codegen/test/test_bug775543.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_bug775543.html rename to src/components/servo/dom/bindings/codegen/test/test_bug775543.html diff --git a/src/servo/dom/bindings/codegen/test/test_bug788369.html b/src/components/servo/dom/bindings/codegen/test/test_bug788369.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_bug788369.html rename to src/components/servo/dom/bindings/codegen/test/test_bug788369.html diff --git a/src/servo/dom/bindings/codegen/test/test_enums.html b/src/components/servo/dom/bindings/codegen/test/test_enums.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_enums.html rename to src/components/servo/dom/bindings/codegen/test/test_enums.html diff --git a/src/servo/dom/bindings/codegen/test/test_forOf.html b/src/components/servo/dom/bindings/codegen/test/test_forOf.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_forOf.html rename to src/components/servo/dom/bindings/codegen/test/test_forOf.html diff --git a/src/servo/dom/bindings/codegen/test/test_integers.html b/src/components/servo/dom/bindings/codegen/test/test_integers.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_integers.html rename to src/components/servo/dom/bindings/codegen/test/test_integers.html diff --git a/src/servo/dom/bindings/codegen/test/test_interfaceToString.html b/src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_interfaceToString.html rename to src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html diff --git a/src/servo/dom/bindings/codegen/test/test_lookupGetter.html b/src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_lookupGetter.html rename to src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html diff --git a/src/servo/dom/bindings/codegen/test/test_sequence_wrapping.html b/src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_sequence_wrapping.html rename to src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html diff --git a/src/servo/dom/bindings/codegen/test/test_traceProtos.html b/src/components/servo/dom/bindings/codegen/test/test_traceProtos.html similarity index 100% rename from src/servo/dom/bindings/codegen/test/test_traceProtos.html rename to src/components/servo/dom/bindings/codegen/test/test_traceProtos.html diff --git a/src/servo/dom/bindings/conversions.rs b/src/components/servo/dom/bindings/conversions.rs similarity index 100% rename from src/servo/dom/bindings/conversions.rs rename to src/components/servo/dom/bindings/conversions.rs diff --git a/src/servo/dom/bindings/document.rs b/src/components/servo/dom/bindings/document.rs similarity index 100% rename from src/servo/dom/bindings/document.rs rename to src/components/servo/dom/bindings/document.rs diff --git a/src/servo/dom/bindings/domparser.rs b/src/components/servo/dom/bindings/domparser.rs similarity index 100% rename from src/servo/dom/bindings/domparser.rs rename to src/components/servo/dom/bindings/domparser.rs diff --git a/src/servo/dom/bindings/element.rs b/src/components/servo/dom/bindings/element.rs similarity index 100% rename from src/servo/dom/bindings/element.rs rename to src/components/servo/dom/bindings/element.rs diff --git a/src/servo/dom/bindings/event.rs b/src/components/servo/dom/bindings/event.rs similarity index 100% rename from src/servo/dom/bindings/event.rs rename to src/components/servo/dom/bindings/event.rs diff --git a/src/servo/dom/bindings/eventtarget.rs b/src/components/servo/dom/bindings/eventtarget.rs similarity index 100% rename from src/servo/dom/bindings/eventtarget.rs rename to src/components/servo/dom/bindings/eventtarget.rs diff --git a/src/servo/dom/bindings/htmlcollection.rs b/src/components/servo/dom/bindings/htmlcollection.rs similarity index 100% rename from src/servo/dom/bindings/htmlcollection.rs rename to src/components/servo/dom/bindings/htmlcollection.rs diff --git a/src/servo/dom/bindings/node.rs b/src/components/servo/dom/bindings/node.rs similarity index 100% rename from src/servo/dom/bindings/node.rs rename to src/components/servo/dom/bindings/node.rs diff --git a/src/servo/dom/bindings/proxyhandler.rs b/src/components/servo/dom/bindings/proxyhandler.rs similarity index 100% rename from src/servo/dom/bindings/proxyhandler.rs rename to src/components/servo/dom/bindings/proxyhandler.rs diff --git a/src/servo/dom/bindings/text.rs b/src/components/servo/dom/bindings/text.rs similarity index 100% rename from src/servo/dom/bindings/text.rs rename to src/components/servo/dom/bindings/text.rs diff --git a/src/servo/dom/bindings/utils.rs b/src/components/servo/dom/bindings/utils.rs similarity index 100% rename from src/servo/dom/bindings/utils.rs rename to src/components/servo/dom/bindings/utils.rs diff --git a/src/servo/dom/bindings/window.rs b/src/components/servo/dom/bindings/window.rs similarity index 100% rename from src/servo/dom/bindings/window.rs rename to src/components/servo/dom/bindings/window.rs diff --git a/src/servo/dom/characterdata.rs b/src/components/servo/dom/characterdata.rs similarity index 100% rename from src/servo/dom/characterdata.rs rename to src/components/servo/dom/characterdata.rs diff --git a/src/servo/dom/clientrect.rs b/src/components/servo/dom/clientrect.rs similarity index 100% rename from src/servo/dom/clientrect.rs rename to src/components/servo/dom/clientrect.rs diff --git a/src/servo/dom/clientrectlist.rs b/src/components/servo/dom/clientrectlist.rs similarity index 100% rename from src/servo/dom/clientrectlist.rs rename to src/components/servo/dom/clientrectlist.rs diff --git a/src/servo/dom/document.rs b/src/components/servo/dom/document.rs similarity index 100% rename from src/servo/dom/document.rs rename to src/components/servo/dom/document.rs diff --git a/src/servo/dom/domparser.rs b/src/components/servo/dom/domparser.rs similarity index 100% rename from src/servo/dom/domparser.rs rename to src/components/servo/dom/domparser.rs diff --git a/src/servo/dom/element.rs b/src/components/servo/dom/element.rs similarity index 100% rename from src/servo/dom/element.rs rename to src/components/servo/dom/element.rs diff --git a/src/servo/dom/event.rs b/src/components/servo/dom/event.rs similarity index 100% rename from src/servo/dom/event.rs rename to src/components/servo/dom/event.rs diff --git a/src/servo/dom/eventtarget.rs b/src/components/servo/dom/eventtarget.rs similarity index 100% rename from src/servo/dom/eventtarget.rs rename to src/components/servo/dom/eventtarget.rs diff --git a/src/servo/dom/htmlcollection.rs b/src/components/servo/dom/htmlcollection.rs similarity index 100% rename from src/servo/dom/htmlcollection.rs rename to src/components/servo/dom/htmlcollection.rs diff --git a/src/servo/dom/node.rs b/src/components/servo/dom/node.rs similarity index 100% rename from src/servo/dom/node.rs rename to src/components/servo/dom/node.rs diff --git a/src/servo/dom/window.rs b/src/components/servo/dom/window.rs similarity index 100% rename from src/servo/dom/window.rs rename to src/components/servo/dom/window.rs diff --git a/src/servo/engine.rs b/src/components/servo/engine.rs similarity index 100% rename from src/servo/engine.rs rename to src/components/servo/engine.rs diff --git a/src/servo/html/cssparse.rs b/src/components/servo/html/cssparse.rs similarity index 100% rename from src/servo/html/cssparse.rs rename to src/components/servo/html/cssparse.rs diff --git a/src/servo/html/hubbub_html_parser.rs b/src/components/servo/html/hubbub_html_parser.rs similarity index 100% rename from src/servo/html/hubbub_html_parser.rs rename to src/components/servo/html/hubbub_html_parser.rs diff --git a/src/servo/image.rs b/src/components/servo/image.rs similarity index 100% rename from src/servo/image.rs rename to src/components/servo/image.rs diff --git a/src/servo/layout/aux.rs b/src/components/servo/layout/aux.rs similarity index 100% rename from src/servo/layout/aux.rs rename to src/components/servo/layout/aux.rs diff --git a/src/servo/layout/block.rs b/src/components/servo/layout/block.rs similarity index 100% rename from src/servo/layout/block.rs rename to src/components/servo/layout/block.rs diff --git a/src/servo/layout/box.rs b/src/components/servo/layout/box.rs similarity index 100% rename from src/servo/layout/box.rs rename to src/components/servo/layout/box.rs index 9cf69bdd7f0..da4cbc882db 100644 --- a/src/servo/layout/box.rs +++ b/src/components/servo/layout/box.rs @@ -14,6 +14,7 @@ use layout::text::TextBoxData; use layout::text; use core::cell::Cell; +use core::cmp::ApproxEq; use core::managed; use geom::{Point2D, Rect, Size2D}; use gfx::display_list::{DisplayItem, DisplayList}; @@ -30,7 +31,6 @@ use servo_net::image::holder::ImageHolder; use servo_net::local_image_cache::LocalImageCache; use servo_util::range::*; use std::arc; -use core::cmp::ApproxEq; use std::net::url::Url; /// Render boxes (`struct RenderBox`) are the leaves of the layout tree. They cannot position diff --git a/src/servo/layout/box_builder.rs b/src/components/servo/layout/box_builder.rs similarity index 100% rename from src/servo/layout/box_builder.rs rename to src/components/servo/layout/box_builder.rs diff --git a/src/servo/layout/context.rs b/src/components/servo/layout/context.rs similarity index 100% rename from src/servo/layout/context.rs rename to src/components/servo/layout/context.rs diff --git a/src/servo/layout/debug.rs b/src/components/servo/layout/debug.rs similarity index 100% rename from src/servo/layout/debug.rs rename to src/components/servo/layout/debug.rs diff --git a/src/servo/layout/display_list_builder.rs b/src/components/servo/layout/display_list_builder.rs similarity index 100% rename from src/servo/layout/display_list_builder.rs rename to src/components/servo/layout/display_list_builder.rs diff --git a/src/servo/layout/flow.rs b/src/components/servo/layout/flow.rs similarity index 98% rename from src/servo/layout/flow.rs rename to src/components/servo/layout/flow.rs index 172cccc106a..3a1c7b3bb86 100644 --- a/src/servo/layout/flow.rs +++ b/src/components/servo/layout/flow.rs @@ -297,7 +297,7 @@ impl<'self> FlowContext { } } - pub fn iter_all_boxes(&self, cb: &fn(RenderBox) -> bool) { + pub fn iter_all_boxes(&self, cb: &fn(RenderBox) -> bool) -> bool { match *self { BlockFlow(block) => { let block = &mut *block; @@ -317,9 +317,12 @@ impl<'self> FlowContext { } _ => fail!(fmt!("Don't know how to iterate node's RenderBoxes for %?", self)) } + + true } - pub fn iter_boxes_for_node(&self, node: AbstractNode, callback: &fn(RenderBox) -> bool) { + pub fn iter_boxes_for_node(&self, node: AbstractNode, callback: &fn(RenderBox) -> bool) + -> bool { for self.iter_all_boxes |box| { if box.node() == node { if !callback(box) { @@ -327,6 +330,8 @@ impl<'self> FlowContext { } } } + + true } } diff --git a/src/servo/layout/inline.rs b/src/components/servo/layout/inline.rs similarity index 96% rename from src/servo/layout/inline.rs rename to src/components/servo/layout/inline.rs index b3cec67d5af..2bc621625f0 100644 --- a/src/servo/layout/inline.rs +++ b/src/components/servo/layout/inline.rs @@ -70,16 +70,31 @@ impl ElementMapping { self.entries.push(NodeRange::new(node, range)) } - pub fn each(&self, cb: &fn(nr: &NodeRange) -> bool) { - do self.entries.each |nr| { cb(nr) } + pub fn each(&self, callback: &fn(nr: &NodeRange) -> bool) -> bool { + for self.entries.each |nr| { + if !callback(nr) { + break + } + } + true } - pub fn eachi(&self, cb: &fn(i: uint, nr: &NodeRange) -> bool) { - do self.entries.eachi |i, nr| { cb(i, nr) } + pub fn eachi(&self, callback: &fn(i: uint, nr: &NodeRange) -> bool) -> bool { + for self.entries.eachi |i, nr| { + if !callback(i, nr) { + break + } + } + true } - pub fn eachi_mut(&self, cb: &fn(i: uint, nr: &NodeRange) -> bool) { - do self.entries.eachi |i, nr| { cb(i, nr) } + pub fn eachi_mut(&self, callback: &fn(i: uint, nr: &NodeRange) -> bool) -> bool { + for self.entries.eachi |i, nr| { + if !callback(i, nr) { + break + } + } + true } pub fn repair_for_box_changes(&mut self, old_boxes: &[RenderBox], new_boxes: &[RenderBox]) { @@ -178,22 +193,22 @@ impl TextRunScanner { debug!("TextRunScanner: scanning %u boxes for text runs...", inline.boxes.len()); let mut out_boxes = ~[]; - for uint::range(0, inline.boxes.len()) |box_i| { - debug!("TextRunScanner: considering box: %?", inline.boxes[box_i].debug_str()); - if box_i > 0 && !can_coalesce_text_nodes(inline.boxes, box_i-1, box_i) { - self.flush_clump_to_list(ctx, flow, inline.boxes, &mut out_boxes); + for uint::range(0, flow.inline().boxes.len()) |box_i| { + debug!("TextRunScanner: considering box: %?", flow.inline().boxes[box_i].debug_str()); + if box_i > 0 && !can_coalesce_text_nodes(flow.inline().boxes, box_i-1, box_i) { + self.flush_clump_to_list(ctx, flow, &mut out_boxes); } self.clump.extend_by(1); } // handle remaining clumps if self.clump.length() > 0 { - self.flush_clump_to_list(ctx, flow, inline.boxes, &mut out_boxes); + self.flush_clump_to_list(ctx, flow, &mut out_boxes); } debug!("TextRunScanner: swapping out boxes."); // Swap out the old and new box list of the flow. - inline.boxes = out_boxes; + flow.inline().boxes = out_boxes; // A helper function. fn can_coalesce_text_nodes(boxes: &[RenderBox], left_i: uint, right_i: uint) -> bool { @@ -224,8 +239,10 @@ impl TextRunScanner { fn flush_clump_to_list(&mut self, ctx: &mut LayoutContext, flow: FlowContext, - in_boxes: &[RenderBox], out_boxes: &mut ~[RenderBox]) { + let inline = &mut *flow.inline(); + let in_boxes = &inline.boxes; + assert!(self.clump.length() > 0); debug!("TextRunScanner: flushing boxes in range=%?", self.clump); @@ -334,7 +351,7 @@ impl TextRunScanner { debug!("------------------"); debug!("--- Elem ranges: ---"); - for flow.inline().elems.eachi_mut |i: uint, nr: &NodeRange| { + for inline.elems.eachi_mut |i: uint, nr: &NodeRange| { debug!("%u: %? --> %s", i, nr.range, nr.node.debug_str()); () } debug!("--------------------"); diff --git a/src/servo/layout/layout_task.rs b/src/components/servo/layout/layout_task.rs similarity index 100% rename from src/servo/layout/layout_task.rs rename to src/components/servo/layout/layout_task.rs diff --git a/src/servo/layout/text.rs b/src/components/servo/layout/text.rs similarity index 100% rename from src/servo/layout/text.rs rename to src/components/servo/layout/text.rs diff --git a/src/servo/macros.rs b/src/components/servo/macros.rs similarity index 100% rename from src/servo/macros.rs rename to src/components/servo/macros.rs diff --git a/src/servo/platform/common/glut_windowing.rs b/src/components/servo/platform/common/glut_windowing.rs similarity index 100% rename from src/servo/platform/common/glut_windowing.rs rename to src/components/servo/platform/common/glut_windowing.rs diff --git a/src/servo/platform/common/shared_gl_windowing.rs b/src/components/servo/platform/common/shared_gl_windowing.rs similarity index 100% rename from src/servo/platform/common/shared_gl_windowing.rs rename to src/components/servo/platform/common/shared_gl_windowing.rs diff --git a/src/servo/platform/mod.rs b/src/components/servo/platform/mod.rs similarity index 100% rename from src/servo/platform/mod.rs rename to src/components/servo/platform/mod.rs diff --git a/src/servo/servo.rc b/src/components/servo/servo.rc similarity index 100% rename from src/servo/servo.rc rename to src/components/servo/servo.rc diff --git a/src/servo/util/mod.rs b/src/components/servo/util/mod.rs similarity index 100% rename from src/servo/util/mod.rs rename to src/components/servo/util/mod.rs diff --git a/src/servo/util/task.rs b/src/components/servo/util/task.rs similarity index 100% rename from src/servo/util/task.rs rename to src/components/servo/util/task.rs diff --git a/src/servo/windowing.rs b/src/components/servo/windowing.rs similarity index 100% rename from src/servo/windowing.rs rename to src/components/servo/windowing.rs diff --git a/src/patches/README b/src/etc/patches/README similarity index 100% rename from src/patches/README rename to src/etc/patches/README diff --git a/src/patches/mozjs-stack-bounds.diff b/src/etc/patches/mozjs-stack-bounds.diff similarity index 100% rename from src/patches/mozjs-stack-bounds.diff rename to src/etc/patches/mozjs-stack-bounds.diff diff --git a/src/libcss b/src/libcss deleted file mode 160000 index 1b5d29808c5..00000000000 --- a/src/libcss +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b5d29808c55b375252668a90ab5255598f0e06d diff --git a/src/libhubbub b/src/libhubbub deleted file mode 160000 index a784be39252..00000000000 --- a/src/libhubbub +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a784be39252e69f2f52bfaa8e1259c3904b7aa5c diff --git a/src/rust-fontconfig b/src/platform/linux/rust-fontconfig similarity index 100% rename from src/rust-fontconfig rename to src/platform/linux/rust-fontconfig diff --git a/src/platform/linux/rust-freetype b/src/platform/linux/rust-freetype new file mode 160000 index 00000000000..9224437bddb --- /dev/null +++ b/src/platform/linux/rust-freetype @@ -0,0 +1 @@ +Subproject commit 9224437bddb4bf2ce805e1f11ebaa8574572e32e diff --git a/src/platform/linux/rust-xlib b/src/platform/linux/rust-xlib new file mode 160000 index 00000000000..4c934355e4e --- /dev/null +++ b/src/platform/linux/rust-xlib @@ -0,0 +1 @@ +Subproject commit 4c934355e4e3f6be53dafcbc547217649e368a57 diff --git a/src/platform/macos/rust-cocoa b/src/platform/macos/rust-cocoa new file mode 160000 index 00000000000..43d30dfc5db --- /dev/null +++ b/src/platform/macos/rust-cocoa @@ -0,0 +1 @@ +Subproject commit 43d30dfc5db1a467b5dc64e889ce43fc82cd2248 diff --git a/src/platform/macos/rust-core-foundation b/src/platform/macos/rust-core-foundation new file mode 160000 index 00000000000..2053bc421ac --- /dev/null +++ b/src/platform/macos/rust-core-foundation @@ -0,0 +1 @@ +Subproject commit 2053bc421acbac9847905323dd1d28e4ce357ab8 diff --git a/src/rust-core-graphics b/src/platform/macos/rust-core-graphics similarity index 100% rename from src/rust-core-graphics rename to src/platform/macos/rust-core-graphics diff --git a/src/platform/macos/rust-core-text b/src/platform/macos/rust-core-text new file mode 160000 index 00000000000..e57128019bb --- /dev/null +++ b/src/platform/macos/rust-core-text @@ -0,0 +1 @@ +Subproject commit e57128019bb804ec99ef1d6cebd57f5e6c221a3e diff --git a/src/rust-io-surface b/src/platform/macos/rust-io-surface similarity index 100% rename from src/rust-io-surface rename to src/platform/macos/rust-io-surface diff --git a/src/rust b/src/rust deleted file mode 160000 index d546493096f..00000000000 --- a/src/rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d546493096f35e68cbcd9b5d3d7654e7a9345744 diff --git a/src/rust-azure b/src/rust-azure deleted file mode 160000 index 62215bcc69f..00000000000 --- a/src/rust-azure +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 62215bcc69f5593fb7dd1685ef795cb383e1e9d8 diff --git a/src/rust-cocoa b/src/rust-cocoa deleted file mode 160000 index 48cddf0880c..00000000000 --- a/src/rust-cocoa +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 48cddf0880c5e19dcefd284980c744802bdc3c75 diff --git a/src/rust-core-foundation b/src/rust-core-foundation deleted file mode 160000 index 5647befc43d..00000000000 --- a/src/rust-core-foundation +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5647befc43d4a2ea1f65e574d9138da40d39f7f4 diff --git a/src/rust-core-text b/src/rust-core-text deleted file mode 160000 index 98e2d7e3870..00000000000 --- a/src/rust-core-text +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98e2d7e3870759fe91c93ba520452a700fec8756 diff --git a/src/rust-freetype b/src/rust-freetype deleted file mode 160000 index c5364d91461..00000000000 --- a/src/rust-freetype +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c5364d91461c2f329feada422205b8326366fa3a diff --git a/src/rust-glut b/src/rust-glut deleted file mode 160000 index aaa25872d7f..00000000000 --- a/src/rust-glut +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aaa25872d7f6ba5eb4c61651f369d8d06e759d87 diff --git a/src/rust-hubbub b/src/rust-hubbub deleted file mode 160000 index 2c1fb20490d..00000000000 --- a/src/rust-hubbub +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2c1fb20490d14a5d714b6da64e6c60286f3be0d8 diff --git a/src/rust-layers b/src/rust-layers deleted file mode 160000 index ad98b667337..00000000000 --- a/src/rust-layers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad98b667337bc13cb4c427c5d0b336d6c806b61a diff --git a/src/rust-netsurfcss b/src/rust-netsurfcss deleted file mode 160000 index 2196fc2279b..00000000000 --- a/src/rust-netsurfcss +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2196fc2279bbc9c8b01f98eeff86fe9639e6b8e4 diff --git a/src/rust-opengles b/src/rust-opengles deleted file mode 160000 index 8215458cf05..00000000000 --- a/src/rust-opengles +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8215458cf05e9a8bc10a3af9b76aaef9e53397d6 diff --git a/src/rust-wapcaplet b/src/rust-wapcaplet deleted file mode 160000 index 25117a3559a..00000000000 --- a/src/rust-wapcaplet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25117a3559a7c5c793a5553d1b03f0f54a5f641b diff --git a/src/rust-xlib b/src/rust-xlib deleted file mode 160000 index 0ac7b8dc20c..00000000000 --- a/src/rust-xlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ac7b8dc20c4142ac6ad4500d7ae90c2bd3e7424 diff --git a/src/support/azure/rust-azure b/src/support/azure/rust-azure new file mode 160000 index 00000000000..f1ea3b16a88 --- /dev/null +++ b/src/support/azure/rust-azure @@ -0,0 +1 @@ +Subproject commit f1ea3b16a8829d07853178ba5312176a8e854efc diff --git a/src/rust-css b/src/support/css/rust-css similarity index 100% rename from src/rust-css rename to src/support/css/rust-css diff --git a/src/rust-geom b/src/support/geom/rust-geom similarity index 100% rename from src/rust-geom rename to src/support/geom/rust-geom diff --git a/src/support/glut/rust-glut b/src/support/glut/rust-glut new file mode 160000 index 00000000000..6edd359ca41 --- /dev/null +++ b/src/support/glut/rust-glut @@ -0,0 +1 @@ +Subproject commit 6edd359ca41600e8c1ef9de198a578a04b2d625e diff --git a/src/rust-harfbuzz b/src/support/harfbuzz/rust-harfbuzz similarity index 100% rename from src/rust-harfbuzz rename to src/support/harfbuzz/rust-harfbuzz diff --git a/src/rust-http-client b/src/support/http-client/rust-http-client similarity index 100% rename from src/rust-http-client rename to src/support/http-client/rust-http-client diff --git a/src/support/hubbub/libhubbub b/src/support/hubbub/libhubbub new file mode 160000 index 00000000000..1b06c674e79 --- /dev/null +++ b/src/support/hubbub/libhubbub @@ -0,0 +1 @@ +Subproject commit 1b06c674e794cea44e5e248f4738cb50268d8bc7 diff --git a/src/support/hubbub/rust-hubbub b/src/support/hubbub/rust-hubbub new file mode 160000 index 00000000000..ec3680a7cb5 --- /dev/null +++ b/src/support/hubbub/rust-hubbub @@ -0,0 +1 @@ +Subproject commit ec3680a7cb5fae54d7d6bf323b8b6676d650b82a diff --git a/src/support/layers/rust-layers b/src/support/layers/rust-layers new file mode 160000 index 00000000000..a0ddd23dbd5 --- /dev/null +++ b/src/support/layers/rust-layers @@ -0,0 +1 @@ +Subproject commit a0ddd23dbd59104cfde5911a043a73cda33dd810 diff --git a/src/libparserutils b/src/support/libparserutils/libparserutils similarity index 100% rename from src/libparserutils rename to src/support/libparserutils/libparserutils diff --git a/src/support/netsurfcss/libcss b/src/support/netsurfcss/libcss new file mode 160000 index 00000000000..18b768b6a78 --- /dev/null +++ b/src/support/netsurfcss/libcss @@ -0,0 +1 @@ +Subproject commit 18b768b6a786148d466f26c480ee35a7043d6909 diff --git a/src/support/netsurfcss/rust-netsurfcss b/src/support/netsurfcss/rust-netsurfcss new file mode 160000 index 00000000000..ef012c6b703 --- /dev/null +++ b/src/support/netsurfcss/rust-netsurfcss @@ -0,0 +1 @@ +Subproject commit ef012c6b703510b6c7533d38d82a46dbf37759ee diff --git a/src/support/opengles/rust-opengles b/src/support/opengles/rust-opengles new file mode 160000 index 00000000000..a27dc42bdcf --- /dev/null +++ b/src/support/opengles/rust-opengles @@ -0,0 +1 @@ +Subproject commit a27dc42bdcfec4b1fdca6581afe986e71c8de99c diff --git a/src/sharegl b/src/support/sharegl/sharegl similarity index 100% rename from src/sharegl rename to src/support/sharegl/sharegl diff --git a/src/skia b/src/support/skia/skia similarity index 100% rename from src/skia rename to src/support/skia/skia diff --git a/src/mozjs b/src/support/spidermonkey/mozjs similarity index 100% rename from src/mozjs rename to src/support/spidermonkey/mozjs diff --git a/src/rust-mozjs b/src/support/spidermonkey/rust-mozjs similarity index 100% rename from src/rust-mozjs rename to src/support/spidermonkey/rust-mozjs diff --git a/src/rust-stb-image b/src/support/stb-image/rust-stb-image similarity index 100% rename from src/rust-stb-image rename to src/support/stb-image/rust-stb-image diff --git a/src/libwapcaplet b/src/support/wapcaplet/libwapcaplet similarity index 100% rename from src/libwapcaplet rename to src/support/wapcaplet/libwapcaplet diff --git a/src/support/wapcaplet/rust-wapcaplet b/src/support/wapcaplet/rust-wapcaplet new file mode 160000 index 00000000000..ead67f1ed72 --- /dev/null +++ b/src/support/wapcaplet/rust-wapcaplet @@ -0,0 +1 @@ +Subproject commit ead67f1ed72c82cfaeeb0ec1703b94d186078e5c