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

Rebase and fix innerText

Browse source
This commit is contained in:
Pyfisch 2018-02-15 11:18:55 +01:00
parent bc87b41db3
commit 23fcd3a850
3 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/display_list/builder.rs
View file

@ -3017,11 +3017,12 @@ pub struct IndexableText {
impl IndexableText { impl IndexableText {
fn insert(&mut self, node: OpaqueNode, item: IndexableTextItem) { fn insert(&mut self, node: OpaqueNode, item: IndexableTextItem) {
if let Some(items) = self.inner.get_mut(&node) { let entries = self.inner.entry(node).or_insert(Vec::new());
items.push(item); entries.push(item);
return; }
}
self.inner.insert(node, vec![item]); pub fn get(&self, node: OpaqueNode) -> Option<&[IndexableTextItem]> {
self.inner.get(&node).map(|x| x.as_slice())
} }
// Returns the text index within a node for the point of interest. // Returns the text index within a node for the point of interest.

28
components/layout/query.rs
View file

@ -11,7 +11,7 @@ use display_list::IndexableText;
use euclid::{Point2D, Vector2D, Rect, Size2D}; use euclid::{Point2D, Vector2D, Rect, Size2D};
use flow::{Flow, GetBaseFlow}; use flow::{Flow, GetBaseFlow};
use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo}; use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo};
use gfx::display_list::{DisplayItem, DisplayList, OpaqueNode, ScrollOffsetMap}; use gfx::display_list::{DisplayList, OpaqueNode, ScrollOffsetMap};
use inline::InlineFragmentNodeFlags; use inline::InlineFragmentNodeFlags;
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId; use msg::constellation_msg::PipelineId;
@ -27,7 +27,6 @@ use script_traits::LayoutMsg as ConstellationMsg;
use script_traits::UntrustedNodeAddress; use script_traits::UntrustedNodeAddress;
use sequential; use sequential;
use std::cmp::{min, max}; use std::cmp::{min, max};
use std::collections::HashMap;
use std::ops::Deref; use std::ops::Deref;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use style::computed_values::display::T as Display; use style::computed_values::display::T as Display;
@ -888,16 +887,11 @@ enum InnerTextItem {
// https://html.spec.whatwg.org/multipage/#the-innertext-idl-attribute // https://html.spec.whatwg.org/multipage/#the-innertext-idl-attribute
pub fn process_element_inner_text_query<N: LayoutNode>(node: N, pub fn process_element_inner_text_query<N: LayoutNode>(node: N,
display_list: &Option<Arc<DisplayList>>) -> String { indexable_text: &IndexableText) -> String {
if !display_list.is_some() {
warn!("We should have a display list at this point. Cannot get inner text");
return String::new();
}
// Step 1. // Step 1.
let mut results = Vec::new(); let mut results = Vec::new();
// Step 2. // Step 2.
inner_text_collection_steps(node, display_list.as_ref().unwrap(), &mut results); inner_text_collection_steps(node, indexable_text, &mut results);
let mut max_req_line_break_count = 0; let mut max_req_line_break_count = 0;
let mut inner_text = Vec::new(); let mut inner_text = Vec::new();
for item in results { for item in results {
@ -936,18 +930,8 @@ pub fn process_element_inner_text_query<N: LayoutNode>(node: N,
// https://html.spec.whatwg.org/multipage/#inner-text-collection-steps // https://html.spec.whatwg.org/multipage/#inner-text-collection-steps
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn inner_text_collection_steps<N: LayoutNode>(node: N, fn inner_text_collection_steps<N: LayoutNode>(node: N,
display_list: &Arc<DisplayList>, indexable_text: &IndexableText,
results: &mut Vec<InnerTextItem>) { results: &mut Vec<InnerTextItem>) {
// Extracts the text nodes from the display list to avoid traversing it
// for each child node.
let mut text = HashMap::new();
for item in &display_list.as_ref().list {
if let &DisplayItem::Text(ref text_content) = item {
let entries = text.entry(&item.base().metadata.node).or_insert(Vec::new());
entries.push(&text_content.text_run.text);
}
}
let mut items = Vec::new(); let mut items = Vec::new();
for child in node.traverse_preorder() { for child in node.traverse_preorder() {
let node = match child.type_id() { let node = match child.type_id() {
@ -986,9 +970,9 @@ fn inner_text_collection_steps<N: LayoutNode>(node: N,
match child.type_id() { match child.type_id() {
LayoutNodeType::Text => { LayoutNodeType::Text => {
// Step 4. // Step 4.
if let Some(text_content) = text.get(&child.opaque()) { if let Some(text_content) = indexable_text.get(child.opaque()) {
for content in text_content { for content in text_content {
items.push(InnerTextItem::Text(content.to_string())); items.push(InnerTextItem::Text(content.text_run.text.to_string()));
} }
} }
}, },

2
components/layout_thread/lib.rs
View file

@ -1427,7 +1427,7 @@ impl LayoutThread {
ReflowGoal::ElementInnerTextQuery(node) => { ReflowGoal::ElementInnerTextQuery(node) => {
let node = unsafe { ServoLayoutNode::new(&node) }; let node = unsafe { ServoLayoutNode::new(&node) };
rw_data.element_inner_text_response = rw_data.element_inner_text_response =
process_element_inner_text_query(node, &rw_data.display_list); process_element_inner_text_query(node, &rw_data.indexable_text);
}, },
ReflowGoal::Full | ReflowGoal::TickAnimations => {} ReflowGoal::Full | ReflowGoal::TickAnimations => {}
} }