Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upnot actually a PR #289
Closed
not actually a PR #289
+1,526
−1,496
Conversation
Put the DebugUiPresenter behind the debug_ui feature flag
Clean up unused imports
let travis build pathfinder_webgl
|
I marked all changes that I think could be worth merging. |
canvas/src/lib.rs
Outdated
| /// Add other path to this path. | ||
| /// | ||
| /// note: any non-closed subpaths will be closed | ||
| pub fn add_path(&mut self, mut other: Path2D) { | ||
| self.flush_current_contour(); | ||
| other.flush_current_contour(); | ||
|
|
||
| // FIXME(s3bk) should consume segments instead of cloning | ||
| for contour in other.outline.contours() { | ||
| self.outline.push_contour(contour.clone()); | ||
| } | ||
| } | ||
|
|
||
| /// Transform the path with the given transformation. | ||
| /// returns the transformed path. | ||
| /// | ||
| /// note: any non-closed subpaths will be closed | ||
| pub fn transform(mut self, transform: &Transform2F) -> Path2D { | ||
| self.flush_current_contour(); | ||
| self.outline.transform(transform); | ||
| self | ||
| } |
Comment on lines
572
to
593
This comment has been minimized.
This comment has been minimized.
s3bk
Mar 26, 2020
Author
Contributor
These two can probably be added without problems. They are used by vector.
content/src/outline.rs
Outdated
| #[inline] | ||
| pub fn clear(&mut self) { | ||
| self.contours.clear(); | ||
| self.bounds = RectF::default(); | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn len(&self) -> usize { | ||
| self.contours.len() | ||
| } | ||
|
|
Comment on lines
123
to
133
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
s3bk
Mar 26, 2020
Author
Contributor
these are used to improve performance (and they do a good job at it).
Turns out copying the known length into a newly allocated buffer, and then reusing the old one for the next path, is a lot faster than starting with an empty buffer each time and transferring ownership.
content/src/outline.rs
Outdated
| #[inline] | ||
| pub fn with_capacity(length: usize) -> Contour { | ||
| Contour { | ||
| points: Vec::with_capacity(length), | ||
| flags: Vec::with_capacity(length), | ||
| bounds: RectF::default(), | ||
| closed: false, | ||
| } | ||
| } |
Comment on lines
241
to
249
This comment has been minimized.
This comment has been minimized.
| #[inline] | ||
| pub fn clear(&mut self) { | ||
| self.points.clear(); | ||
| self.flags.clear(); | ||
| self.bounds = RectF::default(); | ||
| self.closed = false; | ||
| } | ||
|
|
Comment on lines
+332
to
+339
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
| pub extern crate log; | ||
|
|
||
| #[macro_export] | ||
| macro_rules! pa_log { | ||
| ($($t:tt)*) => ( | ||
| $crate::log::log!($($t)*) | ||
| ) | ||
| } | ||
|
|
||
| #[macro_export] | ||
| #[cfg(feature="log_debug")] | ||
| macro_rules! pa_debug { | ||
| ($($t:tt)*) => ( | ||
| $crate::log::debug!($($t)*) | ||
| ) | ||
| } | ||
| #[macro_export] | ||
| #[cfg(not(feature="log_debug"))] | ||
| macro_rules! pa_debug { | ||
| ($($t:tt)*) => () | ||
| } | ||
|
|
||
| #[macro_export] | ||
| #[cfg(feature="log_trace")] | ||
| macro_rules! pa_trace { | ||
| ($($t:tt)*) => ( | ||
| $crate::log::trace!($($t)*) | ||
| ) | ||
| } | ||
| #[macro_export] | ||
| #[cfg(not(feature="log_trace"))] | ||
| macro_rules! pa_trace { | ||
| ($($t:tt)*) => () | ||
| } | ||
|
|
||
| #[macro_export] | ||
| #[cfg(feature="log_info")] | ||
| macro_rules! pa_info { | ||
| ($($t:tt)*) => ( | ||
| $crate::log::info!($($t)*) | ||
| ) | ||
| } | ||
| #[macro_export] | ||
| #[cfg(not(feature="log_info"))] | ||
| macro_rules! pa_info { | ||
| ($($t:tt)*) => () | ||
| } | ||
|
|
||
| #[macro_export] | ||
| #[cfg(feature="log_warn")] | ||
| macro_rules! pa_warn { | ||
| ($($t:tt)*) => ( | ||
| $crate::log::warn!($($t)*) | ||
| ) | ||
| } | ||
| #[macro_export] | ||
| #[cfg(not(feature="log_warn"))] | ||
| macro_rules! pa_warn { | ||
| ($($t:tt)*) => () | ||
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! pa_error { | ||
| ($($t:tt)*) => ( | ||
| $crate::log::error!($($t)*) | ||
| ) | ||
| } |
Comment on lines
+1
to
+67
This comment has been minimized.
This comment has been minimized.
s3bk
Mar 26, 2020
Author
Contributor
I am not sure about this. But I also could not work without it.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
s3bk
Mar 27, 2020
Author
Contributor
It can make things more difficult if you forget to enable the appropriate feature.
(Then again, most users would probably not have to debug pathfinder anyway.)
I ran into this myself…
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
pcwalton
Mar 27, 2020
Collaborator
I'm not sure what you mean by forgetting to enable the appropriate feature, could you elaborate?
| impl<'a, L: RenderCommandListener> SceneBuilder<'a, L> { | ||
| pub(crate) fn new( | ||
| scene: &'a Scene, | ||
| built_options: &'a PreparedBuildOptions, | ||
| listener: Box<dyn RenderCommandListener>, | ||
| ) -> SceneBuilder<'a> { | ||
| listener: L, | ||
| ) -> SceneBuilder<'a, L> { | ||
| let effective_view_box = scene.effective_view_box(built_options); |
Comment on lines
+87
to
+93
This comment has been minimized.
This comment has been minimized.
s3bk
Mar 26, 2020
Author
Contributor
I replaced the trait object with a generic, as in WebAssembly it is all single threaded and are no runtime decisions possible. I did not measure the performance gain.
This comment has been minimized.
This comment has been minimized.
pcwalton
Mar 27, 2020
Collaborator
I used a trait object to improve compilation time and because the overhead of vtable dispatch should be minimal.
simd/src/scalar/mod.rs
Outdated
| #[inline] | ||
| pub fn packed_eq(self, other: I32x2) -> U32x2 { | ||
| U32x2([ | ||
| if self[0] == other[0] { !0 } else { 0 }, | ||
| if self[1] == other[1] { !0 } else { 0 }, | ||
| ]) | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn packed_gt(self, other: I32x2) -> U32x2 { | ||
| U32x2([ | ||
| if self[0] > other[0] { !0 } else { 0 }, | ||
| if self[1] > other[1] { !0 } else { 0 }, | ||
| ]) | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn packed_le(self, other: I32x2) -> U32x2 { | ||
| U32x2([ | ||
| if self[0] <= other[0] { !0 } else { 0 }, | ||
| if self[1] <= other[1] { !0 } else { 0 }, | ||
| ]) | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn packed_lt(self, other: I32x2) -> U32x2 { | ||
| U32x2([ | ||
| if self[0] < other[0] { !0 } else { 0 }, | ||
| if self[1] < other[1] { !0 } else { 0 }, | ||
| ]) | ||
| } |
Comment on lines
502
to
532
This comment has been minimized.
This comment has been minimized.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
s3bk commentedMar 26, 2020
I am making this to discuss changes I made and whether to merge some of them.