diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-04-29 02:30:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-29 02:30:16 -0400 |
commit | 0ff6f32d7d4eb597a1ea9ea7480c0371b79386b4 (patch) | |
tree | f4a7893575b1b1729741432cf5ecb4872fd0955b /components/layout_thread/lib.rs | |
parent | 02c75ea2d9ca11e38bc06e7d7f2f8bda3a3c104f (diff) | |
parent | aada975dea2a31cb6879be63d91be1299d9f2147 (diff) | |
download | servo-0ff6f32d7d4eb597a1ea9ea7480c0371b79386b4.tar.gz servo-0ff6f32d7d4eb597a1ea9ea7480c0371b79386b4.zip |
Auto merge of #20420 - pyfisch:corner-clipping, r=emilio
Move DL items from gfx to layout and implement corner clipping
Implement corner clipping.
Remove PixelFormat from WebrenderImageInfo.
Use WebRender text shadow.
Remove MallocSizeOf and Deserialize for DL items.
Closes #19649, closes #19680, closes #19802
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20420)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout_thread/lib.rs')
-rw-r--r-- | components/layout_thread/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 88c00faae84..d393f23c2c4 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -59,7 +59,6 @@ use dom_wrapper::drop_style_and_layout_data; use embedder_traits::resources::{self, Resource}; use euclid::{Point2D, Rect, Size2D, TypedScale, TypedSize2D}; use fnv::FnvHashMap; -use gfx::display_list::{OpaqueNode, WebRenderImageInfo}; use gfx::font; use gfx::font_cache_thread::FontCacheThread; use gfx::font_context; @@ -73,8 +72,8 @@ use layout::context::LayoutContext; use layout::context::RegisteredPainter; use layout::context::RegisteredPainters; use layout::context::malloc_size_of_persistent_local_context; -use layout::display_list::{IndexableText, ToLayout}; -use layout::display_list::WebRenderDisplayListConverter; +use layout::display_list::{IndexableText, ToLayout, WebRenderDisplayListConverter}; +use layout::display_list::items::{OpaqueNode, WebRenderImageInfo}; use layout::flow::{Flow, GetBaseFlow, ImmutableFlowUtils, MutableOwnedFlowUtils}; use layout::flow_ref::FlowRef; use layout::incremental::{LayoutDamageComputation, RelayoutMode, SpecialRestyleDamage}; |