Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement CanvasRenderingContext2d.fillText #26697

Merged
merged 13 commits into from Jun 12, 2020

Fix ./mach build --release --with-layout-2020

  • Loading branch information
utsavoza committed Jun 10, 2020
commit 43051c7bf3649689ea0d520a6b760908af368c33
@@ -21,13 +21,14 @@ use script_layout_interface::wrapper_traits::{
};
use script_traits::LayoutMsg as ConstellationMsg;
use script_traits::UntrustedNodeAddress;
use servo_arc::Arc as ServoArc;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use style::computed_values::position::T as Position;
use style::context::{StyleContext, ThreadLocalStyleContext};
use style::dom::OpaqueNode;
use style::dom::TElement;
use style::properties::{LonghandId, PropertyDeclarationId, PropertyId};
use style::properties::{ComputedValues, LonghandId, PropertyDeclarationId, PropertyId};
use style::selector_parser::PseudoElement;
use style::stylist::RuleInclusion;
use style::traversal::resolve_style;
@@ -139,6 +140,10 @@ impl LayoutRPC for LayoutRPCImpl {
ResolvedStyleResponse(rw_data.resolved_style_response.clone())
}

fn parsed_font(&self) -> Option<ServoArc<ComputedValues>> {
unimplemented!()
}

fn offset_parent(&self) -> OffsetParentResponse {
let &LayoutRPCImpl(ref rw_data) = self;
let rw_data = rw_data.lock().unwrap();
@@ -914,6 +914,7 @@ impl LayoutThread {
&QueryMsg::ResolvedStyleQuery(_, _, _) => {
rw_data.resolved_style_response = String::new();
},
&QueryMsg::ParseFontQuery(_, _, _) => unimplemented!(),
&QueryMsg::OffsetParentQuery(_) => {
rw_data.offset_parent_response = OffsetParentResponse::empty();
},
@@ -1206,6 +1207,7 @@ impl LayoutThread {
fragment_tree,
);
},
&QueryMsg::ParseFontQuery(_, _, _) => unimplemented!(),
&QueryMsg::OffsetParentQuery(node) => {
rw_data.offset_parent_response = process_offset_parent_query(node);
},
@@ -1242,7 +1244,6 @@ impl LayoutThread {
// builder in order to support query iframe sizing.
rw_data.inner_window_dimensions_response = None;
},
&QueryMsg::ParseFontQuery(_, _) => unimplemented!(),
},
ReflowGoal::Full | ReflowGoal::TickAnimations => {},
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.